diff options
author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-11-04 17:01:03 +0400 |
---|---|---|
committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-11-04 17:01:03 +0400 |
commit | 36dc6e6b510625708836d0d1d6faf17527446e15 (patch) | |
tree | f7752916ccf5fbaaec159e4fff8d36bb01713da4 /Gemfile.lock | |
parent | 9360c7334a90349c006be772f603a0977654c263 (diff) | |
parent | b40ff1e06ee21e1b0c880fbe470256ab03c0a30b (diff) |
Merge branch '5-4-security-update' of /home/git/repositories/gitlab/gitlabhq into 5-4-stablev5.4.1
Diffstat (limited to 'Gemfile.lock')
-rw-r--r-- | Gemfile.lock | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index c64bd426540..b1ff643b878 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -167,7 +167,7 @@ GEM stringex (~> 1.5.1) gitlab-grack (1.0.1) rack (~> 1.4.1) - gitlab-grit (2.5.1) + gitlab-grit (2.5.2) charlock_holmes (~> 0.6.9) diff-lcs (~> 1.1) mime-types (~> 1.15) @@ -175,10 +175,10 @@ GEM gitlab-pygments.rb (0.3.2) posix-spawn (~> 0.3.6) yajl-ruby (~> 1.1.0) - gitlab_git (1.3.0) + gitlab_git (1.3.1) activesupport (~> 3.2.13) github-linguist (~> 2.3.4) - gitlab-grit (~> 2.5.1) + gitlab-grit (~> 2.5.2) gitlab_meta (5.0) gitlab_omniauth-ldap (1.0.3) net-ldap (~> 0.3.1) @@ -566,7 +566,7 @@ DEPENDENCIES gitlab-gollum-lib (~> 1.0.0) gitlab-grack (~> 1.0.1) gitlab-pygments.rb (~> 0.3.2) - gitlab_git (~> 1.3.0) + gitlab_git (~> 1.3.1) gitlab_meta (= 5.0) gitlab_omniauth-ldap (= 1.0.3) gon |