Upgrade to 4.2, update related gems, disable ssl requirement

Gemfile

@@ -1,6 +1,6 @@
 source 'http://rubygems.org'
 
-gem 'rails',                   '4.1.16'
+gem 'rails',                   '4.2.8'
 
 gem 'rake',                    '0.9.2.2'
 gem 'pg',                      '0.15.0'
@@ -12,6 +12,7 @@ gem 'activerecord-postgresql-adapter'
 # gem 'activerecord-postgres-array', '0.0.9'
 
 gem 'protected_attributes'
+gem 'responders', '~> 2.0'
 
 gem 'sequel-rails'
 
@@ -72,10 +73,6 @@ gem 'uuidtools',                '2.1.5'
 # Markdown
 gem 'redcarpet', '3.3.3'
 
-# TODO we should be able to remove this using the new
-#      Rails routes DSL
-gem 'bartt-ssl_requirement',   '~>1.4.0', require: 'ssl_requirement'
-
 # TODO Production gems, put them in :production group
 gem 'rollbar',               '~>2.11.1'
 gem 'resque',                '1.25.2'

Gemfile.lock

@@ -9,39 +9,47 @@ GIT
 GEM
   remote: http://rubygems.org/
   specs:
-    actionmailer (4.1.16)
+    actionmailer (4.2.8)
-      actionpack (= 4.1.16)
+      actionpack (= 4.2.8)
-      actionview (= 4.1.16)
+      actionview (= 4.2.8)
+      activejob (= 4.2.8)
       mail (~> 2.5, >= 2.5.4)
-    actionpack (4.1.16)
+      rails-dom-testing (~> 1.0, >= 1.0.5)
-      actionview (= 4.1.16)
+    actionpack (4.2.8)
-      activesupport (= 4.1.16)
+      actionview (= 4.2.8)
-      rack (~> 1.5.2)
+      activesupport (= 4.2.8)
+      rack (~> 1.6)
       rack-test (~> 0.6.2)
-    actionview (4.1.16)
+      rails-dom-testing (~> 1.0, >= 1.0.5)
-      activesupport (= 4.1.16)
+      rails-html-sanitizer (~> 1.0, >= 1.0.2)
+    actionview (4.2.8)
+      activesupport (= 4.2.8)
       builder (~> 3.1)
       erubis (~> 2.7.0)
-    activemodel (4.1.16)
+      rails-dom-testing (~> 1.0, >= 1.0.5)
-      activesupport (= 4.1.16)
+      rails-html-sanitizer (~> 1.0, >= 1.0.3)
+    activejob (4.2.8)
+      activesupport (= 4.2.8)
+      globalid (>= 0.3.0)
+    activemodel (4.2.8)
+      activesupport (= 4.2.8)
       builder (~> 3.1)
-    activerecord (4.1.16)
+    activerecord (4.2.8)
-      activemodel (= 4.1.16)
+      activemodel (= 4.2.8)
-      activesupport (= 4.1.16)
+      activesupport (= 4.2.8)
-      arel (~> 5.0.0)
+      arel (~> 6.0)
     activerecord-nulldb-adapter (0.3.1)
       activerecord (>= 2.0.0)
     activerecord-postgresql-adapter (0.0.1)
       pg
-    activesupport (4.1.16)
+    activesupport (4.2.8)
-      i18n (~> 0.6, >= 0.6.9)
+      i18n (~> 0.7)
-      json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
-      thread_safe (~> 0.1)
+      thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
     addressable (2.3.2)
     analytics-ruby (2.0.13)
-    arel (5.0.1.20140414130214)
+    arel (6.0.4)
     autoparse (0.3.3)
       addressable (>= 2.3.1)
       extlib (>= 0.9.15)
@@ -54,7 +62,6 @@ GEM
       descendants_tracker (~> 0.0.4)
       ice_nine (~> 0.11.0)
       thread_safe (~> 0.3, >= 0.3.1)
-    bartt-ssl_requirement (1.4.2)
     builder (3.2.3)
     byebug (8.2.2)
     capybara (1.1.2)
@@ -128,6 +135,8 @@ GEM
     gibbon (1.1.4)
       httparty
       multi_json (>= 1.3.4)
+    globalid (0.3.7)
+      activesupport (>= 4.1.0)
     google-api-client (0.7.0)
       addressable (>= 2.3.2)
       autoparse (>= 0.3.3)
@@ -157,6 +166,8 @@ GEM
     kgio (2.10.0)
     launchy (2.4.3)
       addressable (~> 2.3)
+    loofah (2.0.3)
+      nokogiri (>= 1.5.9)
     mail (2.6.4)
       mime-types (>= 1.16, < 4)
     memory_profiler (0.9.6)
@@ -192,26 +203,35 @@ GEM
     power_assert (0.2.7)
     protected_attributes (1.1.3)
       activemodel (>= 4.0.1, < 5.0)
