Commit 46923d1acbcccdee3852efa588b3072449fa4025
Exists in
master
and in
4 other branches
Merge pull request #1285 from tsigo/gemfile_cleanup
Gemfile cleanup
Showing
4 changed files
with
4 additions
and
19 deletions
Show diff stats
.rails_footnotes
Gemfile
| ... | ... | @@ -75,7 +75,6 @@ gem 'settingslogic' |
| 75 | 75 | # Misc |
| 76 | 76 | gem "foreman" |
| 77 | 77 | gem "git" |
| 78 | -gem "gitlab_meta", '2.8' | |
| 79 | 78 | |
| 80 | 79 | group :assets do |
| 81 | 80 | gem "sass-rails", "3.2.5" |
| ... | ... | @@ -93,7 +92,6 @@ end |
| 93 | 92 | |
| 94 | 93 | group :development do |
| 95 | 94 | gem "letter_opener" |
| 96 | - gem "rails-footnotes" | |
| 97 | 95 | gem "annotate", :git => "https://github.com/ctran/annotate_models.git" |
| 98 | 96 | gem 'rack-mini-profiler' |
| 99 | 97 | end |
| ... | ... | @@ -113,11 +111,13 @@ end |
| 113 | 111 | |
| 114 | 112 | group :test do |
| 115 | 113 | gem 'cucumber-rails', :require => false |
| 116 | - gem 'minitest', ">= 2.10" | |
| 117 | - gem "turn", :require => false | |
| 118 | 114 | gem "simplecov", :require => false |
| 119 | 115 | gem "shoulda-matchers" |
| 120 | 116 | gem 'email_spec' |
| 121 | 117 | gem 'resque_spec' |
| 122 | 118 | gem "webmock" |
| 123 | 119 | end |
| 120 | + | |
| 121 | +group :production do | |
| 122 | + gem "gitlab_meta", '2.8' | |
| 123 | +end | ... | ... |
Gemfile.lock
| ... | ... | @@ -99,7 +99,6 @@ GEM |
| 99 | 99 | acts-as-taggable-on (2.3.1) |
| 100 | 100 | rails (~> 3.0) |
| 101 | 101 | addressable (2.2.8) |
| 102 | - ansi (1.4.2) | |
| 103 | 102 | arel (3.0.2) |
| 104 | 103 | autotest (4.4.6) |
| 105 | 104 | ZenTest (>= 4.4.1) |
| ... | ... | @@ -219,7 +218,6 @@ GEM |
| 219 | 218 | treetop (~> 1.4.8) |
| 220 | 219 | method_source (0.7.1) |
| 221 | 220 | mime-types (1.19) |
| 222 | - minitest (3.1.0) | |
| 223 | 221 | modernizr (2.5.3) |
| 224 | 222 | sprockets (~> 2.0) |
| 225 | 223 | multi_json (1.3.6) |
| ... | ... | @@ -259,8 +257,6 @@ GEM |
| 259 | 257 | activesupport (= 3.2.8) |
| 260 | 258 | bundler (~> 1.0) |
| 261 | 259 | railties (= 3.2.8) |
| 262 | - rails-footnotes (3.7.8) | |
| 263 | - rails (>= 3.0.0) | |
| 264 | 260 | railties (3.2.8) |
| 265 | 261 | actionpack (= 3.2.8) |
| 266 | 262 | activesupport (= 3.2.8) |
| ... | ... | @@ -350,8 +346,6 @@ GEM |
| 350 | 346 | treetop (1.4.10) |
| 351 | 347 | polyglot |
| 352 | 348 | polyglot (>= 0.3.1) |
| 353 | - turn (0.9.5) | |
| 354 | - ansi | |
| 355 | 349 | tzinfo (0.3.33) |
| 356 | 350 | uglifier (1.0.3) |
| 357 | 351 | execjs (>= 0.3.0) |
| ... | ... | @@ -409,7 +403,6 @@ DEPENDENCIES |
| 409 | 403 | launchy |
| 410 | 404 | letter_opener |
| 411 | 405 | linguist (~> 1.0.0)! |
| 412 | - minitest (>= 2.10) | |
| 413 | 406 | modernizr (= 2.5.3) |
| 414 | 407 | mysql2 |
| 415 | 408 | omniauth-ldap! |
| ... | ... | @@ -417,7 +410,6 @@ DEPENDENCIES |
| 417 | 410 | pygments.rb! |
| 418 | 411 | rack-mini-profiler |
| 419 | 412 | rails (= 3.2.8) |
| 420 | - rails-footnotes | |
| 421 | 413 | raphael-rails (= 1.5.2) |
| 422 | 414 | redcarpet (~> 2.1.1) |
| 423 | 415 | resque (~> 1.20.0) |
| ... | ... | @@ -434,7 +426,6 @@ DEPENDENCIES |
| 434 | 426 | stamp |
| 435 | 427 | therubyracer |
| 436 | 428 | thin |
| 437 | - turn | |
| 438 | 429 | uglifier (= 1.0.3) |
| 439 | 430 | unicorn |
| 440 | 431 | webmock | ... | ... |
config/initializers/rails_footnotes.rb