Commit 75fa0632e67b2b91401673b0dd292db4103224c8
1 parent
22442039
Exists in
master
and in
4 other branches
add rchardet19 to detect string encoding
Showing
2 changed files
with
35 additions
and
32 deletions
Show diff stats
Gemfile
1 | -source 'http://rubygems.org' | |
1 | +source "http://rubygems.org" | |
2 | 2 | |
3 | -gem 'rails', '3.1.1' | |
3 | +gem "rails", "3.1.1" | |
4 | 4 | |
5 | -gem 'sqlite3' | |
6 | -gem 'devise', "1.5.0" | |
7 | -gem 'stamp' | |
8 | -gem 'kaminari' | |
9 | -gem 'haml-rails' | |
10 | -gem 'jquery-rails' | |
11 | -gem 'grit', :git => 'https://github.com/gitlabhq/grit.git' | |
5 | +gem "sqlite3" | |
6 | +gem "devise", "1.5.0" | |
7 | +gem "stamp" | |
8 | +gem "kaminari" | |
9 | +gem "haml-rails" | |
10 | +gem "jquery-rails" | |
11 | +gem "grit", :git => "https://github.com/gitlabhq/grit.git" | |
12 | 12 | gem "carrierwave" |
13 | -gem 'six' | |
14 | -gem 'therubyracer' | |
15 | -gem 'faker' | |
16 | -gem 'seed-fu', '~> 2.1.0' | |
13 | +gem "six" | |
14 | +gem "therubyracer" | |
15 | +gem "faker" | |
16 | +gem "seed-fu", "~> 2.1.0" | |
17 | 17 | gem "inifile" |
18 | 18 | gem "pygments.rb", "0.2.3" |
19 | 19 | gem "thin" |
20 | 20 | gem "git" |
21 | 21 | gem "acts_as_list" |
22 | -gem 'rdiscount' | |
23 | -gem 'acts-as-taggable-on', '~> 2.1.0' | |
24 | -gem 'drapper' | |
22 | +gem "rdiscount" | |
23 | +gem "acts-as-taggable-on", "~> 2.1.0" | |
24 | +gem "drapper" | |
25 | +gem "rchardet19", "~> 1.3.5" | |
25 | 26 | |
26 | 27 | group :assets do |
27 | - gem 'sass-rails', "~> 3.1.0" | |
28 | - gem 'coffee-rails', "~> 3.1.0" | |
29 | - gem 'uglifier' | |
28 | + gem "sass-rails", "~> 3.1.0" | |
29 | + gem "coffee-rails", "~> 3.1.0" | |
30 | + gem "uglifier" | |
30 | 31 | end |
31 | 32 | |
32 | 33 | group :development do |
33 | - gem 'letter_opener' | |
34 | - gem 'rails-footnotes', '~> 3.7.5' | |
35 | - gem 'annotate', :git => 'https://github.com/ctran/annotate_models.git' | |
34 | + gem "letter_opener" | |
35 | + gem "rails-footnotes", "~> 3.7.5" | |
36 | + gem "annotate", :git => "https://github.com/ctran/annotate_models.git" | |
36 | 37 | end |
37 | 38 | |
38 | 39 | group :development, :test do |
39 | - gem 'rspec-rails' | |
40 | - gem 'capybara' | |
41 | - gem 'autotest' | |
42 | - gem 'autotest-rails' | |
40 | + gem "rspec-rails" | |
41 | + gem "capybara" | |
42 | + gem "autotest" | |
43 | + gem "autotest-rails" | |
43 | 44 | unless ENV["CI"] |
44 | - gem 'ruby-debug19', :require => 'ruby-debug' | |
45 | + gem "ruby-debug19", :require => "ruby-debug" | |
45 | 46 | end |
46 | - gem 'awesome_print' | |
47 | - gem 'database_cleaner' | |
48 | - gem 'launchy' | |
47 | + gem "awesome_print" | |
48 | + gem "database_cleaner" | |
49 | + gem "launchy" | |
49 | 50 | end |
50 | 51 | |
51 | 52 | group :test do |
52 | - gem 'turn', :require => false | |
53 | - gem 'simplecov', :require => false | |
53 | + gem "turn", :require => false | |
54 | + gem "simplecov", :require => false | |
54 | 55 | gem "shoulda", "~> 3.0.0.beta2" |
55 | 56 | end | ... | ... |
Gemfile.lock
... | ... | @@ -157,6 +157,7 @@ GEM |
157 | 157 | rdoc (~> 3.4) |
158 | 158 | thor (~> 0.14.6) |
159 | 159 | rake (0.9.2.2) |
160 | + rchardet19 (1.3.5) | |
160 | 161 | rdiscount (1.6.8) |
161 | 162 | rdoc (3.11) |
162 | 163 | json (~> 1.4) |
... | ... | @@ -268,6 +269,7 @@ DEPENDENCIES |
268 | 269 | pygments.rb (= 0.2.3) |
269 | 270 | rails (= 3.1.1) |
270 | 271 | rails-footnotes (~> 3.7.5) |
272 | + rchardet19 (~> 1.3.5) | |
271 | 273 | rdiscount |
272 | 274 | rspec-rails |
273 | 275 | ruby-debug19 | ... | ... |