-    rack (1.5.5)
+    rack (1.6.5)
     rack-protection (1.5.3)
       rack
     rack-test (0.6.3)
       rack (>= 1.0)
-    rails (4.1.16)
+    rails (4.2.8)
-      actionmailer (= 4.1.16)
+      actionmailer (= 4.2.8)
-      actionpack (= 4.1.16)
+      actionpack (= 4.2.8)
-      actionview (= 4.1.16)
+      actionview (= 4.2.8)
-      activemodel (= 4.1.16)
+      activejob (= 4.2.8)
-      activerecord (= 4.1.16)
+      activemodel (= 4.2.8)
-      activesupport (= 4.1.16)
+      activerecord (= 4.2.8)
+      activesupport (= 4.2.8)
       bundler (>= 1.3.0, < 2.0)
-      railties (= 4.1.16)
+      railties (= 4.2.8)
-      sprockets-rails (~> 2.0)
+      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_warden (0.5.8)
       warden (>= 1.0.0)
-    railties (4.1.16)
+    railties (4.2.8)
-      actionpack (= 4.1.16)
+      actionpack (= 4.2.8)
-      activesupport (= 4.1.16)
+      activesupport (= 4.2.8)
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
     raindrops (0.15.0)
@@ -229,6 +249,8 @@ GEM
     redis-namespace (1.5.2)
       redis (~> 3.0, >= 3.0.4)
     request_store (1.1.0)
+    responders (2.3.0)
+      railties (>= 4.2.0, < 5.1)
     resque (1.25.2)
       mono_logger (~> 1.0)
       multi_json (~> 1.0)
@@ -299,10 +321,10 @@ GEM
     sprockets (3.7.1)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
-    sprockets-rails (2.3.3)
+    sprockets-rails (3.2.0)
-      actionpack (>= 3.0)
+      actionpack (>= 4.0)
-      activesupport (>= 3.0)
+      activesupport (>= 4.0)
-      sprockets (>= 2.8, < 4.0)
+      sprockets (>= 3.0.0)
     state_machines (0.4.0)
     state_machines-activemodel (0.4.0)
       activemodel (>= 4.1, < 5.1)
@@ -358,7 +380,6 @@ DEPENDENCIES
   addressable (= 2.3.2)
   analytics-ruby (~> 2.0.0)
   aws-sdk (= 1.8.5)
-  bartt-ssl_requirement (~> 1.4.0)
   byebug
   capybara (= 1.1.2)
   charlock_holmes (= 0.7.2)
@@ -394,7 +415,7 @@ DEPENDENCIES
   protected_attributes
   rack
   rack-test (= 0.6.3)
-  rails (= 4.1.16)
+  rails (= 4.2.8)
   rails_warden (= 0.5.8)
   raindrops (= 0.15.0)
   rake (= 0.9.2.2)
@@ -403,6 +424,7 @@ DEPENDENCIES
   redcarpet (= 3.3.3)
   redis (= 3.3.0)
   request_store (= 1.1.0)
+  responders (~> 2.0)
   resque (= 1.25.2)
   resque-metrics (= 0.1.1)
   retriable (= 1.4.1)

app/controllers/application_controller.rb

@@ -3,7 +3,7 @@ require_relative '../../lib/cartodb/profiler.rb'
 require_dependency 'carto/http_header_authentication'
 
 class ApplicationController < ActionController::Base
-  include ::SslRequirement
+  #include ::SslRequirement
   include UrlHelper
   protect_from_forgery
 

app/controllers/superadmin/superadmin_controller.rb

@@ -1,5 +1,5 @@
 class Superadmin::SuperadminController < ActionController::Base
-  include SslRequirement
+  #include SslRequirement
   before_filter :authenticate
 
   rescue_from StandardError, with: :rescue_from_superadmin_error

app/models/carto/map.rb

@@ -17,7 +17,8 @@ class Carto::Map < ActiveRecord::Base
                                                through: :layers_maps,
                                                source: :layer
 
-  has_one :user_table, class_name: Carto::UserTable, inverse_of: :map, dependent: :destroy
+  # autosave must be explicitly disabled due to https://github.com/rails/rails/issues/9336
+  has_one :user_table, class_name: Carto::UserTable, inverse_of: :map, dependent: :destroy, autosave: false
 
   belongs_to :user
 

config/environments/production.rb

@@ -74,4 +74,6 @@ CartoDB::Application.configure do
   config.action_controller.asset_host = Proc.new do
     Cartodb.asset_path
   end
+
+  config.force_ssl = true
 end

config/environments/staging.rb

@@ -69,4 +69,6 @@ CartoDB::Application.configure do
   config.action_controller.asset_host = Proc.new do
     Cartodb.asset_path
   end
+
+  config.force_ssl = true
 end