diff --git a/Gemfile b/Gemfile index f5e05a1..c865e9f 100644 --- a/Gemfile +++ b/Gemfile @@ -23,7 +23,7 @@ gem 'omniauth-github' # Extracting information from a git repository # Provide access to Gitlab::Git library -gem 'gitlab_git', path: '../gitlab_git'#'~> 1.4.1' +gem "gitlab_git", "~> 2.0.0.pre" # Ruby/Rack Git Smart-HTTP Server Handler gem 'gitlab-grack', '~> 1.0.1', require: 'grack' diff --git a/Gemfile.lock b/Gemfile.lock index 444a3dc..b4a2626 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -12,14 +12,6 @@ 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: @@ -184,6 +176,10 @@ GEM gitlab-pygments.rb (0.3.2) posix-spawn (~> 0.3.6) yajl-ruby (~> 1.1.0) + gitlab_git (2.0.0.pre) + 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) @@ -572,7 +568,7 @@ DEPENDENCIES gitlab-gollum-lib (~> 1.0.1) gitlab-grack (~> 1.0.1) gitlab-pygments.rb (~> 0.3.2) - gitlab_git! + gitlab_git (~> 2.0.0.pre) gitlab_meta (= 6.0) gitlab_omniauth-ldap (= 1.0.3) gon -- libgit2 0.21.2