Pullin up Rails version

Gemfile

@@ -4,7 +4,7 @@ ruby '2.2.10'
 #ruby '2.2.2'
 
 gem 'dotenv-rails', '~> 0.10.0'
-gem 'rails', '~> 3.2.22'
+gem 'rails', '~> 4.0'
 gem 'mysql2', '~> 0.3.17'
 gem 'dalli', '~> 2.7.0'
 gem 'puma', '~> 2.11.1'
@@ -31,12 +31,11 @@ gem 'google-api-client', '~> 0.10.3'
 # Please install nodejs locally.
 #gem 'therubyracer', '~> 0.12.1' if RUBY_PLATFORM == 'x86_64-linux'
 
-gem 'sprockets', '~> 2.2.1'
+gem 'coffee-rails', '~> 4.1.0'
-gem 'coffee-rails', '~> 3.2.2'
 gem 'jquery-rails', '~> 2.0.2'
 gem 'tinymce-rails', '~> 3.5.9'
 gem 'sass', '~> 3.3.4'
-gem 'sass-rails', '~> 3.2.6'
+gem 'sass-rails', '~> 4.0.1'
 
 gem 'font-awesome-sass', '~> 4.1.0.0'
 gem 'bourbon', '~> 3.1.8'

Gemfile.lock

@@ -9,42 +9,49 @@ GIT
 GEM
   remote: http://rubygems.org/
   specs:
-    actionmailer (3.2.22.5)
+    actionmailer (4.2.10)
-      actionpack (= 3.2.22.5)
+      actionpack (= 4.2.10)
-      mail (~> 2.5.4)
+      actionview (= 4.2.10)
-    actionpack (3.2.22.5)
+      activejob (= 4.2.10)
-      activemodel (= 3.2.22.5)
+      mail (~> 2.5, >= 2.5.4)
-      activesupport (= 3.2.22.5)
+      rails-dom-testing (~> 1.0, >= 1.0.5)
-      builder (~> 3.0.0)
+    actionpack (4.2.10)
+      actionview (= 4.2.10)
+      activesupport (= 4.2.10)
+      rack (~> 1.6)
+      rack-test (~> 0.6.2)
+      rails-dom-testing (~> 1.0, >= 1.0.5)
+      rails-html-sanitizer (~> 1.0, >= 1.0.2)
+    actionview (4.2.10)
+      activesupport (= 4.2.10)
+      builder (~> 3.1)
       erubis (~> 2.7.0)
-      journey (~> 1.0.4)
+      rails-dom-testing (~> 1.0, >= 1.0.5)
-      rack (~> 1.4.5)
+      rails-html-sanitizer (~> 1.0, >= 1.0.3)
-      rack-cache (~> 1.2)
-      rack-test (~> 0.6.1)
-      sprockets (~> 2.2.1)
     active_link_to (1.0.5)
       actionpack
       addressable
-    activemodel (3.2.22.5)
+    activejob (4.2.10)
-      activesupport (= 3.2.22.5)
+      activesupport (= 4.2.10)
-      builder (~> 3.0.0)
+      globalid (>= 0.3.0)
-    activerecord (3.2.22.5)
+    activemodel (4.2.10)
-      activemodel (= 3.2.22.5)
+      activesupport (= 4.2.10)
-      activesupport (= 3.2.22.5)
+      builder (~> 3.1)
-      arel (~> 3.0.2)
+    activerecord (4.2.10)
-      tzinfo (~> 0.3.29)
+      activemodel (= 4.2.10)
-    activeresource (3.2.22.5)
+      activesupport (= 4.2.10)
-      activemodel (= 3.2.22.5)
+      arel (~> 6.0)
-      activesupport (= 3.2.22.5)
+    activesupport (4.2.10)
-    activesupport (3.2.22.5)
+      i18n (~> 0.7)
-      i18n (~> 0.6, >= 0.6.4)
+      minitest (~> 5.1)
-      multi_json (~> 1.0)
+      thread_safe (~> 0.3, >= 0.3.4)
+      tzinfo (~> 1.1)
     addressable (2.5.2)
       public_suffix (>= 2.0.2, < 4.0)
     annotate (2.6.10)
       activerecord (>= 3.2, <= 4.3)
       rake (~> 10.4)
-    arel (3.0.3)
+    arel (6.0.4)
     bbcoder (1.0.1)
     better_errors (1.1.0)
       coderay (>= 1.0.0)
@@ -55,7 +62,7 @@ GEM
     bourbon (3.1.8)
       sass (>= 3.2.0)
       thor
-    builder (3.0.4)
+    builder (3.2.3)
     byebug (2.7.0)
       columnize (~> 0.3)
       debugger-linecache (~> 1.2)
