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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge pull request #28914 from bogdanvlviv/fix-touch-with-optimistic-locking	Rafael França	2017-06-20	4	-3/+33
\|\ \| \| \| \|	Fix ActiveRecord::Persistence#touch with locking
\| *	Fix ActiveRecord::Persistence#touch with locking	bogdanvlviv	2017-06-21	4	-3/+33
\|/ \| \| \| \| \|	`ActiveRecord::Persistence#touch` does not work well when optimistic locking enabled and `locking_column`, without default value, is null in the database.
*	Merge pull request #28926 from ↵	Rafael França	2017-06-20	3	-1/+31
\|\ \| \| \| \| \| \| \| \|	bogdanvlviv/fix-destroy-with-locking_column-value-null Fix destroy with locking_column value null
\| *	Fix destroy with locking_column value null	bogdanvlviv	2017-06-20	3	-1/+31
\|/ \| \| \| \| \| \|	Fix destroying existing object does not work well when optimistic locking enabled and `locking column` is null in the database. Follow 22a822e5813ef7ea9ab6dbbb670a363899a083af, #28914
*	Merge pull request #29510 from padi/minor_docs_update	Rafael França	2017-06-20	2	-1/+3
\|\ \| \| \| \|	Updates README on rails internal dev tools
\| *	Adds missing minor doc about tools/test.rb [ci skip]	Marc Ignacio	2017-06-21	2	-1/+3
\| \| \| \| \| \| \| \|	... and minor typo fix
* \|	Merge pull request #29504 from kirs/fixtures-arel-bulk	Rafael França	2017-06-20	9	-11/+117
\|\ \ \| \| \| \| \| \|	Use bulk INSERT to insert fixtures
\| * \|	Use bulk INSERT to insert fixtures	Kir Shatrov	2017-06-20	9	-11/+117
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Improves the performance from O(n) to O(1). Previously it would require 50 queries to insert 50 fixtures. Now it takes only one query. Disabled on sqlite which doesn't support multiple inserts.
* \| \|	Shrink image files in the guides using ImageOptim	Akira Matsuda	2017-06-21	39	-0/+0
\| \|/ \|/\|
* \|	Merge pull request #29503 from savroff/fix_current_page_engine_issue	Rafael França	2017-06-20	3	-4/+23
\|\ \ \| \| \| \| \| \|	Fix current_page? helper issue with engine root path
\| * \|	Add changes to CHANGELOG	savroff	2017-06-19	1	-0/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	fix fix
\| * \|	Fix current_page? helper issue with engine root path	savroff	2017-06-19	2	-4/+17
\| \| \|
* \| \|	Merge pull request #28833 from bogdanvlviv/add-test-cases-for-optimistic-locking	Rafael França	2017-06-20	2	-3/+23
\|\ \ \ \| \| \| \| \| \| \| \|	Add test cases for optimistic locking
\| * \| \|	Clean up 'Optimistic Locking' implementation	bogdanvlviv	2017-06-12	1	-3/+4
\| \| \| \|
\| * \| \|	Add test cases for optimistic locking	bogdanvlviv	2017-06-12	1	-0/+19
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add test to ensure that locking_column cannot be updated explicitly. Add test to prevent regression on creating new object with explicit value locking_column. Related to #28318
* \| \| \|	[ci skip] Fixed the attribute name for event.detail	Prathamesh Sonpatki	2017-06-20	1	-3/+3
\| \| \| \|
* \| \| \|	Merge pull request #29505 from utilum/assert_nil	Rafael França	2017-06-20	2	-2/+2
\|\ \ \ \ \| \|_\|_\|/ \|/\| \| \|	prepare for Minitest 6
\| * \| \|	prepare for Minitest 6	utilum	2017-06-20	2	-2/+2
\|/ / /
* \| \|	Merge pull request #27990 from leonelgalan/bug/filtered_parameters_class	Rafael França	2017-06-19	3	-2/+15
\|\ \ \ \| \| \| \| \| \| \| \|	Use of ParameterFilter no longer forces `request.filtered_parameters' class to be Hash
\| * \ \	Merge branch 'master' into bug/filtered_parameters_class	Leonel Galán	2017-06-16	462	-3743/+5112
\| \|\ \ \
\| * \ \ \	Merge branch 'master' into bug/filtered_parameters_class	Leonel Galán	2017-05-17	174	-874/+1495
\| \|\ \ \ \
\| * \ \ \ \	Merge branch 'master' into bug/filtered_parameters_class	Leonel Galán	2017-04-25	182	-823/+2143
\| \|\ \ \ \ \
\| * \ \ \ \ \	Merge branch 'master' into bug/filtered_parameters_class	Leonel Galán	2017-04-03	498	-5491/+9151
\| \|\ \ \ \ \ \
\| * \| \| \| \| \| \|	Fixes CodeClimate warnings	Leonel Galan	2017-02-13	1	-2/+2
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Use of ParameterFilter no longer forces `request.filtered_parameters' class ↵	Leonel Galan	2017-02-13	3	-2/+15
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	to be Hash - Fixes issue described on #27944 - `filtered_query_string` used an Array representation of what semantically is a key value pair: better suited for a Hash. Without this change `filtered_params = original_params.class.new` returns an Array with unintended consequences.
* \| \| \| \| \| \| \|	Merge pull request #29485 from tjschuck/nodoc_ac_conn_websocket	Rafael França	2017-06-19	1	-1/+1
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	nodoc AC::Connection::WebSocket
\| * \| \| \| \| \| \| \|	nodoc AC::Connection::WebSocket	T.J. Schuck	2017-06-16	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Users should never publicly be interacting with an instance of this. The instance that comes along with an `AC::Connection::Base` instance (the only thing a user should be working with) is [itself intended to be private](https://github.com/tjschuck/rails/blob/master/actioncable/lib/action_cable/connection/base.rb#L137-L140). [ci skip]
* \| \| \| \| \| \| \| \|	Merge pull request #29454 from kamipo/fix_exists_queries_with_cache	Rafael França	2017-06-19	3	-51/+46
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix `Relation#exists?` queries with query cache
\| * \| \| \| \| \| \| \| \|	Ensure query caching for `select_*` methods in connection adapters	Ryuta Kamizono	2017-06-15	4	-52/+41
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Fix `Relation#exists?` queries with query cache	Ryuta Kamizono	2017-06-15	2	-1/+7
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	If a connection adapter overrides `select_*` methods, query caching will doesn't work. This patch changes `select_value` to `select_one` in `Relation#exists?` to ensure query caching. Fixes #29449.
* \| \| \| \| \| \| \| \| \|	Merge pull request #29494 from kamipo/prevent_extra_scope_construction	Rafael França	2017-06-19	3	-3/+5
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Prevent extra `scope` construction in `find_target`
\| * \| \| \| \| \| \| \| \| \|	Prevent extra `scope` construction in `find_target`	Ryuta Kamizono	2017-06-18	3	-3/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Because constructing `scope` is a little expensive.
* \| \| \| \| \| \| \| \| \| \|	Merge pull request #29486 from kirs/fixtures-arel	Rafael França	2017-06-19	1	-4/+11
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Refactor #insert_fixtures to use Arel
\| * \| \| \| \| \| \| \| \| \| \|	Refactor #insert_fixtures to use Arel	Kir Shatrov	2017-06-19	1	-4/+11
\| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #29493 from y-yagi/deprecate_capify	Rafael França	2017-06-19	4	-10/+10
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Deprecate an `capify!` method in generators and templates
\| * \| \| \| \| \| \| \| \| \| \| \|	Deprecate an `capify!` method in generators and templates	yuuji.yaginuma	2017-06-18	4	-10/+10
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The `capify` command has been removed by Capistrano 3 and became to `cap install`. Therefore, the `capify!` method has no meaning in Capistrano 3. I think that should deprecate. Ref: https://github.com/capistrano/capistrano/commit/492793916acf32ffe1604daec6fd4892c8935018
* \| \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #29499 from koic/ci_against_jruby_9_1_12_0	Rafael França	2017-06-19	1	-3/+3
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	CI against JRuby 9.1.12.0
\| * \| \| \| \| \| \| \| \| \| \| \| \|	CI against JRuby 9.1.12.0	Koichi ITO	2017-06-19	1	-3/+3
\| \| \|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	http://jruby.org/2017/06/15/jruby-9-1-12-0.html
* \| \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #29500 from y-yagi/fix_exmaple_of_parameters_to_query	Vipul A M	2017-06-19	1	-1/+6
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \|	Fix examples for `AC::Parameters#to_query` [ci skip]
\| * \| \| \| \| \| \| \| \| \| \| \|	Fix examples for `AC::Parameters#to_query` [ci skip]	yuuji.yaginuma	2017-06-19	1	-1/+6
\| \|/ / / / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Without `permit`, `AC::Parameters#to_query` raise `AC::UnfilteredParameters`. ```ruby params = ActionController::Parameters.new({ name: "David", nationality: "Danish" }) params.to_query # => ActionController::UnfilteredParameters: unable to convert unpermitted parameters to hash ```
* \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #29491 from kamipo/add_test_case_for_28754	Matthew Draper	2017-06-18	1	-0/+19
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add a test case for #28754
\| * \| \| \| \| \| \| \| \| \| \| \|	Add a test case for #28754	Ryuta Kamizono	2017-06-18	1	-0/+19
\| \| \|_\|/ / / / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	A part for JSON was splitted from #28416 as #29273 and #29273 has already been merged. Closes #28754. Closes #27588. [Ryuta Kamizono & Bradley Priest]
* \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #29492 from kamipo/remove_debug_print	Matthew Draper	2017-06-18	1	-13/+0
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \|	Remove debug print
\| * \| \| \| \| \| \| \| \| \| \|	Remove debug print	Ryuta Kamizono	2017-06-18	1	-13/+0
\|/ / / / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This debug print was added in 87f5e5e for finding the regression caused by d314646 and the regression has already been fixed in 969339b.
* \| \| \| \| \| \| \| \| \| \|	Merge pull request #29488 from utilum/update_gemfile	Matthew Draper	2017-06-18	2	-12/+2
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixes FIXME: rb-inotify 0.99 has been released
\| * \| \| \| \| \| \| \| \| \| \|	Fixes FIXME: rb-inotify 0.99 has been released	utilum	2017-06-17	2	-13/+4
\|/ / / / / / / / / / /
* \| \| \| \| \| \| \| \| \| \|	Merge pull request #29487 from utilum/update_feodra_package_name	Vipul A M	2017-06-17	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \|	[ci skip] Update fedora SQLite3 package name
\| * \| \| \| \| \| \| \| \| \|	[ci skip] Update fedora SQLite3 package name	utilum	2017-06-17	1	-1/+1
\|/ / / / / / / / / /
* \| \| \| \| \| \| \| \| \|	Merge pull request #29415 from kamipo/remove_unused_defined_association	Guillermo Iguaran	2017-06-16	2	-2/+1
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove unused defined association
\| * \| \| \| \| \| \| \| \| \|	Remove unused defined association	Ryuta Kamizono	2017-06-11	2	-2/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	`belongs_to :developer` on `Comment` model was added in 431f8e0 but it is unused.