diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-09-24 14:26:53 +0400 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-09-24 14:26:53 +0400 |
| commit | 53f2130e63b2d20a9c3f6f709f38b70cb27a63ab (patch) | |
| tree | 3801cbbc9eb479a55ce189aa9ace9e524aa46667 /Gemfile.lock | |
| parent | 28b6f09fcc1ea50c44e942ed6c342a42bdf12dc4 (diff) | |
Use new version of gitlab_git with extended rugged usage
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 20 |
1 files changed, 13 insertions, 7 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index bd7ebf3ef44..21a55ad6562 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,3 +1,15 @@ +GIT + remote: https://gitlab.com/gitlab-org/gitlab_git.git + revision: c405e4cf147fc5f7b9eae8aabaf3bee695eb2832 + ref: c405e4cf147fc5f7b9eae8aabaf3bee695eb2832 + specs: + gitlab_git (6.3.0) + activesupport (~> 4.0) + charlock_holmes (~> 0.6) + gitlab-grit (~> 2.6) + gitlab-linguist (~> 3.0) + rugged (~> 0.21.0) + GEM remote: https://rubygems.org/ specs: @@ -179,12 +191,6 @@ GEM mime-types (~> 1.19) gitlab_emoji (0.0.1.1) emoji (~> 1.0.1) - gitlab_git (6.3.0) - activesupport (~> 4.0) - charlock_holmes (~> 0.6) - gitlab-grit (~> 2.6) - gitlab-linguist (~> 3.0) - rugged (~> 0.21.0) gitlab_meta (7.0) gitlab_omniauth-ldap (1.1.0) net-ldap (~> 0.7.0) @@ -617,7 +623,7 @@ DEPENDENCIES gitlab-grack (~> 2.0.0.pre) gitlab-linguist (~> 3.0.0) gitlab_emoji (~> 0.0.1.1) - gitlab_git (~> 6.0) + gitlab_git (~> 6.0)! gitlab_meta (= 7.0) gitlab_omniauth-ldap (= 1.1.0) gollum-lib (~> 3.0.0) |