Skip to content

Commit

Permalink
Upgrade to Rails 4.1
Browse files Browse the repository at this point in the history
[#69541898]
  • Loading branch information
Brian DeHamer committed Apr 15, 2014
1 parent b4aeab2 commit a03620c
Show file tree
Hide file tree
Showing 11 changed files with 63 additions and 64 deletions.
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
source 'https://rubygems.org'

gem 'rails', '4.0.4'
gem 'rails', '4.1.0'

gem 'sass'
gem 'therubyracer', platforms: :ruby
Expand Down
91 changes: 47 additions & 44 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -3,40 +3,41 @@ PATH
specs:
ctl_base_ui (0.0.1)
haml (~> 4.0.0)
rails (~> 4.0.3)
rails (~> 4.1.0)
sass (~> 3.3.2)

GEM
remote: https://rubygems.org/
specs:
actionmailer (4.0.4)
actionpack (= 4.0.4)
actionmailer (4.1.0)
actionpack (= 4.1.0)
actionview (= 4.1.0)
mail (~> 2.5.4)
actionpack (4.0.4)
activesupport (= 4.0.4)
builder (~> 3.1.0)
erubis (~> 2.7.0)
actionpack (4.1.0)
actionview (= 4.1.0)
activesupport (= 4.1.0)
rack (~> 1.5.2)
rack-test (~> 0.6.2)
activemodel (4.0.4)
activesupport (= 4.0.4)
builder (~> 3.1.0)
activerecord (4.0.4)
activemodel (= 4.0.4)
activerecord-deprecated_finders (~> 1.0.2)
activesupport (= 4.0.4)
arel (~> 4.0.0)
activerecord-deprecated_finders (1.0.3)
activesupport (4.0.4)
actionview (4.1.0)
activesupport (= 4.1.0)
builder (~> 3.1)
erubis (~> 2.7.0)
activemodel (4.1.0)
activesupport (= 4.1.0)
builder (~> 3.1)
activerecord (4.1.0)
activemodel (= 4.1.0)
activesupport (= 4.1.0)
arel (~> 5.0.0)
activesupport (4.1.0)
i18n (~> 0.6, >= 0.6.9)
minitest (~> 4.2)
multi_json (~> 1.3)
json (~> 1.7, >= 1.7.7)
minitest (~> 5.1)
thread_safe (~> 0.1)
tzinfo (~> 0.3.37)
tzinfo (~> 1.1)
addressable (2.3.6)
arel (4.0.2)
atomic (1.1.16)
builder (3.1.4)
arel (5.0.1.20140414130214)
builder (3.2.2)
capybara (2.2.1)
mime-types (>= 1.16)
nokogiri (>= 1.3.3)
Expand Down Expand Up @@ -74,29 +75,31 @@ GEM
treetop (~> 1.4.8)
mime-types (1.25.1)
mini_portile (0.5.3)
minitest (4.7.5)
minitest (5.3.3)
multi_json (1.9.2)
multipart-post (2.0.0)
nokogiri (1.6.1)
mini_portile (~> 0.5.0)
phantomjs (1.9.7.0)
polyglot (0.3.4)
rack (1.5.2)
rack-protection (1.5.2)
rack-protection (1.5.3)
rack
rack-test (0.6.2)
rack (>= 1.0)
rails (4.0.4)
actionmailer (= 4.0.4)
actionpack (= 4.0.4)
activerecord (= 4.0.4)
activesupport (= 4.0.4)
rails (4.1.0)
actionmailer (= 4.1.0)
actionpack (= 4.1.0)
actionview (= 4.1.0)
activemodel (= 4.1.0)
activerecord (= 4.1.0)
activesupport (= 4.1.0)
bundler (>= 1.3.0, < 2.0)
railties (= 4.0.4)
sprockets-rails (~> 2.0.0)
railties (4.0.4)
actionpack (= 4.0.4)
activesupport (= 4.0.4)
railties (= 4.1.0)
sprockets-rails (~> 2.0)
railties (4.1.0)
actionpack (= 4.1.0)
activesupport (= 4.1.0)
rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0)
rake (10.2.2)
Expand All @@ -117,8 +120,8 @@ GEM
rspec-core (~> 2.14.0)
rspec-expectations (~> 2.14.0)
rspec-mocks (~> 2.14.0)
safe_yaml (1.0.1)
sass (3.3.4)
safe_yaml (1.0.2)
sass (3.3.5)
sdoc (0.4.0)
json (~> 1.8)
rdoc (~> 4.0, < 5.0)
Expand All @@ -127,7 +130,7 @@ GEM
multi_json
simplecov-html (~> 0.8.0)
simplecov-html (0.8.0)
sinatra (1.4.4)
sinatra (1.4.5)
rack (~> 1.4)
rack-protection (~> 1.4)
tilt (~> 1.3, >= 1.3.4)
Expand All @@ -136,7 +139,7 @@ GEM
multi_json (~> 1.0)
rack (~> 1.0)
tilt (~> 1.1, != 1.3.0)
sprockets-rails (2.0.1)
sprockets-rails (2.1.3)
actionpack (>= 3.0)
activesupport (>= 3.0)
sprockets (~> 2.8)
Expand All @@ -148,14 +151,14 @@ GEM
libv8 (~> 3.16.14.0)
ref
thor (0.19.1)
thread_safe (0.3.1)
atomic (>= 1.1.7, < 2)
thread_safe (0.3.3)
tilt (1.4.1)
tins (1.0.1)
tins (1.1.0)
treetop (1.4.15)
polyglot
polyglot (>= 0.3.1)
tzinfo (0.3.39)
tzinfo (1.1.0)
thread_safe (~> 0.1)
uglifier (2.5.0)
execjs (>= 0.3.0)
json (>= 1.8.0)
Expand All @@ -177,7 +180,7 @@ DEPENDENCIES
haml
jquery-rails
phantomjs (>= 1.8.1.1)
rails (= 4.0.4)
rails (= 4.1.0)
rspec-rails
sass
sdoc
Expand Down
2 changes: 1 addition & 1 deletion Rakefile
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@

