diff options
| author | Douwe Maan <douwe@gitlab.com> | 2015-02-25 11:59:25 +0100 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2015-02-25 11:59:25 +0100 |
| commit | 5f7a3e1bbdcb6044e4b25d0a7722b10f9140bb46 (patch) | |
| tree | 36f9c7a85a0dd20f0b271df464eed45c36e969b5 /Gemfile | |
| parent | 769d1ce64bdb7c9fd3981c65bc25dd14eb176c1e (diff) | |
| parent | a30a56634d3ea44ccfc69c037324b502456f9aba (diff) | |
| download | gitlab-ce-5f7a3e1bbdcb6044e4b25d0a7722b10f9140bb46.tar.gz | |
Merge branch 'master' into extend_markdown_upload
# Conflicts:
# app/controllers/files_controller.rb
Diffstat (limited to 'Gemfile')
| -rw-r--r-- | Gemfile | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -41,7 +41,7 @@ gem "browser" gem "gitlab_git", '7.0.0.rc14' # Ruby/Rack Git Smart-HTTP Server Handler -gem 'gitlab-grack', '~> 2.0.0.pre', require: 'grack' +gem 'gitlab-grack', '~> 2.0.0.rc2', require: 'grack' # LDAP Auth gem 'gitlab_omniauth-ldap', '1.2.0', require: "omniauth-ldap" @@ -50,7 +50,7 @@ gem 'gitlab_omniauth-ldap', '1.2.0', require: "omniauth-ldap" gem 'gollum-lib', '~> 4.0.0' # Language detection -gem "gitlab-linguist", "~> 3.0.0", require: "linguist" +gem "gitlab-linguist", "~> 3.0.1", require: "linguist" # API gem "grape", "~> 0.6.1" |