Skip to content

Commit

Permalink
Merge pull request #3 from jennjblack/edits
Browse files Browse the repository at this point in the history
edit Gemfile and config/application.rb
  • Loading branch information
scottfrederick committed Aug 26, 2014
2 parents f23d55c + a78ede4 commit 6726f0e
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 0 deletions.
2 changes: 2 additions & 0 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@ gem 'will_paginate', '3.0.pre2'
gem 'sqlite3', '1.3.4'
gem "pg", "~> 0.15.1"
gem "cf-autoconfig", "~> 0.2.1"
gem 'rails_12factor', group: :production
ruby '2.0.0'

group :development do
gem 'rspec-rails', '2.6.1'
Expand Down
6 changes: 6 additions & 0 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,11 @@ GEM
activesupport (= 3.0.12)
bundler (~> 1.0)
railties (= 3.0.12)
rails_12factor (0.0.2)
rails_serve_static_assets
rails_stdout_logging
rails_serve_static_assets (0.0.2)
rails_stdout_logging (0.0.3)
railties (3.0.12)
actionpack (= 3.0.12)
activesupport (= 3.0.12)
Expand Down Expand Up @@ -113,6 +118,7 @@ DEPENDENCIES
gravatar_image_tag (= 1.0.0.pre2)
pg (~> 0.15.1)
rails (= 3.0.12)
rails_12factor
rspec-rails (= 2.6.1)
spork (= 0.9.0.rc8)
sqlite3 (= 1.3.4)
Expand Down
1 change: 1 addition & 0 deletions config/application.rb
Original file line number Diff line number Diff line change
Expand Up @@ -38,5 +38,6 @@ class Application < Rails::Application

# Configure sensitive parameters which will be filtered from the log file.
config.filter_parameters += [:password]
ActionController::Base.config.relative_url_root = ''
end
end

0 comments on commit 6726f0e

Please sign in to comment.