Skip to content

Commit 90be602

Browse files
committed
Merge pull request #26 from nlamirault/develop
Release 0.7.0
2 parents 41444b5 + 334f72d commit 90be602

File tree

6 files changed

+32
-13
lines changed

6 files changed

+32
-13
lines changed

CONTRIBUTING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ try to follow these guidelines when you do so.
99

1010
* Check that the issue has not already been reported.
1111
* Check that the issue has not already been fixed in the latest code
12-
(a.k.a. `master`).
12+
(a.k.a. `develop`).
1313
* Be clear, concise and precise in your description of the problem.
1414
* Open an issue with a descriptive title and a summary in grammatically correct,
1515
complete sentences.

ChangeLog.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
# emacs-gitlab ChangeLog
22

3+
## Version 0.7.0 (10/12/2015)
4+
5+
- Setup continuous integration using CircleCI
6+
37
## Version 0.6.0 (08/31/2015)
48

59
- Addons for to generate an Org file from Gitlab issues

README.md

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,17 @@
11
# emacs-gitlab
22

33
[![License GPL 3][badge-license]][LICENSE]
4-
[![travis][badge-travis]][travis]
5-
[![drone][badge-drone]][drone]
6-
[![Melpa Status](http://melpa.milkbox.net/packages/gitlab-badge.svg)](http://melpa.milkbox.net/#/gitlab)
7-
[![MELPA Stable](http://stable.melpa.org/packages/gitlab-badge.svg)](http://stable.melpa.org/#/gitlab)
84
[![Coverage Status](https://coveralls.io/repos/nlamirault/emacs-gitlab/badge.png)](https://coveralls.io/r/nlamirault/emacs-gitlab)
95

6+
Master :
7+
* [![MELPA Stable](http://stable.melpa.org/packages/gitlab-badge.svg)](http://stable.melpa.org/#/gitlab)
8+
* [![Circle CI](https://circleci.com/gh/nlamirault/emacs-gitlab/tree/master.svg?style=svg)](https://circleci.com/gh/nlamirault/emacs-gitlab/tree/master)
109

11-
Emacs package `gitlab` provides :
12-
* a REST client to the [Gitlab][] API
13-
* a [Helm][] interface
10+
Develop:
11+
* [![Melpa Status](http://melpa.milkbox.net/packages/gitlab-badge.svg)](http://melpa.milkbox.net/#/gitlab)
12+
* [![Circle CI](https://circleci.com/gh/nlamirault/emacs-gitlab/tree/develop.svg?style=svg)](https://circleci.com/gh/nlamirault/emacs-gitlab/tree/develop)
13+
14+
Package `gitlab` provides a REST client to the [Gitlab][] API.
1415

1516
## Installation
1617

@@ -21,7 +22,7 @@ Emacs package `gitlab` provides :
2122
emacs-gitlab is available on the two major community maintained repositories -
2223
[MELPA STABLE](melpa-stable.milkbox.net), [MELPA](http://melpa.milkbox.net).
2324

24-
You can install `emacs-gitlab` with the following commnad:
25+
You can install `gitlab` with the following commnad:
2526

2627
<kbd>M-x package-install [RET] gitlab [RET]</kbd>
2728

@@ -106,8 +107,8 @@ Or use :
106107

107108
### Cask
108109

109-
``emacs-gitlab`` use [Cask][] for dependencies
110-
management. Install it and retrieve dependencies :
110+
``gitlab`` use [Cask][] for dependencies management.
111+
Install it and retrieve dependencies :
111112

112113
$ curl -fsSkL https://raw.github.com/cask/cask/master/go | python
113114
$ export PATH="$HOME/.cask/bin:$PATH"

circle.yml

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
machine:
2+
services:
3+
- docker
4+
5+
dependencies:
6+
pre:
7+
- sudo add-apt-repository -y ppa:cassou/emacs
8+
- sudo add-apt-repository -y ppa:ubuntu-elisp/ppa
9+
- sudo apt-get update -qq
10+
- sudo apt-get install -qq emacs24-nox emacs-snapshot-nox
11+
- curl -fsSkL "https://raw.github.com/cask/cask/master/go" | python
12+
test:
13+
override:
14+
- PATH="${HOME}/.cask/bin:$PATH" make test

gitlab.el

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
;; Author: Nicolas Lamirault <[email protected]>
44
;; URL: https://github.com/nlamirault/emacs-gitlab
5-
;; Version: 0.6.0
5+
;; Version: 0.7.0
66
;; Keywords: gitlab
77

88
;; Package-Requires: ((s "1.9.0") (dash "2.9.0") (pkg-info "0.5.0") (request "0.1.0"))

test/gitlab-version-test.el

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
(ert-deftest gitlab-library-version ()
2727
:tags '(version)
2828
(with-test-sandbox
29-
(should (string= "0.6.0" (gitlab--library-version)))))
29+
(should (string= "0.7.0" (gitlab--library-version)))))
3030

3131

3232
(provide 'gitlab-version-test)

0 commit comments

Comments
 (0)