diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-12-06 12:08:44 +0400 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-12-10 14:11:27 +0400 |
| commit | f38435b9e79cc155bc725300a5aa920f17c69271 (patch) | |
| tree | 964959b7c6a95b8f998d8b08f0b7ccf9401ab51d /Gemfile.lock | |
| parent | ac5842d970ba305681bb1c0826db769243101123 (diff) | |
Use real gems
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 26 |
1 files changed, 9 insertions, 17 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 2f565bc6b1f..f9768ac53ec 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,18 +1,3 @@ -PATH - remote: ../gitlab_git - specs: - gitlab_git (3.1.0) - activesupport (~> 4.0.0) - gitlab-grit (~> 2.6.1) - gitlab-linguist (~> 2.9.5) - gitlab-pygments.rb (~> 0.5.4) - -PATH - remote: ../grack - specs: - gitlab-grack (1.1.0) - rack (~> 1.5.1) - GEM remote: https://rubygems.org/ specs: @@ -190,6 +175,8 @@ GEM nokogiri (~> 1.5.9) sanitize (~> 2.0.3) stringex (~> 1.5.1) + gitlab-grack (2.0.0.pre) + rack (~> 1.5.1) gitlab-grit (2.6.3) charlock_holmes (~> 0.6.9) diff-lcs (~> 1.1) @@ -203,6 +190,11 @@ GEM gitlab-pygments.rb (0.5.4) posix-spawn (~> 0.3.6) yajl-ruby (~> 1.1.0) + gitlab_git (4.0.0.pre) + activesupport (~> 4.0.0) + gitlab-grit (~> 2.6.1) + gitlab-linguist (~> 2.9.5) + gitlab-pygments.rb (~> 0.5.4) gitlab_meta (6.0) gitlab_omniauth-ldap (1.0.3) net-ldap (~> 0.3.1) @@ -603,10 +595,10 @@ DEPENDENCIES github-markup (~> 0.7.4) gitlab-flowdock-git-hook (~> 0.4.2) gitlab-gollum-lib (~> 1.0.2) - gitlab-grack (~> 1.1.0)! + gitlab-grack (~> 2.0.0.pre) gitlab-linguist (~> 2.9.6) gitlab-pygments.rb (~> 0.5.4) - gitlab_git (~> 3.1.0)! + gitlab_git (~> 4.0.0.pre) gitlab_meta (= 6.0) gitlab_omniauth-ldap (= 1.0.3) gon |