Skip to content

Commit

Permalink
Merge pull request #26 from nlamirault/develop
Browse files Browse the repository at this point in the history
Release 0.7.0
  • Loading branch information
nlamirault committed Oct 12, 2015
2 parents 41444b5 + 334f72d commit 90be602
Show file tree
Hide file tree
Showing 6 changed files with 32 additions and 13 deletions.
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ try to follow these guidelines when you do so.

* Check that the issue has not already been reported.
* Check that the issue has not already been fixed in the latest code
(a.k.a. `master`).
(a.k.a. `develop`).
* Be clear, concise and precise in your description of the problem.
* Open an issue with a descriptive title and a summary in grammatically correct,
complete sentences.
Expand Down
4 changes: 4 additions & 0 deletions ChangeLog.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# emacs-gitlab ChangeLog

## Version 0.7.0 (10/12/2015)

- Setup continuous integration using CircleCI

## Version 0.6.0 (08/31/2015)

- Addons for to generate an Org file from Gitlab issues
Expand Down
21 changes: 11 additions & 10 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,16 +1,17 @@
# emacs-gitlab

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

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

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

Package `gitlab` provides a REST client to the [Gitlab][] API.

## Installation

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

You can install `emacs-gitlab` with the following commnad:
You can install `gitlab` with the following commnad:

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

Expand Down Expand Up @@ -106,8 +107,8 @@ Or use :

### Cask

``emacs-gitlab`` use [Cask][] for dependencies
management. Install it and retrieve dependencies :
``gitlab`` use [Cask][] for dependencies management.
Install it and retrieve dependencies :

$ curl -fsSkL https://raw.github.com/cask/cask/master/go | python
$ export PATH="$HOME/.cask/bin:$PATH"
Expand Down
14 changes: 14 additions & 0 deletions circle.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
machine:
services:
- docker

dependencies:
pre:
- 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
- curl -fsSkL "https://raw.github.com/cask/cask/master/go" | python
test:
override:
- PATH="${HOME}/.cask/bin:$PATH" make test
2 changes: 1 addition & 1 deletion gitlab.el
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

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

;; Package-Requires: ((s "1.9.0") (dash "2.9.0") (pkg-info "0.5.0") (request "0.1.0"))
Expand Down
2 changes: 1 addition & 1 deletion test/gitlab-version-test.el
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
(ert-deftest gitlab-library-version ()
:tags '(version)
(with-test-sandbox
(should (string= "0.6.0" (gitlab--library-version)))))
(should (string= "0.7.0" (gitlab--library-version)))))


(provide 'gitlab-version-test)
Expand Down

0 comments on commit 90be602

Please sign in to comment.