From db69fcddfea8905126949b1a6286abbd3f14fe9a Mon Sep 17 00:00:00 2001
From: Nicolas Lamirault <nicolas.lamirault@gmail.com>
Date: Thu, 19 May 2016 12:14:54 +0200
Subject: [PATCH 1/2] update changelog

Signed-off-by: Nicolas Lamirault <nicolas.lamirault@gmail.com>
---
 ChangeLog.md | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/ChangeLog.md b/ChangeLog.md
index f00206a..b3aaade 100644
--- a/ChangeLog.md
+++ b/ChangeLog.md
@@ -1,5 +1,10 @@
 # emacs-gitlab ChangeLog
 
+## Version 0.8.0 (05/19/2016)
+
+- ``#33``: Add Ivy support
+- ``#27``: Documentation
+
 ## Version 0.7.0 (10/12/2015)
 
 - Setup continuous integration using CircleCI

From 5b82f9e7f73744e26639e20777acfd8e267f2f44 Mon Sep 17 00:00:00 2001
From: Nicolas Lamirault <nicolas.lamirault@gmail.com>
Date: Thu, 19 May 2016 12:17:41 +0200
Subject: [PATCH 2/2] FIX Continuous integration

Signed-off-by: Nicolas Lamirault <nicolas.lamirault@gmail.com>
---
 Cask       |  3 +--
 circle.yml | 19 ++++++++++++++++---
 2 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/Cask b/Cask
index b8b7f56..eb14e79 100644
--- a/Cask
+++ b/Cask
@@ -1,7 +1,6 @@
 ;;; Scame Cask file
 
-(source "melpa" "http://melpa.org/packages/")
-(source "gnu" "http://elpa.gnu.org/packages/")
+(source "melpa" "https://stable.melpa.org/packages/")
 
 (package-file "gitlab.el")
 (files "*.el" (:exclude ".dir-locals.el"))
diff --git a/circle.yml b/circle.yml
index 50a7070..7f80c1d 100644
--- a/circle.yml
+++ b/circle.yml
@@ -4,11 +4,24 @@ machine:
 
 dependencies:
   pre:
+    # - sudo mkdir /usr/local/evm
+    # - sudo chmod -R 777 /usr/local/evm
+    # - curl -fsSkL https://raw.github.com/rejeep/evm/master/go | bash
+    # - chmod +x ~/.evm/bin/evm
+    # - ~/.evm/bin/evm install emacs-24.4-bin
+    # - ~/.evm/bin/evm install emacs-24.5-bin
+    - sudo rm -f /etc/apt/sources.list.d/google-chrome.list
     - sudo add-apt-repository -y ppa:cassou/emacs
     - sudo add-apt-repository -y ppa:ubuntu-elisp/ppa
-    - sudo apt-get update -qq
-    - sudo apt-get install -qq emacs24-nox emacs-snapshot-nox
+    - sudo apt-get update
+    - sudo apt-get install -qq emacs24-nox emacs-snapshot
+    - sudo update-alternatives --set emacs /usr/bin/emacs24-nox
     - curl -fsSkL "https://raw.github.com/cask/cask/master/go" | python
+    - export PATH="${HOME}/.cask/bin:$PATH"
 test:
   override:
-    - PATH="${HOME}/.cask/bin:$PATH" make init test
+    # - ~/.evm/bin/evm use emacs-24.4-bin
+    # - curl -fsSkL https://raw.github.com/cask/cask/master/go | python
+    # - PATH="${HOME}/.cask/bin:$PATH" make test
+    # - ~/.evm/bin/evm use emacs-24.5-bin
+    - PATH="${HOME}/.cask/bin:$PATH" make test