diff options
author | Dmitriy Zaporozhets <dzaporozhets@gitlab.com> | 2015-03-18 00:15:04 +0000 |
---|---|---|
committer | Dmitriy Zaporozhets <dzaporozhets@gitlab.com> | 2015-03-18 00:15:04 +0000 |
commit | 5bbc70da9cb439342bdbe022988e4e734d891f44 (patch) | |
tree | f250855c5aace8fd21f13adbd7e2c2fad3660848 /Gemfile.lock | |
parent | d2979c778f3ef992570fc81f62fcf3d6f70dac08 (diff) | |
parent | b27622a16f04b92634c7de7765ef182f69f3c6a3 (diff) | |
download | gitlab-ce-5bbc70da9cb439342bdbe022988e4e734d891f44.tar.gz |
Merge branch 'update-grack' into 'master'
Update Grack.
See merge request !1712
Diffstat (limited to 'Gemfile.lock')
-rw-r--r-- | Gemfile.lock | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index bcf36897162..e728115fa98 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -200,7 +200,7 @@ GEM gitlab-flowdock-git-hook (0.4.2.2) gitlab-grit (>= 2.4.1) multi_json - gitlab-grack (2.0.0.rc2) + gitlab-grack (2.0.0) rack (~> 1.5.1) gitlab-grit (2.7.2) charlock_holmes (~> 0.6) |