diff options
| -rw-r--r-- | Gemfile | 7 | ||||
| -rw-r--r-- | Gemfile.lock | 12 |
2 files changed, 8 insertions, 11 deletions
@@ -21,9 +21,12 @@ gem 'omniauth-google-oauth2' gem 'omniauth-twitter' gem 'omniauth-github' -# GITLAB patched libs +# Extracting information from a git repository gem "gitlab-grit", '~> 1.0.0', require: 'grit' -gem 'grack', git: "https://github.com/gitlabhq/grack.git", ref: 'ba46f3b0845c6a09d488ae6abdce6ede37e227e8' + +# Ruby/Rack Git Smart-HTTP Server Handler +gem 'gitlab-grack', '~> 1.0.0', require: 'grack' + gem 'grit_ext', git: "https://github.com/gitlabhq/grit_ext.git", ref: '2d1b2f13cabc02520405985fccb2a0abfcba9907' # LDAP Auth diff --git a/Gemfile.lock b/Gemfile.lock index 47cb5a46408..b47d0721fb7 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -7,14 +7,6 @@ GIT rake (>= 0.8.7) GIT - remote: https://github.com/gitlabhq/grack.git - revision: ba46f3b0845c6a09d488ae6abdce6ede37e227e8 - ref: ba46f3b0845c6a09d488ae6abdce6ede37e227e8 - specs: - grack (1.0.0) - rack (~> 1.4.1) - -GIT remote: https://github.com/gitlabhq/grit_ext.git revision: 2d1b2f13cabc02520405985fccb2a0abfcba9907 ref: 2d1b2f13cabc02520405985fccb2a0abfcba9907 @@ -165,6 +157,8 @@ GEM mime-types (~> 1.19) pygments.rb (>= 0.2.13) github-markup (0.7.5) + gitlab-grack (1.0.0) + rack (~> 1.4.1) gitlab-grit (1.0.0) diff-lcs (~> 1.1) mime-types (~> 1.15) @@ -480,12 +474,12 @@ DEPENDENCIES git github-linguist (~> 2.3.4) github-markup (~> 0.7.4) + gitlab-grack (~> 1.0.0) gitlab-grit (~> 1.0.0) gitlab_meta (= 5.0) gitlab_omniauth-ldap (= 1.0.2) gitlab_yaml_db (= 1.0.0) gon - grack! grape (~> 0.3.1) grape-entity (~> 0.2.0) grit_ext! |