diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-03-04 10:56:54 +0400 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-03-04 10:56:54 +0400 |
| commit | 152c6018b3ace729095e7b58f5be3963b81050fb (patch) | |
| tree | 83a55f49356d22b804c986b6c3230282a276099a | |
| parent | d199de044425ad73caa031627c714b7010d76e3f (diff) | |
use grit_ext gem instead of fork
| -rw-r--r-- | Gemfile | 3 | ||||
| -rw-r--r-- | Gemfile.lock | 12 |
2 files changed, 4 insertions, 11 deletions
@@ -23,12 +23,11 @@ gem 'omniauth-github' # Extracting information from a git repository gem "gitlab-grit", '~> 1.0.0', require: 'grit' +gem 'grit_ext', '~> 0.6.2' # 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 gem 'gitlab_omniauth-ldap', '1.0.2', require: "omniauth-ldap" diff --git a/Gemfile.lock b/Gemfile.lock index 51940606cd0..89882492b36 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -7,14 +7,6 @@ GIT rake (>= 0.8.7) GIT - remote: https://github.com/gitlabhq/grit_ext.git - revision: 2d1b2f13cabc02520405985fccb2a0abfcba9907 - ref: 2d1b2f13cabc02520405985fccb2a0abfcba9907 - specs: - grit_ext (0.6.2) - charlock_holmes (~> 0.6.9) - -GIT remote: https://github.com/gitlabhq/raphael-rails.git revision: cb2c92a040b9b941a5f1aa1ea866cc26e944fe58 specs: @@ -178,6 +170,8 @@ GEM grape-entity (0.2.0) activesupport multi_json (>= 1.3.2) + grit_ext (0.6.2) + charlock_holmes (~> 0.6.9) growl (1.0.3) guard (1.5.4) listen (>= 0.4.2) @@ -480,7 +474,7 @@ DEPENDENCIES gon grape (~> 0.3.1) grape-entity (~> 0.2.0) - grit_ext! + grit_ext (~> 0.6.2) growl guard-rspec guard-spinach |