diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-08-05 17:51:04 +0400 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-08-05 17:51:04 +0400 |
| commit | b92655663c9f066de6a67217ad9a55f38e20cffd (patch) | |
| tree | 90d1d1959c5f4ae086dddef66bff3118a6d9b239 /Gemfile.lock | |
| parent | d602d5b1b05036788c67c13510c34725c68116ea (diff) | |
Update main calls to gitlab_git
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 6eedadc74c6..444a3dc8ba1 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -12,6 +12,14 @@ GIT specs: raphael-rails (2.1.0) +PATH + remote: ../gitlab_git + specs: + gitlab_git (1.4.1) + activesupport (~> 3.2.13) + github-linguist (~> 2.3.4) + gitlab-grit (~> 2.6.0) + GEM remote: https://rubygems.org/ specs: @@ -176,10 +184,6 @@ GEM gitlab-pygments.rb (0.3.2) posix-spawn (~> 0.3.6) yajl-ruby (~> 1.1.0) - gitlab_git (1.4.1) - activesupport (~> 3.2.13) - github-linguist (~> 2.3.4) - gitlab-grit (~> 2.6.0) gitlab_meta (6.0) gitlab_omniauth-ldap (1.0.3) net-ldap (~> 0.3.1) @@ -275,7 +279,7 @@ GEM minitest (4.7.4) modernizr (2.6.2) sprockets (~> 2.0) - multi_json (1.7.7) + multi_json (1.7.8) multi_xml (0.5.4) multipart-post (1.2.0) mysql2 (0.3.11) @@ -568,7 +572,7 @@ DEPENDENCIES gitlab-gollum-lib (~> 1.0.1) gitlab-grack (~> 1.0.1) gitlab-pygments.rb (~> 0.3.2) - gitlab_git (~> 1.4.1) + gitlab_git! gitlab_meta (= 6.0) gitlab_omniauth-ldap (= 1.0.3) gon |