Upgrade to Rails 4.1

I also upgraded the sass-rails, foundation-rails and coffee-rails gems. The turn gem does not support minitest 5 on which Rails 4.1 depends, so I removed it.
eurucamp · Jan 18, 2015 · a6a7a58 · a6a7a58
1 parent 1d9caf1
commit a6a7a58
Show file tree

Hide file tree

Showing 6 changed files with 65 additions and 70 deletions.
diff --git a/Gemfile b/Gemfile
@@ -4,7 +4,7 @@ ruby '2.1.5'
 
 gem 'dotenv-rails', groups: [:development, :test]
 
-gem 'rails', '4.0.3'
+gem 'rails', '4.1.0'
 
 gem 'devise', '~> 3.4.1'
 gem 'simple_form', '~> 3.1.0'
@@ -19,9 +19,9 @@ gem 'redcarpet'
 gem 'settingslogic'
 gem 'thin'
 
-gem 'sass-rails',       '~> 4.0.0'
-gem 'foundation-rails', '~> 5.2.0'
-gem 'coffee-rails',     '~> 4.0.0'
+gem 'sass-rails',       '~> 5.0.0'
+gem 'foundation-rails', '~> 5.4.0'
+gem 'coffee-rails',     '~> 4.1.0'
 gem 'uglifier',         '>= 1.0.3'
 gem 'font-awesome-sass'
 gem 'bourbon'
@@ -37,7 +37,6 @@ group :development do
 end
 
 group :test do
-  gem 'turn',       require: false
   gem 'simplecov',  require: false
 end
 

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -1,38 +1,39 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    actionmailer (4.0.3)
-      actionpack (= 4.0.3)
+    actionmailer (4.1.0)
+      actionpack (= 4.1.0)
+      actionview (= 4.1.0)
       mail (~> 2.5.4)
-    actionpack (4.0.3)
-      activesupport (= 4.0.3)
-      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.3)
-      activesupport (= 4.0.3)
-      builder (~> 3.1.0)
-    activerecord (4.0.3)
-      activemodel (= 4.0.3)
-      activerecord-deprecated_finders (~> 1.0.2)
-      activesupport (= 4.0.3)
-      arel (~> 4.0.0)
-    activerecord-deprecated_finders (1.0.3)
-    activesupport (4.0.3)
-      i18n (~> 0.6, >= 0.6.4)
-      minitest (~> 4.2)
-      multi_json (~> 1.3)
+    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)
+      json (~> 1.7, >= 1.7.7)
+      minitest (~> 5.1)
       thread_safe (~> 0.1)
-      tzinfo (~> 0.3.37)
-    ansi (1.5.0)
-    arel (4.0.2)
+      tzinfo (~> 1.1)
+    arel (5.0.1.20140414130214)
     bcrypt (3.1.9)
     bourbon (3.2.4)
       sass (~> 3.2)
       thor
-    builder (3.1.4)
-    coffee-rails (4.0.1)
+    builder (3.2.2)
+    coffee-rails (4.1.0)
       coffee-script (>= 2.2.0)
       railties (>= 4.0.0, < 5.0)
     coffee-script (2.3.0)
@@ -68,7 +69,7 @@ GEM
     foreman (0.77.0)
       dotenv (~> 1.0.2)
       thor (~> 0.19.1)
-    foundation-rails (5.2.3.0)
+    foundation-rails (5.4.5.0)
       railties (>= 3.1.0)
       sass (>= 3.2.0)
     gli (2.12.2)
@@ -93,7 +94,7 @@ GEM
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
     mime-types (1.25.1)
-    minitest (4.7.5)
+    minitest (5.5.1)
     multi_json (1.10.1)
     multi_xml (0.5.5)
     multipart-post (2.0.0)
@@ -130,23 +131,25 @@ GEM
       rack
     rack-test (0.6.3)
       rack (>= 1.0)
-    rails (4.0.3)
-      actionmailer (= 4.0.3)
-      actionpack (= 4.0.3)
-      activerecord (= 4.0.3)
-      activesupport (= 4.0.3)
+    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.3)
-      sprockets-rails (~> 2.0.0)
+      railties (= 4.1.0)
+      sprockets-rails (~> 2.0)
     rails_12factor (0.0.3)
       rails_serve_static_assets
       rails_stdout_logging
     rails_layout (1.0.24)
     rails_serve_static_assets (0.0.3)
     rails_stdout_logging (0.0.3)