require File.expand_path('../config/application', __FILE__)

PanamaxUi::Application.load_tasks
Rails.application.load_tasks
2 changes: 1 addition & 1 deletion config/environment.rb
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@
require File.expand_path('../application', __FILE__)

# Initialize the Rails application.
PanamaxUi::Application.initialize!
Rails.application.initialize!
2 changes: 1 addition & 1 deletion config/environments/development.rb
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

Dotenv.load

PanamaxUi::Application.configure do
Rails.application.configure do
# Settings specified here will take precedence over those in config/application.rb.

# In the development environment your application's code is reloaded on
Expand Down
2 changes: 1 addition & 1 deletion config/environments/production.rb
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
PanamaxUi::Application.configure do
Rails.application.configure do
# Settings specified here will take precedence over those in config/application.rb.

# Code is not reloaded between requests.
Expand Down
2 changes: 1 addition & 1 deletion config/environments/test.rb
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

Dotenv.load

PanamaxUi::Application.configure do
Rails.application.configure do
# Settings specified here will take precedence over those in config/application.rb.

# The test environment is used exclusively to run your application's
Expand Down
12 changes: 0 additions & 12 deletions config/initializers/secret_token.rb

This file was deleted.

2 changes: 1 addition & 1 deletion config/initializers/session_store.rb
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
# Be sure to restart your server when you modify this file.

PanamaxUi::Application.config.session_store :cookie_store, key: '_panamax-ui_session'
Rails.application.config.session_store :cookie_store, key: '_panamax-ui_session'
2 changes: 1 addition & 1 deletion config/routes.rb
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
PanamaxUi::Application.routes.draw do
Rails.application.routes.draw do
root 'search#new'

resource :search, only: [:new, :show], controller: 'search'
Expand Down
8 changes: 8 additions & 0 deletions config/secrets.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
development:
secret_key_base: '5294b57ad896b834e269d5aec3141b129f3f4d27a5072e8acae2a6915b20d13c622b942360eaaf92012907227f98f911d6d795c47c0e5a228073a130e98f15e6'

test:
secret_key_base: 'a679466657f9ae81a94e6ba8c8ec03976ab82be8e73cfa703f5a9655fda323a02a43a288bdc0618d4cce0c92b1d5a517101c5925eba3d42af6cad79c50b496ef'

production:
secret_key_base: <%= ENV["SECRET_KEY_BASE"] %>

0 comments on commit a03620c

Please sign in to comment.