diff options
author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-11-10 16:01:00 +0000 |
---|---|---|
committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-11-10 16:01:00 +0000 |
commit | 463fc52fa80c7f0c9fc715a58f1e7096e0bfb345 (patch) | |
tree | f1894f2f0a81a90f2ea45c6a70921da0b7a27d9a /Gemfile.lock | |
parent | 7181fdd23e1744e1a1d794dad2d115f0d2b97f95 (diff) | |
parent | ffa8d84a6ef27dea6d87650390821d42f3d1b38a (diff) | |
download | gitlab-ce-463fc52fa80c7f0c9fc715a58f1e7096e0bfb345.tar.gz |
Merge branch 'bump-rugged-version' into 'master'
Bump rugged version to be in line with gitlab_git requirements
See merge request !1780
Diffstat (limited to 'Gemfile.lock')
-rw-r--r-- | Gemfile.lock | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 1688ea4d9d8..dca8606806a 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -107,7 +107,7 @@ GEM json (>= 1.7) celluloid (0.16.0) timers (~> 4.0.0) - charlock_holmes (0.6.9.4) + charlock_holmes (0.7.3) chunky_png (1.3.4) cliver (0.3.2) coderay (1.1.0) @@ -611,7 +611,7 @@ GEM sexp_processor (~> 4.1) rubyntlm (0.5.2) rubypants (0.2.0) - rugged (0.22.2) + rugged (0.23.3) safe_yaml (1.0.4) sanitize (2.1.0) nokogiri (>= 1.4.4) |