diff options
| author | Dmitriy Zaporozhets <dzaporozhets@gitlab.com> | 2015-02-24 20:58:19 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dzaporozhets@gitlab.com> | 2015-02-24 20:58:19 +0000 |
| commit | d73a0589413205131b5052e11e3f39cfc233bb33 (patch) | |
| tree | 26f14e1244fd377cba56b17cf6cb1c71c3ac1a1d | |
| parent | 037a9810176978bb700a9a2f78dc40608d4efc58 (diff) | |
| parent | ecb12f211150f30383a8aadedebcdcc845adf39a (diff) | |
| download | gitlab-ce-d73a0589413205131b5052e11e3f39cfc233bb33.tar.gz | |
Merge branch 'update_grack' into 'master'
Update gitlab-grack to 2.0.0.rc2
See merge request !1585
| -rw-r--r-- | Gemfile | 2 | ||||
| -rw-r--r-- | Gemfile.lock | 4 |
2 files changed, 3 insertions, 3 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" diff --git a/Gemfile.lock b/Gemfile.lock index 7af8f7abb6c..dc0285255cc 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -183,7 +183,7 @@ GEM gitlab-flowdock-git-hook (0.4.2.2) gitlab-grit (>= 2.4.1) multi_json - gitlab-grack (2.0.0.pre) + gitlab-grack (2.0.0.rc2) rack (~> 1.5.1) gitlab-grit (2.7.2) charlock_holmes (~> 0.6) @@ -668,7 +668,7 @@ DEPENDENCIES gemnasium-gitlab-service (~> 0.2) github-markup gitlab-flowdock-git-hook (~> 0.4.2) - gitlab-grack (~> 2.0.0.pre) + gitlab-grack (~> 2.0.0.rc2) gitlab-linguist (~> 3.0.1) gitlab_emoji (~> 0.0.1.1) gitlab_git (= 7.0.0.rc14) |