diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-08-13 13:29:38 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-08-13 13:29:38 +0000 |
| commit | 7e0bd5df28743a86996a217db2fba7e13836c28c (patch) | |
| tree | f6a7ad935bb942840f9ff9ec361c80cbb8f244f2 | |
| parent | ffc284301eae53fad65bad36adaa4182c7683f70 (diff) | |
| parent | ad6d14a1b1e5f6277d5faf56a19e0876c46891cd (diff) | |
| download | gitlab-ce-7e0bd5df28743a86996a217db2fba7e13836c28c.tar.gz | |
Merge branch 'bump_gitlab_git' into 'master'
Bump gitlab git
Fixes #1394
See merge request !1015
| -rw-r--r-- | Gemfile.lock | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index c77d20debd9..1b94f063845 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -179,12 +179,12 @@ GEM mime-types (~> 1.19) gitlab_emoji (0.0.1.1) emoji (~> 1.0.1) - gitlab_git (6.1.0) + gitlab_git (6.2.1) activesupport (~> 4.0) charlock_holmes (~> 0.6) gitlab-grit (~> 2.6) gitlab-linguist (~> 3.0) - rugged (~> 0.19.0) + rugged (~> 0.21.0) gitlab_meta (7.0) gitlab_omniauth-ldap (1.0.4) net-ldap (~> 0.3.1) @@ -334,7 +334,7 @@ GEM multi_json (~> 1.0) websocket-driver (>= 0.2.0) polyglot (0.3.4) - posix-spawn (0.3.8) + posix-spawn (0.3.9) pry (0.9.12.4) coderay (~> 1.0) method_source (~> 0.8) @@ -436,7 +436,7 @@ GEM ruby-progressbar (1.2.0) rubyntlm (0.1.1) rubypants (0.2.0) - rugged (0.19.0) + rugged (0.21.0) safe_yaml (0.9.7) sanitize (2.1.0) nokogiri (>= 1.4.4) @@ -540,7 +540,7 @@ GEM eventmachine (>= 0.12.8) http_parser.rb (~> 0.5.1) simple_oauth (~> 0.1.4) - tzinfo (1.2.1) + tzinfo (1.2.2) thread_safe (~> 0.1) uglifier (2.3.2) execjs (>= 0.3.0) |