diff --git a/Gemfile b/Gemfile index 19171e94f46774b97d534d7a1c9d122e791d1cf7..6c07069bdd77d49f53e68a5e39ff7148a2a40c7e 100644 --- a/Gemfile +++ b/Gemfile @@ -31,8 +31,7 @@ gem 'omniauth-shibboleth' # Extracting information from a git repository # Provide access to Gitlab::Git library -# gem "gitlab_git", path: '../../gitlab_git' -gem "gitlab_git", git: 'https://gitlab.com/gitlab-org/gitlab_git.git', ref: 'b53b948a9248ea3a4b7f2bd6c7f9938fbd5e952b' +gem "gitlab_git", '7.0.0.rc1' # Ruby/Rack Git Smart-HTTP Server Handler gem 'gitlab-grack', '~> 2.0.0.pre', require: 'grack' diff --git a/Gemfile.lock b/Gemfile.lock index eaa9f10105fcf43e7ebca23cdbab8a7801add954..564debdc3ad9f8d37ebfaf88f0a81e59794c0af8 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,15 +1,3 @@ -GIT - remote: https://gitlab.com/gitlab-org/gitlab_git.git - revision: b53b948a9248ea3a4b7f2bd6c7f9938fbd5e952b - ref: b53b948a9248ea3a4b7f2bd6c7f9938fbd5e952b - specs: - gitlab_git (7.0.0.pre) - activesupport (~> 4.0) - charlock_holmes (~> 0.6) - gitlab-linguist (~> 3.0) - rubyzip (~> 1.1) - rugged (~> 0.21.0) - GEM remote: https://rubygems.org/ specs: @@ -191,6 +179,12 @@ GEM mime-types (~> 1.19) gitlab_emoji (0.0.1.1) emoji (~> 1.0.1) + gitlab_git (7.0.0.rc1) + activesupport (~> 4.0) + charlock_holmes (~> 0.6) + gitlab-linguist (~> 3.0) + rubyzip (~> 1.1) + rugged (~> 0.21.0) gitlab_meta (7.0) gitlab_omniauth-ldap (1.1.0) net-ldap (~> 0.7.0) @@ -624,7 +618,7 @@ DEPENDENCIES gitlab-grack (~> 2.0.0.pre) gitlab-linguist (~> 3.0.0) gitlab_emoji (~> 0.0.1.1) - gitlab_git! + gitlab_git (= 7.0.0.rc1) gitlab_meta (= 7.0) gitlab_omniauth-ldap (= 1.1.0) gollum-lib (~> 3.0.0)