Download as
Browse Code »

Commit dd14f7780a99a35d49002258fd004566a1fccdc2

Authored by Arthur Nogueira Neves
2 parents 2d93bb9b bf58a1a3
Exists in master and in 1 other branch production

Merge pull request #809 from matiaskorhonen/optional-rails_12factor 

Adds the rails_12factor gem for Heroku
Showing 2 changed files with 7 additions and 0 deletions   Show diff stats
Gemfile
  Diff comments   View file @dd14f77
... ... @@ -93,6 +93,7 @@ group :test do
93 93 end
94 94  
95 95 group :heroku, :production do
  96 + gem 'rails_12factor', require: !!ENV["HEROKU"]
96 97 gem 'unicorn', :require => false
97 98 end
98 99  
... ...
Gemfile.lock
  Diff comments   View file @dd14f77
... ... @@ -264,8 +264,13 @@ GEM
264 264 bundler (>= 1.3.0, < 2.0)
265 265 railties (= 4.1.8)
266 266 sprockets-rails (~> 2.0)
  267 + rails_12factor (0.0.3)
  268 + rails_serve_static_assets
  269 + rails_stdout_logging
267 270 rails_autolink (1.1.6)
268 271 rails (> 3.1)
  272 + rails_serve_static_assets (0.0.3)
  273 + rails_stdout_logging (0.0.3)
269 274 railties (4.1.8)
270 275 actionpack (= 4.1.8)
271 276 activesupport (= 4.1.8)
... ... @@ -421,6 +426,7 @@ DEPENDENCIES
421 426 quiet_assets
422 427 rack-ssl
423 428 rack-ssl-enforcer
  429 + rails_12factor
424 430 rails_autolink
425 431 railties (~> 4.1.8)
426 432 ri_cal
... ...