-    railties (4.0.3)
-      actionpack (= 4.0.3)
-      activesupport (= 4.0.3)
+    railties (4.1.0)
+      actionpack (= 4.1.0)
+      activesupport (= 4.1.0)
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
     rake (10.4.2)
@@ -156,12 +159,13 @@ GEM
     rest-client (1.7.2)
       mime-types (>= 1.16, < 3.0)
       netrc (~> 0.7)
-    sass (3.2.19)
-    sass-rails (4.0.5)
+    sass (3.4.10)
+    sass-rails (5.0.1)
       railties (>= 4.0.0, < 5.0)
-      sass (~> 3.2.2)
-      sprockets (~> 2.8, < 3.0)
-      sprockets-rails (~> 2.0)
+      sass (~> 3.1)
+      sprockets (>= 2.8, < 4.0)
+      sprockets-rails (>= 2.0, < 4.0)
+      tilt (~> 1.1)
     settingslogic (2.0.9)
     shelly-dependencies (0.2.4)
       rake
@@ -179,10 +183,10 @@ GEM
       multi_json (~> 1.0)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
-    sprockets-rails (2.0.1)
+    sprockets-rails (2.2.2)
       actionpack (>= 3.0)
       activesupport (>= 3.0)
-      sprockets (~> 2.8)
+      sprockets (>= 2.8, < 4.0)
     thin (1.6.3)
       daemons (~> 1.0, >= 1.0.9)
       eventmachine (~> 1.0)
@@ -193,10 +197,8 @@ GEM
     treetop (1.4.15)
       polyglot
       polyglot (>= 0.3.1)
-    turn (0.9.7)
-      ansi
-      minitest (~> 4)
-    tzinfo (0.3.42)
+    tzinfo (1.2.2)
+      thread_safe (~> 0.1)
     uglifier (2.7.0)
       execjs (>= 0.3.0)
       json (>= 1.8.0)
@@ -209,15 +211,15 @@ PLATFORMS
 
 DEPENDENCIES
   bourbon
-  coffee-rails (~> 4.0.0)
+  coffee-rails (~> 4.1.0)
   devise (~> 3.4.1)
   dotenv-deployment
   dotenv-rails
   exception_notification (~> 4.0.1)
   font-awesome-sass
   foreigner
   foreman
-  foundation-rails (~> 5.2.0)
+  foundation-rails (~> 5.4.0)
   immigrant
   jquery-rails (~> 3.1.0)
   localeapp
@@ -226,15 +228,14 @@ DEPENDENCIES
   omniauth-twitter
   pg
   rack-robotz (~> 0.0.3)
-  rails (= 4.0.3)
+  rails (= 4.1.0)
   rails_12factor
   rails_layout
   redcarpet
-  sass-rails (~> 4.0.0)
+  sass-rails (~> 5.0.0)
   settingslogic
   shelly-dependencies
   simple_form (~> 3.1.0)
   simplecov
   thin
-  turn
   uglifier (>= 1.0.3)
diff --git a/app/assets/stylesheets/_fonts.css.scss → app/assets/stylesheets/_fonts.scss b/app/assets/stylesheets/_fonts.css.scss → app/assets/stylesheets/_fonts.scss
diff --git a/config/initializers/secret_token.rb b/config/initializers/secret_token.rb
diff --git a/config/secrets.yml b/config/secrets.yml
@@ -0,0 +1,8 @@
+development:
+  secret_key_base: <%= 'muegelsee' * 10 %>
+
+test:
+  secret_key_base: <%= 'muegelsee' * 10 %>
+
+production:
+  secret_key_base: <%= ENV["SECRET_KEY_BASE"] %>
diff --git a/test/test_helper.rb b/test/test_helper.rb
@@ -4,7 +4,6 @@
 
 require File.expand_path('../../config/environment', __FILE__)
 require 'rails/test_help'
-require 'turn/autorun'
 
 class ActiveSupport::TestCase
   # Setup all fixtures in test/fixtures/*.(yml|csv) for all tests in alphabetical order.