@@ -89,9 +96,9 @@ GEM
     codeclimate-test-reporter (0.3.0)
       simplecov (>= 0.7.1, < 1.0.0)
     coderay (1.1.2)
-    coffee-rails (3.2.2)
+    coffee-rails (4.1.1)
       coffee-script (>= 2.2.0)
-      railties (~> 3.2.0)
+      railties (>= 4.0.0, < 5.1.x)
     coffee-script (2.4.1)
       coffee-script-source
       execjs
@@ -106,6 +113,7 @@ GEM
     country_select (3.1.1)
       countries (~> 2.0)
       sort_alphabetical (~> 1.0)
+    crass (1.0.3)
     dalli (2.7.6)
     database_cleaner (1.2.0)
     debug_inspector (0.0.3)
@@ -131,6 +139,8 @@ GEM
     ffi (1.9.18)
     font-awesome-sass (4.1.0)
       sass (~> 3.2)
+    globalid (0.4.1)
+      activesupport (>= 4.2.0)
     google-api-client (0.10.3)
       addressable (~> 2.3)
       googleauth (~> 0.5)
@@ -158,23 +168,28 @@ GEM
     i18n-js (3.0.11)
       i18n (>= 0.6.6, < 2)
     i18n_data (0.8.0)
-    journey (1.0.4)
     jquery-rails (2.0.3)
       railties (>= 3.1.0, < 5.0)
       thor (~> 0.14)
-    json (1.8.6)
+    json (2.1.0)
     jwt (1.5.6)
     little-plugger (1.1.4)
     logging (2.2.2)
       little-plugger (~> 1.1)
       multi_json (~> 1.10)
-    mail (2.5.5)
+    loofah (2.1.1)
-      mime-types (~> 1.16)
+      crass (~> 1.0.2)
-      treetop (~> 1.4.8)
+      nokogiri (>= 1.5.9)
+    mail (2.7.0)
+      mini_mime (>= 0.1.1)
     memoist (0.16.0)
     method_source (0.9.0)
-    mime-types (1.25.1)
+    mime-types (3.1)
-    mini_portile2 (2.4.0)
+      mime-types-data (~> 3.2015)
+    mime-types-data (3.2016.0521)
+    mini_mime (1.0.0)
+    mini_portile2 (2.1.0)
+    minitest (5.10.3)
     money (6.10.0)
       i18n (>= 0.6.4, < 1.0)
     multi_json (1.12.2)
@@ -197,7 +212,6 @@ GEM
       cliver (~> 0.3.1)
       multi_json (~> 1.0)
       websocket-driver (>= 0.2.0)
-    polyglot (0.3.5)
     power_assert (1.1.1)
     pry (0.11.3)
       coderay (~> 1.1.0)
@@ -210,33 +224,37 @@ GEM
       rack (>= 1.1, < 2.0)
     quiet_assets (1.0.3)
       railties (>= 3.1, < 5.0)
-    rack (1.4.7)
+    rack (1.6.8)
-    rack-cache (1.7.1)
-      rack (>= 0.4)
-    rack-ssl (1.3.4)
-      rack
     rack-test (0.6.3)
       rack (>= 1.0)
-    rails (3.2.22.5)
+    rails (4.2.10)
-      actionmailer (= 3.2.22.5)
+      actionmailer (= 4.2.10)
-      actionpack (= 3.2.22.5)
+      actionpack (= 4.2.10)
-      activerecord (= 3.2.22.5)
+      actionview (= 4.2.10)
-      activeresource (= 3.2.22.5)
+      activejob (= 4.2.10)
-      activesupport (= 3.2.22.5)
+      activemodel (= 4.2.10)
-      bundler (~> 1.0)
+      activerecord (= 4.2.10)
-      railties (= 3.2.22.5)
+      activesupport (= 4.2.10)
+      bundler (>= 1.3.0, < 2.0)
+      railties (= 4.2.10)
+      sprockets-rails
+    rails-deprecated_sanitizer (1.0.3)
+      activesupport (>= 4.2.0.alpha)
+    rails-dom-testing (1.0.8)
+      activesupport (>= 4.2.0.beta, < 5.0)
+      nokogiri (~> 1.6)
+      rails-deprecated_sanitizer (>= 1.0.1)
+    rails-html-sanitizer (1.0.3)
+      loofah (~> 2.0)
     rails_autolink (1.1.6)
       rails (> 3.1)
-    railties (3.2.22.5)
+    railties (4.2.10)
-      actionpack (= 3.2.22.5)
+      actionpack (= 4.2.10)
-      activesupport (= 3.2.22.5)
+      activesupport (= 4.2.10)
-      rack-ssl (~> 1.3.2)
       rake (>= 0.8.7)
