Merge branch 'development' into feature/assets-cleaned-up

config/application.rb

@@ -1,8 +1,28 @@
 require File.expand_path('../boot', __FILE__)
 
 require 'rails/all'
+require 'recaptcha/rails'
+require 'csv'
+
+# Require the gems listed in Gemfile, including any gems
+# you've limited to :test, :development, or :production.
+#if defined?(Bundler)
+# If you precompile assets before deploying to production, use this line
+#Bundler.require(*Rails.groups(:assets => %w(development test)))
+# If you want your assets lazily compiled in production, use this line
+# Bundler.require(:default, :assets, Rails.env)
+#end
+#Bundler.require(:default, Rails.env)
+#Changed when migrated to rails 4.0.0
 Bundler.require(*Rails.groups)
 
+begin
+  # If Rollbar has been included in the Bundle, load it here.
+  require "rollbar"
+rescue LoadError => e
+  # noop
+end
+
 module DMPRoadmap
   class Application < Rails::Application
 

config/initializers/rollbar.rb

@@ -1,12 +1,5 @@
 # frozen_string_literal: true
 
-begin
-  # If Rollbar has been included in the Bundle, load it here.
-  require "rollbar"
-rescue LoadError => e
-  # noop
-end
-
 if defined?(Rollbar)
   Rollbar.configure do |config|
     # Without configuration, Rollbar is enabled in all environments.