Merge pull request #1245 from cantino/update_rails_to_4_2_5_1
Update Rails to 4.2.5.1 and unify configuration files
Andrew Cantino
11 changed files with 85 additions and 73 deletions
+ 1
- 1
Gemfile
@@ -94,7 +94,7 @@ gem 'mini_magick' |
||
| 94 | 94 |
gem 'multi_xml' |
| 95 | 95 |
gem 'nokogiri', '1.6.7.2' |
| 96 | 96 |
gem 'omniauth' |
| 97 |
-gem 'rails', '4.2.4' |
|
| 97 |
+gem 'rails', '4.2.5.1' |
|
| 98 | 98 |
gem 'rufus-scheduler', '~> 3.0.8', require: false |
| 99 | 99 |
gem 'sass-rails', '~> 5.0.3' |
| 100 | 100 |
gem 'select2-rails', '~> 3.5.4' |
+ 42
- 40
Gemfile.lock
@@ -69,36 +69,36 @@ GEM |
||
| 69 | 69 |
remote: https://rubygems.org/ |
| 70 | 70 |
specs: |
| 71 | 71 |
ace-rails-ap (2.0.1) |
| 72 |
- actionmailer (4.2.4) |
|
| 73 |
- actionpack (= 4.2.4) |
|
| 74 |
- actionview (= 4.2.4) |
|
| 75 |
- activejob (= 4.2.4) |
|
| 72 |
+ actionmailer (4.2.5.1) |
|
| 73 |
+ actionpack (= 4.2.5.1) |
|
| 74 |
+ actionview (= 4.2.5.1) |
|
| 75 |
+ activejob (= 4.2.5.1) |
|
| 76 | 76 |
mail (~> 2.5, >= 2.5.4) |
| 77 | 77 |
rails-dom-testing (~> 1.0, >= 1.0.5) |
| 78 |
- actionpack (4.2.4) |
|
| 79 |
- actionview (= 4.2.4) |
|
| 80 |
- activesupport (= 4.2.4) |
|
| 78 |
+ actionpack (4.2.5.1) |
|
| 79 |
+ actionview (= 4.2.5.1) |
|
| 80 |
+ activesupport (= 4.2.5.1) |
|
| 81 | 81 |
rack (~> 1.6) |
| 82 | 82 |
rack-test (~> 0.6.2) |
| 83 | 83 |
rails-dom-testing (~> 1.0, >= 1.0.5) |
| 84 | 84 |
rails-html-sanitizer (~> 1.0, >= 1.0.2) |
| 85 |
- actionview (4.2.4) |
|
| 86 |
- activesupport (= 4.2.4) |
|
| 85 |
+ actionview (4.2.5.1) |
|
| 86 |
+ activesupport (= 4.2.5.1) |
|
| 87 | 87 |
builder (~> 3.1) |
| 88 | 88 |
erubis (~> 2.7.0) |
| 89 | 89 |
rails-dom-testing (~> 1.0, >= 1.0.5) |
| 90 | 90 |
rails-html-sanitizer (~> 1.0, >= 1.0.2) |
| 91 |
- activejob (4.2.4) |
|
| 92 |
- activesupport (= 4.2.4) |
|
| 91 |
+ activejob (4.2.5.1) |
|
| 92 |
+ activesupport (= 4.2.5.1) |
|
| 93 | 93 |
globalid (>= 0.3.0) |
| 94 |
- activemodel (4.2.4) |
|
| 95 |
- activesupport (= 4.2.4) |
|
| 94 |
+ activemodel (4.2.5.1) |
|
| 95 |
+ activesupport (= 4.2.5.1) |
|
| 96 | 96 |
builder (~> 3.1) |
| 97 |
- activerecord (4.2.4) |
|
| 98 |
- activemodel (= 4.2.4) |
|
| 99 |
- activesupport (= 4.2.4) |
|
| 97 |
+ activerecord (4.2.5.1) |
|
| 98 |
+ activemodel (= 4.2.5.1) |
|
| 99 |
+ activesupport (= 4.2.5.1) |
|
| 100 | 100 |
arel (~> 6.0) |
| 101 |
- activesupport (4.2.4) |
|
| 101 |
+ activesupport (4.2.5.1) |
|
| 102 | 102 |
i18n (~> 0.7) |
| 103 | 103 |
json (~> 1.7, >= 1.7.7) |
| 104 | 104 |
minitest (~> 5.1) |
@@ -158,6 +158,7 @@ GEM |
||
| 158 | 158 |
execjs |
| 159 | 159 |
coffee-script-source (1.9.1) |
| 160 | 160 |
colorize (0.7.7) |
| 161 |
+ concurrent-ruby (1.0.0) |
|
| 161 | 162 |
cookiejar (0.3.2) |
| 162 | 163 |
coveralls (0.7.1) |
| 163 | 164 |
multi_json (~> 1.3) |
@@ -315,10 +316,10 @@ GEM |
||
| 315 | 316 |
memoizable (0.4.2) |
| 316 | 317 |
thread_safe (~> 0.3, >= 0.3.1) |
| 317 | 318 |
method_source (0.8.2) |
| 318 |
- mime-types (2.6.1) |
|
| 319 |
+ mime-types (2.99) |
|
| 319 | 320 |
mini_magick (4.2.3) |
| 320 | 321 |
mini_portile2 (2.0.0) |
| 321 |
- minitest (5.8.3) |
|
| 322 |
+ minitest (5.8.4) |
|
| 322 | 323 |
mqtt (0.3.1) |
| 323 | 324 |
multi_json (1.11.2) |
| 324 | 325 |
multi_xml (0.5.5) |
@@ -380,16 +381,16 @@ GEM |
||
| 380 | 381 |
rack (1.6.4) |
| 381 | 382 |
rack-test (0.6.3) |
| 382 | 383 |
rack (>= 1.0) |
| 383 |
- rails (4.2.4) |
|
| 384 |
- actionmailer (= 4.2.4) |
|
| 385 |
- actionpack (= 4.2.4) |
|
| 386 |
- actionview (= 4.2.4) |
|
| 387 |
- activejob (= 4.2.4) |
|
| 388 |
- activemodel (= 4.2.4) |
|
| 389 |
- activerecord (= 4.2.4) |
|
| 390 |
- activesupport (= 4.2.4) |
|
| 384 |
+ rails (4.2.5.1) |
|
| 385 |
+ actionmailer (= 4.2.5.1) |
|
| 386 |
+ actionpack (= 4.2.5.1) |
|
| 387 |
+ actionview (= 4.2.5.1) |
|
| 388 |
+ activejob (= 4.2.5.1) |
|
| 389 |
+ activemodel (= 4.2.5.1) |
|
| 390 |
+ activerecord (= 4.2.5.1) |
|
| 391 |
+ activesupport (= 4.2.5.1) |
|
| 391 | 392 |
bundler (>= 1.3.0, < 2.0) |
| 392 |
- railties (= 4.2.4) |
|
| 393 |
+ railties (= 4.2.5.1) |
|
| 393 | 394 |
sprockets-rails |
| 394 | 395 |
rails-deprecated_sanitizer (1.0.3) |
| 395 | 396 |
activesupport (>= 4.2.0.alpha) |
@@ -397,20 +398,20 @@ GEM |
||
| 397 | 398 |
activesupport (>= 4.2.0.beta, < 5.0) |
| 398 | 399 |
nokogiri (~> 1.6.0) |
| 399 | 400 |
rails-deprecated_sanitizer (>= 1.0.1) |
| 400 |
- rails-html-sanitizer (1.0.2) |
|
| 401 |
+ rails-html-sanitizer (1.0.3) |
|
| 401 | 402 |
loofah (~> 2.0) |
| 402 | 403 |
rails_12factor (0.0.3) |
| 403 | 404 |
rails_serve_static_assets |
| 404 | 405 |
rails_stdout_logging |
| 405 | 406 |
rails_serve_static_assets (0.0.4) |
| 406 | 407 |
rails_stdout_logging (0.0.3) |
| 407 |
- railties (4.2.4) |
|
| 408 |
- actionpack (= 4.2.4) |
|
| 409 |
- activesupport (= 4.2.4) |
|
| 408 |
+ railties (4.2.5.1) |
|
| 409 |
+ actionpack (= 4.2.5.1) |
|
| 410 |
+ activesupport (= 4.2.5.1) |
|
| 410 | 411 |
rake (>= 0.8.7) |
| 411 | 412 |
thor (>= 0.18.1, < 2.0) |
| 412 | 413 |
raindrops (0.13.0) |
| 413 |
- rake (10.4.2) |
|
| 414 |
+ rake (10.5.0) |
|
| 414 | 415 |
rb-fsevent (0.9.4) |
| 415 | 416 |
rb-inotify (0.9.5) |
| 416 | 417 |
ffi (>= 0.5.0) |
@@ -485,12 +486,13 @@ GEM |
||
| 485 | 486 |
slop (3.6.0) |
| 486 | 487 |
spectrum-rails (1.3.4) |
| 487 | 488 |
railties (>= 3.1) |
| 488 |
- sprockets (3.3.4) |
|
| 489 |
- rack (~> 1.0) |
|
| 490 |
- sprockets-rails (2.3.2) |
|
| 491 |
- actionpack (>= 3.0) |
|
| 492 |
- activesupport (>= 3.0) |
|
| 493 |
- sprockets (>= 2.8, < 4.0) |
|
| 489 |
+ sprockets (3.5.2) |
|
| 490 |
+ concurrent-ruby (~> 1.0) |
|
| 491 |
+ rack (> 1, < 3) |
|
| 492 |
+ sprockets-rails (3.0.0) |
|
| 493 |
+ actionpack (>= 4.0) |
|
| 494 |
+ activesupport (>= 4.0) |
|
| 495 |
+ sprockets (>= 3.0.0) |
|
| 494 | 496 |
sshkit (1.7.1) |
| 495 | 497 |
colorize (>= 0.7.0) |
| 496 | 498 |
net-scp (>= 1.1.2) |
@@ -620,7 +622,7 @@ DEPENDENCIES |
||
| 620 | 622 |
pry-rails |
| 621 | 623 |
quiet_assets |
| 622 | 624 |
rack (> 1.5.0) |
| 623 |
- rails (= 4.2.4) |
|
| 625 |
+ rails (= 4.2.5.1) |
|
| 624 | 626 |
rails_12factor |
| 625 | 627 |
rr |
| 626 | 628 |
rspec (~> 3.2) |
+ 3
- 8
config/application.rb
@@ -2,7 +2,9 @@ require File.expand_path('../boot', __FILE__)
|
||
| 2 | 2 |
|
| 3 | 3 |
require 'rails/all' |
| 4 | 4 |
|
| 5 |
-Bundler.require(:default, Rails.env) |
|
| 5 |
+# Require the gems listed in Gemfile, including any gems |
|
| 6 |
+# you've limited to :test, :development, or :production. |
|
| 7 |
+Bundler.require(*Rails.groups) |
|
| 6 | 8 |
|
| 7 | 9 |
module Huginn |
| 8 | 10 |
class Application < Rails::Application |
@@ -29,9 +31,6 @@ module Huginn |
||
| 29 | 31 |
# Configure the default encoding used in templates for Ruby 1.9. |
| 30 | 32 |
config.encoding = "utf-8" |
| 31 | 33 |
|
| 32 |
- # Configure sensitive parameters which will be filtered from the log file. |
|
| 33 |
- config.filter_parameters += [:password] |
|
| 34 |
- |
|
| 35 | 34 |
# Enable escaping HTML in JSON. |
| 36 | 35 |
config.active_support.escape_html_entities_in_json = true |
| 37 | 36 |
|
@@ -46,10 +45,6 @@ module Huginn |
||
| 46 | 45 |
# parameters by using an attr_accessible or attr_protected declaration. |
| 47 | 46 |
config.active_record.whitelist_attributes = true |
| 48 | 47 |
|
| 49 |
- # Enable the asset pipeline |
|
| 50 |
- config.assets.enabled = true |
|
| 51 |
- config.assets.initialize_on_precompile = false |
|
| 52 |
- |
|
| 53 | 48 |
# Do not swallow errors in after_commit/after_rollback callbacks. |
| 54 | 49 |
config.active_record.raise_in_transactional_callbacks = true |
| 55 | 50 |
|
+ 5
- 0
config/environments/development.rb
@@ -37,6 +37,11 @@ Huginn::Application.configure do |
||
| 37 | 37 |
# yet still be able to expire them through the digest params. |
| 38 | 38 |
config.assets.digest = true |
| 39 | 39 |
|
| 40 |
+ # Adds additional error checking when serving assets at runtime. |
|
| 41 |
+ # Checks for improperly declared sprockets dependencies. |
|
| 42 |
+ # Raises helpful error messages. |
|
| 43 |
+ config.assets.raise_runtime_errors = true |
|
| 44 |
+ |
|
| 40 | 45 |
config.action_mailer.default_url_options = { :host => ENV['DOMAIN'] }
|
| 41 | 46 |
config.action_mailer.asset_host = ENV['DOMAIN'] |
| 42 | 47 |
config.action_mailer.raise_delivery_errors = true |
+ 1
- 6
config/environments/production.rb
@@ -33,10 +33,8 @@ Huginn::Application.configure do |
||
| 33 | 33 |
|
| 34 | 34 |
# Generate digests for assets URLs |
| 35 | 35 |
config.assets.digest = true |
| 36 |
- config.assets.precompile += %w(*.png *.jpg *.jpeg *.gif) |
|
| 37 | 36 |
|
| 38 |
- # Bootstrap fonts |
|
| 39 |
- config.assets.precompile += %w(*.woff *.eot *.svg *.ttf) |
|
| 37 |
+ # `config.assets.precompile` and `config.assets.version` have moved to config/initializers/assets.rb |
|
| 40 | 38 |
|
| 41 | 39 |
# Specifies the header that your server uses for sending files. |
| 42 | 40 |
# config.action_dispatch.x_sendfile_header = "X-Sendfile" # for apache |
@@ -62,9 +60,6 @@ Huginn::Application.configure do |
||
| 62 | 60 |
config.action_controller.asset_host = ENV['ASSET_HOST'] |
| 63 | 61 |
end |
| 64 | 62 |
|
| 65 |
- # Precompile additional assets (application.js.coffee.erb, application.css, and all non-JS/CSS are already added) |
|
| 66 |
- config.assets.precompile += %w( diagram.js graphing.js map_marker.js ace.js ) |
|
| 67 |
- |
|
| 68 | 63 |
# Ignore bad email addresses and do not raise email delivery errors. |
| 69 | 64 |
# Set this to true and configure the email server for immediate delivery to raise delivery errors. |
| 70 | 65 |
# config.action_mailer.raise_delivery_errors = false |
+ 16
- 0
config/initializers/assets.rb
@@ -0,0 +1,16 @@ |
||
| 1 |
+# Be sure to restart your server when you modify this file. |
|
| 2 |
+ |
|
| 3 |
+Rails.application.config.assets.enabled = true |
|
| 4 |
+Rails.application.config.assets.initialize_on_precompile = false |
|
| 5 |
+ |
|
| 6 |
+# Version of your assets, change this if you want to expire all your assets. |
|
| 7 |
+Rails.application.config.assets.version = '1.0' |
|
| 8 |
+ |
|
| 9 |
+# Add additional assets to the asset load path |
|
| 10 |
+# Rails.application.config.assets.paths << Emoji.images_path |
|
| 11 |
+ |
|
| 12 |
+# Precompile additional assets (application.js.coffee.erb, application.css, and all non-JS/CSS are already added) |
|
| 13 |
+Rails.application.config.assets.precompile += %w( diagram.js graphing.js map_marker.js ace.js ) |
|
| 14 |
+ |
|
| 15 |
+Rails.application.config.assets.precompile += %w(*.png *.jpg *.jpeg *.gif) |
|
| 16 |
+Rails.application.config.assets.precompile += %w(*.woff *.eot *.svg *.ttf) # Bootstrap fonts |
+ 4
- 0
config/initializers/filter_parameter_logging.rb
@@ -0,0 +1,4 @@ |
||
| 1 |
+# Be sure to restart your server when you modify this file. |
|
| 2 |
+ |
|
| 3 |
+# Configure sensitive parameters which will be filtered from the log file. |
|
| 4 |
+Rails.application.config.filter_parameters += [:password] |
+ 6
- 5
config/initializers/inflections.rb
@@ -1,15 +1,16 @@ |
||
| 1 | 1 |
# Be sure to restart your server when you modify this file. |
| 2 | 2 |
|
| 3 |
-# Add new inflection rules using the following format |
|
| 4 |
-# (all these examples are active by default): |
|
| 5 |
-# ActiveSupport::Inflector.inflections do |inflect| |
|
| 3 |
+# Add new inflection rules using the following format. Inflections |
|
| 4 |
+# are locale specific, and you may define rules for as many different |
|
| 5 |
+# locales as you wish. All of these examples are active by default: |
|
| 6 |
+# ActiveSupport::Inflector.inflections(:en) do |inflect| |
|
| 6 | 7 |
# inflect.plural /^(ox)$/i, '\1en' |
| 7 | 8 |
# inflect.singular /^(ox)en/i, '\1' |
| 8 | 9 |
# inflect.irregular 'person', 'people' |
| 9 | 10 |
# inflect.uncountable %w( fish sheep ) |
| 10 | 11 |
# end |
| 11 |
-# |
|
| 12 |
+ |
|
| 12 | 13 |
# These inflection rules are supported but not enabled by default: |
| 13 |
-# ActiveSupport::Inflector.inflections do |inflect| |
|
| 14 |
+# ActiveSupport::Inflector.inflections(:en) do |inflect| |
|
| 14 | 15 |
# inflect.acronym 'RESTful' |
| 15 | 16 |
# end |
+ 0
- 1
config/initializers/mime_types.rb
@@ -2,4 +2,3 @@ |
||
| 2 | 2 |
|
| 3 | 3 |
# Add new mime types for use in respond_to blocks: |
| 4 | 4 |
# Mime::Type.register "text/richtext", :rtf |
| 5 |
-# Mime::Type.register_alias "text/html", :iphone |
+ 1
- 6
config/initializers/session_store.rb
@@ -1,8 +1,3 @@ |
||
| 1 | 1 |
# Be sure to restart your server when you modify this file. |
| 2 | 2 |
|
| 3 |
-Huginn::Application.config.session_store :cookie_store, key: '_rails_session' |
|
| 4 |
- |
|
| 5 |
-# Use the database for sessions instead of the cookie-based default, |
|
| 6 |
-# which shouldn't be used to store highly confidential information |
|
| 7 |
-# (create the session table with "rails generate session_migration") |
|
| 8 |
-# Huginn::Application.config.session_store :active_record_store |
|
| 3 |
+Rails.application.config.session_store :cookie_store, key: '_rails_session' |
+ 6
- 6
config/initializers/wrap_parameters.rb
@@ -1,14 +1,14 @@ |
||
| 1 | 1 |
# Be sure to restart your server when you modify this file. |
| 2 |
-# |
|
| 2 |
+ |
|
| 3 | 3 |
# This file contains settings for ActionController::ParamsWrapper which |
| 4 | 4 |
# is enabled by default. |
| 5 | 5 |
|
| 6 | 6 |
# Enable parameter wrapping for JSON. You can disable this by setting :format to an empty array. |
| 7 | 7 |
ActiveSupport.on_load(:action_controller) do |
| 8 |
- wrap_parameters format: [:json] |
|
| 8 |
+ wrap_parameters format: [:json] if respond_to?(:wrap_parameters) |
|
| 9 | 9 |
end |
| 10 | 10 |
|
| 11 |
-# Disable root element in JSON by default. |
|
| 12 |
-ActiveSupport.on_load(:active_record) do |
|
| 13 |
- self.include_root_in_json = false |
|
| 14 |
-end |
|
| 11 |
+# To enable root element in JSON for ActiveRecord objects. |
|
| 12 |
+# ActiveSupport.on_load(:active_record) do |
|
| 13 |
+# self.include_root_in_json = true |
|
| 14 |
+# end |