-      rdoc (~> 3.4)
+      thor (>= 0.18.1, < 2.0)
-      thor (>= 0.14.6, < 2.0)
     rake (10.5.0)
-    rdoc (3.12.2)
+    ref (2.0.0)
-      json (~> 1.4)
     representable (3.0.4)
       declarative (< 0.1.0)
       declarative-option (< 0.2.0)
@@ -264,10 +282,10 @@ GEM
     sanitize (2.1.0)
       nokogiri (>= 1.4.4)
     sass (3.3.14)
-    sass-rails (3.2.6)
+    sass-rails (4.0.1)
-      railties (~> 3.2.0)
+      railties (>= 4.0.0, < 5.0)
       sass (>= 3.1.10)
-      tilt (~> 1.3)
+      sprockets-rails (~> 2.0.0)
     selenium-webdriver (2.41.0)
       childprocess (>= 0.5.0)
       multi_json (~> 1.0)
@@ -285,25 +303,28 @@ GEM
     sixarm_ruby_unaccent (1.2.0)
     sort_alphabetical (1.1.0)
       unicode_utils (>= 1.2.2)
-    sprockets (2.2.3)
+    sprockets (2.12.4)
       hike (~> 1.2)
       multi_json (~> 1.0)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
+    sprockets-rails (2.0.1)
+      actionpack (>= 3.0)
+      activesupport (>= 3.0)
+      sprockets (~> 2.8)
     sshkit (1.15.1)
       net-scp (>= 1.1.2)
       net-ssh (>= 2.8.0)
     test-unit (3.1.9)
       power_assert
     thor (0.20.0)
+    thread_safe (0.3.6)
     tilt (1.4.1)
     timecop (0.7.4)
     tinymce-rails (3.5.11.1)
       railties (>= 3.1.1)
-    treetop (1.4.15)
+    tzinfo (1.2.4)
-      polyglot
+      thread_safe (~> 0.1)
-      polyglot (>= 0.3.1)
-    tzinfo (0.3.53)
     uber (0.1.0)
     uglifier (2.5.3)
       execjs (>= 0.3.0)
@@ -335,7 +356,7 @@ DEPENDENCIES
   capybara (~> 2.4.4)
   carrierwave (~> 0.10.0)
   codeclimate-test-reporter (~> 0.3.0)
-  coffee-rails (~> 3.2.2)
+  coffee-rails (~> 4.1.0)
   country_select
   dalli (~> 2.7.0)
   database_cleaner (~> 1.2.0)
@@ -358,16 +379,15 @@ DEPENDENCIES
   pry-byebug (~> 1.3.2)
   puma (~> 2.11.1)
   quiet_assets (~> 1.0.2)
-  rails (~> 3.2.22)
+  rails (~> 4.0)
   rails_autolink (~> 1.1.5)
   rmagick (~> 2.13.4)
   rspec-rails (~> 3.3.3)
   sanitize (~> 2.1.0)
   sass (~> 3.3.4)
-  sass-rails (~> 3.2.6)
+  sass-rails (~> 4.0.1)
   selenium-webdriver (~> 2.41.0)
   simplecov (~> 0.7.1)
-  sprockets (~> 2.2.1)
   steam-condenser!
   test-unit (~> 3.1.3)
   timecop (~> 0.7.1)

config/environments/development.rb

@@ -31,6 +31,8 @@ Ensl::Application.configure do
   # Use a different cache store
   config.cache_store = :dalli_store
 
+  config.eager_load = false
+
   # Enable threaded mode
   # config.threadsafe!
 end

config/environments/production.rb

@@ -70,6 +70,5 @@ Ensl::Application.configure do
   # Custom Session Store config to allow gathers.staging.ensl.org
   config.session_store :cookie_store, key: "_ENSL_session_key", expire_after: 30.days.to_i, domain: ".ensl.org"
 
-#  config.cache_store = :dalli_store, 'cache', 'cache-2.example.com:11211:2',
+  config.eager_load = true
-#  { :namespace => NAME_OF_RAILS_APP, :expires_in => 1.day, :compress => true }
 end

config/environments/staging.rb

@@ -64,4 +64,6 @@ Ensl::Application.configure do
 
   # Custom Session Store config to allow gathers.staging.ensl.org
   config.session_store :cookie_store, key: "_ENSL_session_key_staging", expire_after: 30.days.to_i, domain: ".staging.ensl.org"
+
+  config.eager_load = true
 end

config/environments/test.rb

@@ -32,4 +32,6 @@ Ensl::Application.configure do
 
   # Print deprecation notices to the stderr
   config.active_support.deprecation = :stderr
+
+  config.eager_load = false
 end