rails 4.0.10

Some of these tweaks to bin and config were made just to match what a
newly-generated rails4 project looks like.

Change-Id: I57a7c71e2ddd7f3295ffadf30cb0976c4d15db6a
Reviewed-on: https://gerrit.instructure.com/41186
Reviewed-by: Cody Cutrer <cody@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
Product-Review: Brian Palmer <brianp@instructure.com>
QA-Review: Brian Palmer <brianp@instructure.com>

Gemfile.d/other_stuff.rb

@@ -5,14 +5,14 @@ if CANVAS_RAILS3
   gem 'builder', '3.0.0'
   gem 'tzinfo', '0.3.39'
   gem 'encrypted_cookie_store-instructure', '1.1.6', :require => 'encrypted_cookie_store'
+  gem 'routing_concerns', '0.1.0'
 else
-  gem 'rails', '4.1.5'
+  gem 'rails', '4.0.10'
   gem 'rack', '1.5.2'
   gem 'builder', '3.1.4'
-  gem 'tzinfo', '1.1.0'
+  gem 'tzinfo', '0.3.39'
   gem 'protected_attributes', '1.0.8'
   gem 'rails-observers', '0.1.2'
-  gem 'activesupport-json_encoder', '1.1.0'
 end
 gem 'active_model_serializers', '0.9.0alpha1',
   :github => 'rails-api/active_model_serializers', :ref => '61882e1e4127facfe92e49057aec71edbe981829'
@@ -20,7 +20,6 @@ gem 'authlogic', '3.3.0'
 gem 'active_model-better_errors', '1.6.7', :require => 'active_model/better_errors'
 gem 'dynamic_form', '1.1.4'
 gem 'rails-patch-json-encode', '0.0.1'
-gem 'routing_concerns', '0.1.0'
 gem 'switchman', '1.2.18'
 gem 'folio-pagination', '0.0.7', :require => 'folio/rails'
 gem 'will_paginate', '3.0.4', :require => false

bin/rails

@@ -3,8 +3,7 @@ begin
   load File.expand_path("../spring", __FILE__)
 rescue LoadError
 end
-# This command will automatically be run when you run "rails" with Rails 3 gems installed from the root of your application.
 
 APP_PATH = File.expand_path('../../config/application',  __FILE__)
-require File.expand_path('../../config/boot',  __FILE__)
+require_relative '../config/boot'
 require 'rails/commands'

config/application.rb

@@ -3,15 +3,15 @@ require File.expand_path('../boot', __FILE__)
 
 unless CANVAS_RAILS3
   require "rails/all"
+  Bundler.require(*Rails.groups)
 else
   require "active_record/railtie"
   require "action_controller/railtie"
   require "action_mailer/railtie"
   require "active_resource/railtie"
+  Bundler.require(:default, Rails.env) if defined?(Bundler)
 end
 
-Bundler.require(:default, Rails.env) if defined?(Bundler)
-
 module CanvasRails
   class Application < Rails::Application
     config.autoload_paths += [config.root.join('lib').to_s]

config/boot.rb

@@ -1,7 +1,4 @@
-# Don't change this file!
-# Configure your app in config/environment.rb and config/environments/*.rb
-
-require 'rubygems'
 # Set up gems listed in the Gemfile.
 ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__)
-require 'bundler/setup' if File.exists?(ENV['BUNDLE_GEMFILE'])
+
+require 'bundler/setup' if File.exists?(ENV['BUNDLE_GEMFILE'])

config/initializers/json.rb

@@ -1,8 +1,5 @@
-if CANVAS_RAILS3
-  # In rails 3.2, this calls MultiJson.use(:oj)
-  ActiveSupport::JSON.backend = :oj
-  MultiJson.dump_options = {:escape_mode => :xss_safe}
-end
+ActiveSupport::JSON.backend = :oj
+MultiJson.dump_options = {:escape_mode => :xss_safe}
 
 # Rails4 gives an option to opt out of encoding BigDecimal json as a string
 if ActiveSupport.respond_to?(:encode_big_decimal_as_string)