Skip to content

Instantly share code, notes, and snippets.

@dvydra

dvydra/rails_4.2.11.3_railslts_4.2.11.15.diff

Created May 19, 2020 01:00
Show Gist options
  • Save dvydra/c15edd61fb395ec228c61864942528c8 to your computer and use it in GitHub Desktop.
Save dvydra/c15edd61fb395ec228c61864942528c8 to your computer and use it in GitHub Desktop.
Download ZIP
rails_4.2.11.3_railslts_4.2.11.15.diff
Raw
rails_4.2.11.3_railslts_4.2.11.15.diff
Only in /Users/dvydra/.gem/ruby/2.5.8/gems/rails-4.2.11.15/: .DS_Store
Only in /Users/dvydra/.gem/ruby/2.5.8/gems/rails-4.2.11.15/: LICENSE
Only in /Users/dvydra/.gem/ruby/2.5.8/gems/rails-4.2.11.15/guides: .DS_Store
diff -r /Users/dvydra/.gem/ruby/2.5.8/gems/rails-4.2.11.3/guides/CHANGELOG.md /Users/dvydra/.gem/ruby/2.5.8/gems/rails-4.2.11.15/guides/CHANGELOG.md
1,15d0
< ## Rails 4.2.11.3 (May 15, 2020) ##
<
< * No changes.
<
<
< ## Rails 4.2.11.2 (May 15, 2020) ##
<
< * No changes.
<
<
< ## Rails 4.2.11.1 (March 11, 2019) ##
<
< * No changes.
<
<
diff -r /Users/dvydra/.gem/ruby/2.5.8/gems/rails-4.2.11.3/guides/source/active_support_core_extensions.md /Users/dvydra/.gem/ruby/2.5.8/gems/rails-4.2.11.15/guides/source/active_support_core_extensions.md
2091c2091
< BigDecimal.new(5.00, 6).to_s # => "5.0"
---
> BigDecimal(5.00, 6).to_s # => "5.0"
2099c2099
< BigDecimal.new(5.00, 6).to_formatted_s # => "5.0"
---
> BigDecimal(5.00, 6).to_formatted_s # => "5.0"
2105c2105
< BigDecimal.new(5.00, 6).to_formatted_s(:db) # => "5.0"
---
> BigDecimal(5.00, 6).to_formatted_s(:db) # => "5.0"
2111c2111
< BigDecimal.new(5.00, 6).to_formatted_s("e") # => "0.5E1"
---
> BigDecimal(5.00, 6).to_formatted_s("e") # => "0.5E1"
diff -r /Users/dvydra/.gem/ruby/2.5.8/gems/actionpack-4.2.11.3/CHANGELOG.md /Users/dvydra/.gem/ruby/2.5.8/gems/actionpack-4.2.11.15/CHANGELOG.md
1,15d0
< ## Rails 4.2.11.3 (May 15, 2020) ##
<
< * No changes.
<
<
< ## Rails 4.2.11.2 (May 15, 2020) ##
<
< * No changes.
<
<
< ## Rails 4.2.11.1 (March 11, 2019) ##
<
< * No changes.
<
<
Only in /Users/dvydra/.gem/ruby/2.5.8/gems/actionpack-4.2.11.15/: LICENSE
Only in /Users/dvydra/.gem/ruby/2.5.8/gems/actionpack-4.2.11.3/: MIT-LICENSE
Only in /Users/dvydra/.gem/ruby/2.5.8/gems/actionpack-4.2.11.15/lib/action_controller/metal: params_hash_compatibility.rb
diff -r /Users/dvydra/.gem/ruby/2.5.8/gems/actionpack-4.2.11.3/lib/action_controller/metal/strong_parameters.rb /Users/dvydra/.gem/ruby/2.5.8/gems/actionpack-4.2.11.15/lib/action_controller/metal/strong_parameters.rb
669a670,677
>
> module ActionDispatch
> module Http
> unless defined?(ParamsHashWithIndifferentAccess)
> autoload :ParamsHashWithIndifferentAccess, 'action_controller/metal/params_hash_compatibility'
> end
> end
> end
diff -r /Users/dvydra/.gem/ruby/2.5.8/gems/actionpack-4.2.11.3/lib/action_controller/test_case.rb /Users/dvydra/.gem/ruby/2.5.8/gems/actionpack-4.2.11.15/lib/action_controller/test_case.rb
276,277c276,290
< def recycle!
< initialize
---
> if RUBY_VERSION >= '2.6'
> def recycle!
> # hack to avoid MonitorMixin double-initialize error:
> # this suppresses a legitimate error
> # however this behaviour was always broken in Rails 4.2
> # so we do want to change the whole test code
> # just to achieve 2.6 compatibility
> @mon_mutex_owner_object_id = nil
> @mon_mutex = nil
> initialize
> end
> else
> def recycle!
> initialize
> end
282,284c295,311
< def recycle!
< @body = nil
< initialize
---
> if RUBY_VERSION >= '2.6'
> def recycle!
> # hack to avoid MonitorMixin double-initialize error:
> # this suppresses a legitimate error
> # however this behaviour was always broken in Rails 4.2
> # so we do want to change the whole test code
> # just to achieve 2.6 compatibility
> @mon_mutex_owner_object_id = nil
> @mon_mutex = nil
> @body = nil
> initialize
> end
> else
> def recycle!
> @body = nil
> initialize
> end
diff -r /Users/dvydra/.gem/ruby/2.5.8/gems/actionpack-4.2.11.3/lib/action_pack/gem_version.rb /Users/dvydra/.gem/ruby/2.5.8/gems/actionpack-4.2.11.15/lib/action_pack/gem_version.rb
11c11
< PRE = "3"
---
> PRE = nil
diff -r /Users/dvydra/.gem/ruby/2.5.8/gems/actionmailer-4.2.11.3/CHANGELOG.md /Users/dvydra/.gem/ruby/2.5.8/gems/actionmailer-4.2.11.15/CHANGELOG.md
1,15d0
< ## Rails 4.2.11.3 (May 15, 2020) ##
<
< * No changes.
<
<
< ## Rails 4.2.11.2 (May 15, 2020) ##
<
< * No changes.
<
<
< ## Rails 4.2.11.1 (March 11, 2019) ##
<
< * No changes.
<
<
Only in /Users/dvydra/.gem/ruby/2.5.8/gems/actionmailer-4.2.11.15/: LICENSE
Only in /Users/dvydra/.gem/ruby/2.5.8/gems/actionmailer-4.2.11.3/: MIT-LICENSE
diff -r /Users/dvydra/.gem/ruby/2.5.8/gems/actionmailer-4.2.11.3/lib/action_mailer/gem_version.rb /Users/dvydra/.gem/ruby/2.5.8/gems/actionmailer-4.2.11.15/lib/action_mailer/gem_version.rb
11c11
< PRE = "3"
---
> PRE = nil
diff -r /Users/dvydra/.gem/ruby/2.5.8/gems/activesupport-4.2.11.3/CHANGELOG.md /Users/dvydra/.gem/ruby/2.5.8/gems/activesupport-4.2.11.15/CHANGELOG.md
1,15d0
< ## Rails 4.2.11.3 (May 15, 2020) ##
<
< * No changes.
<
<
< ## Rails 4.2.11.2 (May 15, 2020) ##
<
< * No changes.
<
<
< ## Rails 4.2.11.1 (March 11, 2019) ##
<
< * No changes.
<
<
Only in /Users/dvydra/.gem/ruby/2.5.8/gems/activesupport-4.2.11.15/: LICENSE
Only in /Users/dvydra/.gem/ruby/2.5.8/gems/activesupport-4.2.11.3/: MIT-LICENSE
diff -r /Users/dvydra/.gem/ruby/2.5.8/gems/activesupport-4.2.11.3/lib/active_support/core_ext/object/duplicable.rb /Users/dvydra/.gem/ruby/2.5.8/gems/activesupport-4.2.11.15/lib/active_support/core_ext/object/duplicable.rb
111c111
< BigDecimal.new('4.56').dup
---
> BigDecimal('4.56').dup
Only in /Users/dvydra/.gem/ruby/2.5.8/gems/activesupport-4.2.11.15/lib/active_support/core_ext/range: compare.rb
diff -r /Users/dvydra/.gem/ruby/2.5.8/gems/activesupport-4.2.11.3/lib/active_support/core_ext/range.rb /Users/dvydra/.gem/ruby/2.5.8/gems/activesupport-4.2.11.15/lib/active_support/core_ext/range.rb
4a5
> require 'active_support/core_ext/range/compare'
diff -r /Users/dvydra/.gem/ruby/2.5.8/gems/activesupport-4.2.11.3/lib/active_support/gem_version.rb /Users/dvydra/.gem/ruby/2.5.8/gems/activesupport-4.2.11.15/lib/active_support/gem_version.rb
11c11
< PRE = "3"
---
> PRE = nil
diff -r /Users/dvydra/.gem/ruby/2.5.8/gems/activesupport-4.2.11.3/lib/active_support/number_helper/number_to_rounded_converter.rb /Users/dvydra/.gem/ruby/2.5.8/gems/activesupport-4.2.11.15/lib/active_support/number_helper/number_to_rounded_converter.rb
58c58
< (number / BigDecimal.new(multiplier.to_f.to_s)).round * multiplier
---
> (number / BigDecimal(multiplier.to_f.to_s)).round * multiplier
diff -r /Users/dvydra/.gem/ruby/2.5.8/gems/activesupport-4.2.11.3/lib/active_support/xml_mini.rb /Users/dvydra/.gem/ruby/2.5.8/gems/activesupport-4.2.11.15/lib/active_support/xml_mini.rb
76c76
< BigDecimal('0')
---
> BigDecimal(number.to_f.to_s)
diff -r /Users/dvydra/.gem/ruby/2.5.8/gems/activerecord-4.2.11.3/CHANGELOG.md /Users/dvydra/.gem/ruby/2.5.8/gems/activerecord-4.2.11.15/CHANGELOG.md
1,15d0
< ## Rails 4.2.11.3 (May 15, 2020) ##
<
< * No changes.
<
<
< ## Rails 4.2.11.2 (May 15, 2020) ##
<
< * No changes.
<
<
< ## Rails 4.2.11.1 (March 11, 2019) ##
<
< * No changes.
<
<
Only in /Users/dvydra/.gem/ruby/2.5.8/gems/activerecord-4.2.11.15/: LICENSE
Only in /Users/dvydra/.gem/ruby/2.5.8/gems/activerecord-4.2.11.3/: MIT-LICENSE
diff -r /Users/dvydra/.gem/ruby/2.5.8/gems/activerecord-4.2.11.3/lib/active_record/attributes.rb /Users/dvydra/.gem/ruby/2.5.8/gems/activerecord-4.2.11.15/lib/active_record/attributes.rb
48c48
< # store_listing.price_in_cents # => BigDecimal.new(10.1)
---
> # store_listing.price_in_cents # => BigDecimal(10.1)
diff -r /Users/dvydra/.gem/ruby/2.5.8/gems/activerecord-4.2.11.3/lib/active_record/connection_adapters/postgresql/oid/decimal.rb /Users/dvydra/.gem/ruby/2.5.8/gems/activerecord-4.2.11.15/lib/active_record/connection_adapters/postgresql/oid/decimal.rb
7c7
< BigDecimal.new("Infinity") * (options[:negative] ? -1 : 1)
---
> BigDecimal("Infinity") * (options[:negative] ? -1 : 1)
diff -r /Users/dvydra/.gem/ruby/2.5.8/gems/activerecord-4.2.11.3/lib/active_record/connection_adapters/postgresql/schema_statements.rb /Users/dvydra/.gem/ruby/2.5.8/gems/activerecord-4.2.11.15/lib/active_record/connection_adapters/postgresql/schema_statements.rb
336a337,344
> max_pk = select_value("select MAX(#{quote_column_name pk}) from #{quote_table_name(table)}")
> if max_pk.nil?
> if postgresql_version >= 100000
> minvalue = select_value("SELECT seqmin from pg_sequence where seqrelid = '#{quoted_sequence}'::regclass")
> else
> minvalue = select_value("SELECT min_value FROM #{quoted_sequence}")
> end
> end
338,339c346,347
< select_value <<-end_sql, 'SCHEMA'
< SELECT setval('#{quoted_sequence}', (SELECT COALESCE(MAX(#{quote_column_name pk})+(SELECT increment_by FROM #{quoted_sequence}), (SELECT min_value FROM #{quoted_sequence})) FROM #{quote_table_name(table)}), false)
---
> select_value(<<-end_sql, "SCHEMA")
> SELECT setval('#{quoted_sequence}', #{max_pk ? max_pk : minvalue}, #{max_pk ? true : false})
diff -r /Users/dvydra/.gem/ruby/2.5.8/gems/activerecord-4.2.11.3/lib/active_record/gem_version.rb /Users/dvydra/.gem/ruby/2.5.8/gems/activerecord-4.2.11.15/lib/active_record/gem_version.rb
11c11
< PRE = "3"
---
> PRE = nil
diff -r /Users/dvydra/.gem/ruby/2.5.8/gems/activerecord-4.2.11.3/lib/active_record/relation/calculations.rb /Users/dvydra/.gem/ruby/2.5.8/gems/activerecord-4.2.11.15/lib/active_record/relation/calculations.rb
381c381
< when 'average' then value.respond_to?(:to_d) ? value.to_d : value
---
> when 'average' then (value && value.respond_to?(:to_d)) ? value.to_d : value
diff -r /Users/dvydra/.gem/ruby/2.5.8/gems/activerecord-4.2.11.3/lib/active_record/relation/query_methods.rb /Users/dvydra/.gem/ruby/2.5.8/gems/activerecord-4.2.11.15/lib/active_record/relation/query_methods.rb
4a5,9
> begin
> require 'railslts'
> rescue LoadError
> end
>
959a965
> validate_unambiguous_table_names(attributes)
965a972,981
> def validate_unambiguous_table_names(attributes)
> if defined?(RailsLts) && RailsLts.configuration && RailsLts.configuration.strict_unambiguous_table_names
> attributes.each do |key, value|
> if value.is_a?(Hash) && columns_hash.has_key?(key.to_s)
> raise StatementInvalid.new("`#{key}` is a column name and used as a table name")
> end
> end
> end
> end
>
diff -r /Users/dvydra/.gem/ruby/2.5.8/gems/activerecord-4.2.11.3/lib/active_record/tasks/database_tasks.rb /Users/dvydra/.gem/ruby/2.5.8/gems/activerecord-4.2.11.15/lib/active_record/tasks/database_tasks.rb
246c246
< message << %{ If you do not intend to use a database, you should instead alter #{Rails.root}/config/application.rb to limit the frameworks that will be loaded.} if defined?(::Rails)
---
> message << %{ If you do not intend to use a database, you should instead alter #{Rails.root}/config/application.rb to limit the frameworks that will be loaded.} if defined?(::Rails.root)
diff -r /Users/dvydra/.gem/ruby/2.5.8/gems/actionview-4.2.11.3/CHANGELOG.md /Users/dvydra/.gem/ruby/2.5.8/gems/actionview-4.2.11.15/CHANGELOG.md
1,15d0
< ## Rails 4.2.11.3 (May 15, 2020) ##
<
< * Backport a missing commit for [CVE-2020-8163]
<
<
< ## Rails 4.2.11.2 (May 15, 2020) ##
<
< * Restrict local variable names in templates [CVE-2020-8163]
<
<
< ## Rails 4.2.11.1 (March 11, 2019) ##
<
< * No changes.
<
<
Only in /Users/dvydra/.gem/ruby/2.5.8/gems/actionview-4.2.11.15/: LICENSE
Only in /Users/dvydra/.gem/ruby/2.5.8/gems/actionview-4.2.11.3/: MIT-LICENSE
diff -r /Users/dvydra/.gem/ruby/2.5.8/gems/actionview-4.2.11.3/lib/action_view/gem_version.rb /Users/dvydra/.gem/ruby/2.5.8/gems/actionview-4.2.11.15/lib/action_view/gem_version.rb
11c11
< PRE = "3"
---
> PRE = nil
diff -r /Users/dvydra/.gem/ruby/2.5.8/gems/actionview-4.2.11.3/lib/action_view/helpers/javascript_helper.rb /Users/dvydra/.gem/ruby/2.5.8/gems/actionview-4.2.11.15/lib/action_view/helpers/javascript_helper.rb
13c13,15
< "'" => "\\'"
---
> "'" => "\\'",
> "`" => "\\`",
> "$" => "\\$"
27c29
< result = javascript.gsub(/(\\|<\/|\r\n|\342\200\250|\342\200\251|[\n\r"'])/u) {|match| JS_ESCAPE_MAP[match] }
---
> result = javascript.gsub(/(\\|<\/|\r\n|\342\200\250|\342\200\251|[\n\r"']|[`]|[$])/u) { |match| JS_ESCAPE_MAP[match] }
diff -r /Users/dvydra/.gem/ruby/2.5.8/gems/actionview-4.2.11.3/lib/action_view/template.rb /Users/dvydra/.gem/ruby/2.5.8/gems/actionview-4.2.11.15/lib/action_view/template.rb
317,318c317,319
< locals = @locals.to_set - Module::DELEGATION_RESERVED_METHOD_NAMES
< locals = locals.grep(/\A(?![A-Z0-9])(?:[[:alnum:]_]|[^\0-\177])+\z/)
---
> locals = @locals.reject do |l|
> Module::DELEGATION_RESERVED_METHOD_NAMES.include?(l.to_s) || l.to_s !~ /\A(?![A-Z0-9])(?:[[:alnum:]_]|[^\0-\177])+\z/
> end
diff -r /Users/dvydra/.gem/ruby/2.5.8/gems/activemodel-4.2.11.3/CHANGELOG.md /Users/dvydra/.gem/ruby/2.5.8/gems/activemodel-4.2.11.15/CHANGELOG.md
1,15d0
< ## Rails 4.2.11.3 (May 15, 2020) ##
<
< * No changes.
<
<
< ## Rails 4.2.11.2 (May 15, 2020) ##
<
< * No changes.
<
<
< ## Rails 4.2.11.1 (March 11, 2019) ##
<
< * No changes.
<
<
Only in /Users/dvydra/.gem/ruby/2.5.8/gems/activemodel-4.2.11.15/: LICENSE
Only in /Users/dvydra/.gem/ruby/2.5.8/gems/activemodel-4.2.11.3/: MIT-LICENSE
diff -r /Users/dvydra/.gem/ruby/2.5.8/gems/activemodel-4.2.11.3/lib/active_model/gem_version.rb /Users/dvydra/.gem/ruby/2.5.8/gems/activemodel-4.2.11.15/lib/active_model/gem_version.rb
11c11
< PRE = "3"
---
> PRE = nil
diff -r /Users/dvydra/.gem/ruby/2.5.8/gems/activemodel-4.2.11.3/lib/active_model/validations/numericality.rb /Users/dvydra/.gem/ruby/2.5.8/gems/activemodel-4.2.11.15/lib/active_model/validations/numericality.rb
68c68
< Kernel.Float(raw_value) if raw_value !~ /\A0[xX]/
---
> Kernel.Float(raw_value) if !raw_value.is_a?(String) || raw_value !~ /\A0[xX]/
diff -r /Users/dvydra/.gem/ruby/2.5.8/gems/railties-4.2.11.3/CHANGELOG.md /Users/dvydra/.gem/ruby/2.5.8/gems/railties-4.2.11.15/CHANGELOG.md
1,15d0
< ## Rails 4.2.11.3 (May 15, 2020) ##
<
< * No changes.
<
<
< ## Rails 4.2.11.2 (May 15, 2020) ##
<
< * No changes.
<
<
< ## Rails 4.2.11.1 (March 11, 2019) ##
<
< * No changes.
<
<
Only in /Users/dvydra/.gem/ruby/2.5.8/gems/railties-4.2.11.15/: LICENSE
diff -r /Users/dvydra/.gem/ruby/2.5.8/gems/railties-4.2.11.3/lib/rails/application.rb /Users/dvydra/.gem/ruby/2.5.8/gems/railties-4.2.11.15/lib/rails/application.rb
357a358
> RailsLts::Bootstrap.initializers_for(self) +
359a361
> RailsLts::Finisher.initializers_for(self) +
diff -r /Users/dvydra/.gem/ruby/2.5.8/gems/railties-4.2.11.3/lib/rails/commands/console.rb /Users/dvydra/.gem/ruby/2.5.8/gems/railties-4.2.11.15/lib/rails/commands/console.rb
101c101
< puts "Loading #{Rails.env} environment in sandbox (Rails #{Rails.version})"
---
> puts "Loading #{Rails.env} environment in sandbox (Rails #{RailsLts::VERSION::STRING} LTS)"
104c104
< puts "Loading #{Rails.env} environment (Rails #{Rails.version})"
---
> puts "Loading #{Rails.env} environment (Rails #{RailsLts::VERSION::STRING} LTS)"
diff -r /Users/dvydra/.gem/ruby/2.5.8/gems/railties-4.2.11.3/lib/rails/commands/server.rb /Users/dvydra/.gem/ruby/2.5.8/gems/railties-4.2.11.15/lib/rails/commands/server.rb
126c126
< puts "=> Rails #{Rails.version} application starting in #{Rails.env} on #{url}"
---
> puts "=> Rails #{RailsLts::VERSION::STRING} LTS application starting in #{Rails.env} on #{url}"
diff -r /Users/dvydra/.gem/ruby/2.5.8/gems/railties-4.2.11.3/lib/rails/gem_version.rb /Users/dvydra/.gem/ruby/2.5.8/gems/railties-4.2.11.15/lib/rails/gem_version.rb
11c11
< PRE = "3"
---
> PRE = nil
diff -r /Users/dvydra/.gem/ruby/2.5.8/gems/railties-4.2.11.3/lib/rails.rb /Users/dvydra/.gem/ruby/2.5.8/gems/railties-4.2.11.15/lib/rails.rb
13a14,16
> require 'railslts'
> require 'railslts-version'
>
Only in /Users/dvydra/.gem/ruby/2.5.8/gems/railties-4.2.11.15/lib: railslts.rb
diff -r /Users/dvydra/.gem/ruby/2.5.8/gems/activejob-4.2.11.3/CHANGELOG.md /Users/dvydra/.gem/ruby/2.5.8/gems/activejob-4.2.11.15/CHANGELOG.md
1,15d0
< ## Rails 4.2.11.3 (May 15, 2020) ##
<
< * No changes.
<
<
< ## Rails 4.2.11.2 (May 15, 2020) ##
<
< * No changes.
<
<
< ## Rails 4.2.11.1 (March 11, 2019) ##
<
< * No changes.
<
<
Only in /Users/dvydra/.gem/ruby/2.5.8/gems/activejob-4.2.11.15/: LICENSE
Only in /Users/dvydra/.gem/ruby/2.5.8/gems/activejob-4.2.11.3/: MIT-LICENSE
diff -r /Users/dvydra/.gem/ruby/2.5.8/gems/activejob-4.2.11.3/lib/active_job/gem_version.rb /Users/dvydra/.gem/ruby/2.5.8/gems/activejob-4.2.11.15/lib/active_job/gem_version.rb
11c11
< PRE = "3"
---
> PRE = nil
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment