Download as
Browse Code »

Commit 96211b01a86c0f147dda88f336e9443c94f46ea4

Authored by Saito
1 parent 784cb886
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

add grit_ext to gemfile

Showing 2 changed files with 10 additions and 5 deletions   Show diff stats
Gemfile
  Diff comments   View file @96211b0
... ... @@ -27,6 +27,7 @@ gem "grit", git: "https://github.com/gitlabhq/grit.git", ref:
27 27 gem "omniauth-ldap", git: "https://github.com/gitlabhq/omniauth-ldap.git", ref: 'f038dd852d7bd473a557e385d5d7c2fd5dc1dc2e'
28 28 gem 'yaml_db', git: "https://github.com/gitlabhq/yaml_db.git", ref: '98e9a5dca43e3fedd3268c76a73af40d1bdf1dfd'
29 29 gem 'grack', git: "https://github.com/gitlabhq/grack.git", ref: 'ba46f3b0845c6a09d488ae6abdce6ede37e227e8'
  30 +gem 'grit_ext', git: "https://github.com/SaitoWu/grit_ext.git"
30 31  
31 32 # Gitolite client (for work with gitolite-admin repo)
32 33 gem "gitolite", '1.1.0'
... ... @@ -83,9 +84,6 @@ gem 'resque_mailer'
83 84 # HTTP requests
84 85 gem "httparty"
85 86  
86   -# Handle encodings
87   -gem "charlock_holmes"
88   -
89 87 # Colored output to console
90 88 gem "colored"
91 89  
... ...
Gemfile.lock
  Diff comments   View file @96211b0
1 1 GIT
  2 + remote: https://github.com/SaitoWu/grit_ext.git
  3 + revision: 8558b3282696c50813eaba4100ab6f5fec0ebc16
  4 + specs:
  5 + grit_ext (0.5.0)
  6 + charlock_holmes (~> 0.6.9)
  7 +
  8 +GIT
2 9 remote: https://github.com/ctran/annotate_models.git
3 10 revision: 18cd39ad01829deba5aa34634b8540d6675ab978
4 11 specs:
... ... @@ -92,7 +99,7 @@ GEM
92 99 carrierwave (0.6.2)
93 100 activemodel (>= 3.2.0)
94 101 activesupport (>= 3.2.0)
95   - charlock_holmes (0.6.8)
  102 + charlock_holmes (0.6.9)
96 103 childprocess (0.3.2)
97 104 ffi (~> 1.0.6)
98 105 chosen-rails (0.9.8.3)
... ... @@ -415,7 +422,6 @@ DEPENDENCIES
415 422 capybara
416 423 capybara-webkit
417 424 carrierwave
418   - charlock_holmes
419 425 chosen-rails
420 426 coffee-rails (= 3.2.2)
421 427 colored
... ... @@ -436,6 +442,7 @@ DEPENDENCIES
436 442 grack!
437 443 grape (~> 0.2.1)
438 444 grit!
  445 + grit_ext!
439 446 growl
440 447 guard-rspec
441 448 guard-spinach
... ...