rails.git - Mirror of official rails repo with custom fixes.

	Commit message (Collapse)	Author	Age	Files	Lines
...
\| * \| \| \| \| \|	Remove deprecated code in ssl middleware	Rafael Mendonça França	2016-10-10	4	-62/+23
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Remove deprecated code in ActionDispatch::Session::SessionRestoreError	Rafael Mendonça França	2016-10-10	2	-11/+10
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Deprecated ActionDispatch::ParamsParser::ParamsParser	Rafael Mendonça França	2016-10-10	9	-53/+51
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	ActionDispatch::ParamsParser class was removed in favor of ActionDispatch::Http::Parameters so it is better to move the error constant to the new class.
\| * \| \| \| \| \|	Remove deprecated ActionDispatch::ParamsParser	Rafael Mendonça França	2016-10-10	2	-12/+5
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Remove deprecated code in ActionDispatch::ParamsParser::ParseError	Rafael Mendonça França	2016-10-10	2	-17/+10
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Remove deprecated access to mime types through constants	Rafael Mendonça França	2016-10-10	3	-38/+4
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Remove deprecated support to non-keyword arguments #process	Rafael Mendonça França	2016-10-10	3	-181/+21
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Remove deprecated `xml_http_request` and `xhr` methods	Rafael Mendonça França	2016-10-10	3	-30/+4
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Remove deprecated methods in ActionController::Parameters	Rafael Mendonça França	2016-10-10	3	-27/+5
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Remove deprecated comparing support with `ActionController::Parameters`	Rafael Mendonça França	2016-10-10	3	-17/+5
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Remove deprecated support to :text in render	Rafael Mendonça França	2016-10-10	21	-293/+84
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Remove deprecated support to :nothing in render	Rafael Mendonça França	2016-10-09	3	-15/+4
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Remove deprecated support to `:back` in `redirect_to`	Rafael Mendonça França	2016-10-09	3	-50/+4
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Remove deprecated support for status option in head	Rafael Mendonça França	2016-10-09	3	-28/+5
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Remove deprecation at ActionController::BadRequest	Rafael Mendonça França	2016-10-09	2	-11/+6
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Remove deprecated methods related to controller filters	Rafael Mendonça França	2016-10-09	4	-116/+8
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	`skip_action_callback`, `skip_filter`, `before_filter`, `prepend_before_filter`, `skip_before_filter`, `append_before_filter`, `around_filter` `prepend_around_filter`, `skip_around_filter`, `append_around_filter`, `after_filter`, `prepend_after_filter`, `skip_after_filter` and `append_after_filter`.
* \| \| \| \| \| \|	Merge pull request #26745 from kamipo/dump_index_options_to_pretty_format	Rafael França	2016-10-10	5	-12/+10
\|\ \ \ \ \ \ \ \| \|/ / / / / / \|/\| \| \| \| \| \|	Dump index options to pretty format
\| * \| \| \| \| \|	Dump index options to pretty format	Ryuta Kamizono	2016-10-10	5	-12/+10
\|/ / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	```ruby # Before t.index ["firm_id", "type", "rating"], name: "company_index", order: {"rating"=>:desc}, using: :btree # After t.index ["firm_id", "type", "rating"], name: "company_index", order: { rating: :desc }, using: :btree ```
* \| \| \| \| \|	Merge pull request #26735 from kamipo/prevent_to_create_blank_comment	Rafael França	2016-10-09	3	-6/+8
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Prevent to create blank comment
\| * \| \| \| \| \|	Prevent to create blank comment	Ryuta Kamizono	2016-10-08	3	-6/+8
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Currently blank comment does not dump to `db/schema.rb`. But created it even if specified blank.
* \| \| \| \| \| \|	Merge pull request #26738 from bogdanvlviv/travis	Rafael França	2016-10-09	1	-1/+0
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Don't allow tests ac:integration to failure
\| * \| \| \| \| \| \|	Don't allow tests ac:integration to failure	bogdanvlviv	2016-10-08	1	-1/+0
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge pull request #26740 from y-yagi/update_retry_on_example	Jon Moss	2016-10-08	1	-2/+2
\|\ \ \ \ \ \ \ \ \| \|/ / / / / / / \|/\| \| \| \| \| \| \|	correct exception class in `retry_on` example [ci skip]
\| * \| \| \| \| \| \|	correct exception class in `retry_on` example [ci skip]	yuuji.yaginuma	2016-10-09	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	If the deadlock has occurred `ActiveRecord::Deadlocked` will raise. Ref: #25107, #26059
* \| \| \| \| \| \| \|	Revert "Temporarily make ACa tests noiser and more predictable"	Matthew Draper	2016-10-08	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This reverts commit 2d6c14bca25c5629e431a802c3053bad1e378fcc.
* \| \| \| \| \| \| \|	Merge pull request #26732 from matthewd/fixnum-warning	Matthew Draper	2016-10-08	5	-8/+8
\|\ \ \ \ \ \ \ \ \| \|/ / / / / / / \|/\| \| \| \| \| \| \|	Fixnum and Bignum are deprecated in Ruby trunk
\| * \| \| \| \| \| \|	Fixnum and Bignum are deprecated in Ruby trunk	Matthew Draper	2016-10-08	5	-8/+8
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	https://bugs.ruby-lang.org/issues/12739
* \| \| \| \| \| \| \|	Merge pull request #26729 from rails/bump-sdoc	Rafael França	2016-10-07	2	-8/+6
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Bump sdoc to 1.0.0.beta2 which includes fix to support Ruby 2.4
\| * \| \| \| \| \| \| \|	Include sdoc 1.0.0.beta2 which includes updated rdoc w/o hard json dep	Zachary Scott	2016-10-07	2	-7/+6
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Bump sdoc to 1.0.0.beta1 which includes fix to support Ruby 2.4	Zachary Scott	2016-10-07	2	-4/+3
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Silence a warning	Rafael Mendonça França	2016-10-07	1	-1/+3
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Undefine assings in IntegrationTest	Rafael Mendonça França	2016-10-07	2	-0/+10
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	assigns assert the state of a controller instance what should not be done in an integration test.
* \| \| \| \| \| \| \| \|	Merge pull request #26730 from rails/explain-why-inverse_of-is-disabled	Xavier Noria	2016-10-07	1	-0/+4
\|\ \ \ \ \ \ \ \ \ \| \|_\|/ / / / / / / \|/\| \| \| \| \| \| \| \|	explain why autosave= disables inverse_of [ci skip]
\| * \| \| \| \| \| \| \|	explain why autosave= disables inverse_of [ci skip]	Xavier Noria	2016-10-07	1	-0/+4
\| \|/ / / / / / /
* / / / / / / /	Tweak a test so the queries match	Matthew Draper	2016-10-08	1	-1/+1
\|/ / / / / / /
* \| \| \| \| \| \|	Simplify serializable test to avoid mystery deadlock	Matthew Draper	2016-10-07	1	-23/+21
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge pull request #26714 from matthewd/close-race	Matthew Draper	2016-10-07	6	-15/+22
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Work around read/close race (x2)
\| * \| \| \| \| \| \|	Wait for the socket to be closed asynchronously	Matthew Draper	2016-10-06	1	-2/+10
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Use a branch of websocket-client-simple, to work around read/close race	Matthew Draper	2016-10-06	3	-12/+11
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Close the IO from the read loop thread	Matthew Draper	2016-10-06	2	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	IO#close and IO#read across threads don't get along so well: After T1 enters #read and releases the GVL, T2 can call #close on the IO, thereby both closing the fd and freeing the buffer while T1 is using them.
* \| \| \| \| \| \| \|	Merge pull request #24963 from fertapric/recover-db-runtime-on-production-logs	Eileen M. Uchitelle	2016-10-06	1	-2/+1
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix database runtimes on production log
\| * \| \| \| \| \| \| \|	Fix DB runtimes on production log	Fernando Tapia Rico	2016-05-11	1	-2/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Rails default production configuration establishes "info" as log level. Due to the changes included on commit 191facc857bb4fb52078fb544c6bc1613a81cc80, db runtimes were not being collected if the log level was different than "debug", and 0.0 ms was the runtime reported on production logs.
* \| \| \| \| \| \| \| \|	Merge pull request #26631 from kamipo/remove_duplicate_condition	Matthew Draper	2016-10-06	1	-3/+1
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove duplicated `unless current_adapter?(:SQLite3Adapter)` condition
\| * \| \| \| \| \| \| \| \|	Remove duplicated `unless current_adapter?(:SQLite3Adapter)` condition	Ryuta Kamizono	2016-09-27	1	-3/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	`test_native_decimal_insert_manual_vs_automatic` exists inside `unless current_adapter?(:SQLite3Adapter)`. This condition is duplicated.
* \| \| \| \| \| \| \| \| \|	Merge pull request #26633 from kamipo/text_too_big_should_be_text	Matthew Draper	2016-10-06	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	`:text_too_big` column should be `:text`, not `:integer`
\| * \| \| \| \| \| \| \| \| \|	`:text_too_big` column should be `:text`, not `:integer`	Ryuta Kamizono	2016-09-27	1	-1/+1
\| \|/ / / / / / / / /
* \| \| \| \| \| \| \| \| \|	Merge pull request #25304 from kbrock/calculate_attributes	Matthew Draper	2016-10-06	1	-6/+2
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use attribute_names over column_names
\| * \| \| \| \| \| \| \| \| \|	Use attribute_names over column_names	Keenan Brock	2016-10-04	1	-6/+2
\| \| \|_\|_\|/ / / / / / \| \|/\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge pull request #26359 from maclover7/jm-speed-up-time	Matthew Draper	2016-10-06	1	-0/+2
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Speed up Time.zone.now
\| * \| \| \| \| \| \| \| \| \|	Speed up Time.zone.now	Jon Moss	2016-10-02	1	-0/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	@amatsuda, during his RailsConf talk this past year, presented a benchmark that showed `Time.zone.now` (an Active Support joint) performing 24.97x slower than Ruby's `Time.now`. Rails master appears to be a _bit_ faster than that, currently clocking in at 18.25x slower than `Time.now`. Here's the exact benchmark data for that: ``` Warming up -------------------------------------- Time.now 127.923k i/100ms Time.zone.now 10.275k i/100ms Calculating ------------------------------------- Time.now 1.946M (± 5.9%) i/s - 9.722M in 5.010236s Time.zone.now 106.625k (± 4.3%) i/s - 534.300k in 5.020343s Comparison: Time.now: 1946220.1 i/s Time.zone.now: 106625.5 i/s - 18.25x slower ``` What if I told you we could make `Time.zone.now` _even_ faster? Well, that's exactly what this patch accomplishes. When creating `ActiveSupport::TimeWithZone` objects, we try to convert the provided time to be in a UTC format. All this patch does is, in the method where we convert a provided time to UTC, check if the provided time is already UTC, and is a `Time` object and then return early if that is the case, This sidesteps having to continue on, and create a new `Time` object from scratch. Here's the exact benchmark data for my patch: ``` Warming up -------------------------------------- Time.now 124.136k i/100ms Time.zone.now 26.260k i/100ms Calculating ------------------------------------- Time.now 1.894M (± 6.4%) i/s - 9.434M in 5.000153s Time.zone.now 301.654k (± 4.3%) i/s - 1.523M in 5.058328s Comparison: Time.now: 1893958.0 i/s Time.zone.now: 301653.7 i/s - 6.28x slower ``` With this patch, we go from `Time.zone.now` being 18.25x slower than `Time.now` to only being 6.28x slower than `Time.now`. I'd obviously love some verification on this patch, since these numbers sound pretty interesting... :) This is the benchmark-ips report I have been using while working on this: ```ruby require 'benchmark/ips' Time.zone = 'Eastern Time (US & Canada)' Benchmark.ips do \|x\| x.report('Time.now') { Time.now } x.report('Time.zone.now') { Time.zone.now } x.compare! end ``` cc @amatsuda cc performance folks @tenderlove and @schneems ![Pretty... pretty... pretty good.](https://media.giphy.com/media/bWeR8tA1QV4cM/giphy.gif)