Skip to content

Commit

Permalink
Merge pull request #139 from npauzenga/staging
Browse files Browse the repository at this point in the history
add 12-factor gem
  • Loading branch information
npauzenga committed Feb 17, 2016
2 parents 85074b2 + bc53846 commit ae35ac6
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 0 deletions.
1 change: 1 addition & 0 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ gem "rails", "4.2.4"
gem "rails-api"
gem "bcrypt", "~> 3.1.7"
gem "pg"
gem "rails_12factor"
gem "puma"
gem "interactor"
gem "figaro"
Expand Down
6 changes: 6 additions & 0 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -178,6 +178,11 @@ GEM
rails-deprecated_sanitizer (>= 1.0.1)
rails-html-sanitizer (1.0.2)
loofah (~> 2.0)
rails_12factor (0.0.3)
rails_serve_static_assets
rails_stdout_logging
rails_serve_static_assets (0.0.4)
rails_stdout_logging (0.0.4)
railties (4.2.4)
actionpack (= 4.2.4)
activesupport (= 4.2.4)
Expand Down Expand Up @@ -283,6 +288,7 @@ DEPENDENCIES
puma
rails (= 4.2.4)
rails-api
rails_12factor
rolify
rspec-rails (~> 3.0)
rspec_api_documentation
Expand Down

0 comments on commit ae35ac6

Please sign in to comment.