Commit f38435b9e79cc155bc725300a5aa920f17c69271
1 parent
ac5842d9
Exists in
master
and in
4 other branches
Use real gems
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Showing
2 changed files
with
11 additions
and
19 deletions
Show diff stats
Gemfile
| ... | ... | @@ -30,10 +30,10 @@ gem 'omniauth-github' |
| 30 | 30 | |
| 31 | 31 | # Extracting information from a git repository |
| 32 | 32 | # Provide access to Gitlab::Git library |
| 33 | -gem "gitlab_git", "~> 3.1.0", path: '../gitlab_git' | |
| 33 | +gem "gitlab_git", "~> 4.0.0.pre" | |
| 34 | 34 | |
| 35 | 35 | # Ruby/Rack Git Smart-HTTP Server Handler |
| 36 | -gem 'gitlab-grack', '~> 1.1.0', require: 'grack', path: '../grack' | |
| 36 | +gem 'gitlab-grack', '~> 2.0.0.pre', require: 'grack' | |
| 37 | 37 | |
| 38 | 38 | # LDAP Auth |
| 39 | 39 | gem 'gitlab_omniauth-ldap', '1.0.3', require: "omniauth-ldap" | ... | ... |
Gemfile.lock
| 1 | -PATH | |
| 2 | - remote: ../gitlab_git | |
| 3 | - specs: | |
| 4 | - gitlab_git (3.1.0) | |
| 5 | - activesupport (~> 4.0.0) | |
| 6 | - gitlab-grit (~> 2.6.1) | |
| 7 | - gitlab-linguist (~> 2.9.5) | |
| 8 | - gitlab-pygments.rb (~> 0.5.4) | |
| 9 | - | |
| 10 | -PATH | |
| 11 | - remote: ../grack | |
| 12 | - specs: | |
| 13 | - gitlab-grack (1.1.0) | |
| 14 | - rack (~> 1.5.1) | |
| 15 | - | |
| 16 | 1 | GEM |
| 17 | 2 | remote: https://rubygems.org/ |
| 18 | 3 | specs: |
| ... | ... | @@ -190,6 +175,8 @@ GEM |
| 190 | 175 | nokogiri (~> 1.5.9) |
| 191 | 176 | sanitize (~> 2.0.3) |
| 192 | 177 | stringex (~> 1.5.1) |
| 178 | + gitlab-grack (2.0.0.pre) | |
| 179 | + rack (~> 1.5.1) | |
| 193 | 180 | gitlab-grit (2.6.3) |
| 194 | 181 | charlock_holmes (~> 0.6.9) |
| 195 | 182 | diff-lcs (~> 1.1) |
| ... | ... | @@ -203,6 +190,11 @@ GEM |
| 203 | 190 | gitlab-pygments.rb (0.5.4) |
| 204 | 191 | posix-spawn (~> 0.3.6) |
| 205 | 192 | yajl-ruby (~> 1.1.0) |
| 193 | + gitlab_git (4.0.0.pre) | |
| 194 | + activesupport (~> 4.0.0) | |
| 195 | + gitlab-grit (~> 2.6.1) | |
| 196 | + gitlab-linguist (~> 2.9.5) | |
| 197 | + gitlab-pygments.rb (~> 0.5.4) | |
| 206 | 198 | gitlab_meta (6.0) |
| 207 | 199 | gitlab_omniauth-ldap (1.0.3) |
| 208 | 200 | net-ldap (~> 0.3.1) |
| ... | ... | @@ -603,10 +595,10 @@ DEPENDENCIES |
| 603 | 595 | github-markup (~> 0.7.4) |
| 604 | 596 | gitlab-flowdock-git-hook (~> 0.4.2) |
| 605 | 597 | gitlab-gollum-lib (~> 1.0.2) |
| 606 | - gitlab-grack (~> 1.1.0)! | |
| 598 | + gitlab-grack (~> 2.0.0.pre) | |
| 607 | 599 | gitlab-linguist (~> 2.9.6) |
| 608 | 600 | gitlab-pygments.rb (~> 0.5.4) |
| 609 | - gitlab_git (~> 3.1.0)! | |
| 601 | + gitlab_git (~> 4.0.0.pre) | |
| 610 | 602 | gitlab_meta (= 6.0) |
| 611 | 603 | gitlab_omniauth-ldap (= 1.0.3) |
| 612 | 604 | gon | ... | ... |