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

	Commit message (Collapse)	Author	Age	Files	Lines
*	user form with instead of form for in scaffold generator	Ivan Velasquez	2017-03-13	1	-1/+1
\|
*	Merge pull request #28068 from kamipo/refactor_data_sources	Rafael França	2017-03-13	8	-205/+156
\|\ \| \| \| \|	Extract `data_source_sql` to refactor data source statements
\| *	Prefer `USING (column_list)` for joining information_schema	Ryuta Kamizono	2017-02-25	1	-3/+1
\| \|
\| *	Extract `data_source_sql` to refactor data source statements	Ryuta Kamizono	2017-02-20	8	-202/+155
\| \|
* \|	Move "fixes" to a new line	Jon Moss	2017-03-13	1	-1/+3
\| \| \| \| \| \| \| \|	[ci skip]
* \|	Lint activesupport/CHANGELOG.md	Jon Moss	2017-03-13	1	-8/+10
\| \| \| \| \| \| \| \|	[ci skip]
* \|	Small grammar change + new line for "fixes"	Jon Moss	2017-03-13	1	-2/+4
\| \| \| \| \| \| \| \|	[ci skip]
* \|	Small grammar change	Jon Moss	2017-03-13	1	-3/+1
\| \| \| \| \| \| \| \| \| \| \| \|	Reads easier, and removes extra tick marks. [ci skip]
* \|	Merge pull request #28404 from olimart/master	Jon Moss	2017-03-13	1	-1/+1
\|\ \ \| \| \| \| \| \|	Fix Typo [ci skip]
\| * \|	Fix Typo [ci skip]	Olivier	2017-03-13	1	-1/+1
\|/ / \| \| \| \|	Arcticle --> Article
* \|	Fix HTTPS grammar	Jon Moss	2017-03-13	1	-4/+4
\| \| \| \| \| \| \| \|	[ci skip]
* \|	Merge pull request #28381 from shime/docs-action-controller-base	Vipul A M	2017-03-13	21	-55/+55
\|\ \ \| \| \| \| \| \|	[docs] fix ActionController docs
\| * \|	[docs] fix ActionController documentation	Hrvoje Šimić	2017-03-12	21	-55/+55
\| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
* \| \|	Merge pull request #28385 from javan/actioncable/fix-npm-package	Guillermo Iguaran	2017-03-13	3	-1/+38
\|\ \ \ \| \| \| \| \| \| \| \|	Restore action_cable.js UMD module support. Fixes #28366
\| * \| \|	Restore action_cable.js UMD module support. Fixes #28366	Javan Makhmali	2017-03-11	3	-1/+38
\| \| \| \|
* \| \| \|	Merge pull request #28185 from renchap/system-testing-screenshot-output	Eileen M. Uchitelle	2017-03-13	1	-5/+34
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \|	Dont always display inline screenshots in system testing (#28133)
\| * \| \| \|	Dont always display inline screenshots in system testing (#28133)	Renaud Chaput	2017-03-11	1	-5/+34
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	3 output types are supported: - simple: only display the screenshot path - artifact: display the screenshot in the terminal, using the artifact protocol (supported by some CI) - inline (default): display the screenshot in the terminal, inline (supported by some terminals) You can force the output type by setting the `RAILS_SYSTEM_TESTING_SCREENSHOT` environment variable
* \| \| \| \|	Merge pull request #28017 from mtsmfm/suppress-dep-warn	Matthew Draper	2017-03-13	3	-0/+6
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	Suppress deprecation warning `implementing to_yaml is deprecated`
\| * \| \| \| \|	Suppress deprecation warning `implementing to_yaml is deprecated`	Fumiaki MATSUSHIMA	2017-02-15	3	-0/+6
\| \| \| \| \| \|
* \| \| \| \| \|	Merge pull request #28352 from alpaca-tc/fixes_renderer_with_defaults	Akira Matsuda	2017-03-13	3	-1/+17
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixes ActionController::Rendering#with_defaults
\| * \| \| \| \| \|	Fixes ActionController::Rendering#with_defaults	alpaca-tc	2017-03-12	3	-1/+17
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	`env` is undefined.
* \| \| \| \| \| \|	Merge pull request #28371 from kamipo/simplify_count	Andrew White	2017-03-12	1	-7/+4
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Simply forward `Calculations#count` to `Enumerable#count`
\| * \| \| \| \| \| \|	Simply forward `Calculations#count` to `Enumerable#count`	Ryuta Kamizono	2017-03-10	1	-7/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Follow up of #24203. Since b644964b `ActiveRecord::Relation` includes `Enumerable` so it is enough to call `super` simply.
* \| \| \| \| \| \| \|	Fix weird documentation line	Jon Moss	2017-03-12	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
* \| \| \| \| \| \| \|	Merge pull request #28372 from kamipo/delegate_as_json	Andrew White	2017-03-12	3	-6/+2
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Simply delegate `as_json` to `records`
\| * \| \| \| \| \| \| \|	Simply delegate `as_json` to `records`	Ryuta Kamizono	2017-03-10	3	-6/+2
\| \|/ / / / / / /
* \| \| \| \| \| \| \|	Second editing pass on "Active Model Basics" guide	Jon Moss	2017-03-12	1	-16/+18
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Lots of grammar, etc fixes. [ci skip]
* \| \| \| \| \| \| \|	First editing pass on "Active Model Basics" guide	Jon Moss	2017-03-12	1	-11/+12
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Lots of grammar, etc fixes. [ci skip]
* \| \| \| \| \| \| \|	Add link to mentioned API [ci skip] (#28392)	Vipul A M	2017-03-12	1	-1/+1
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge pull request #27152 from tjai89/patch-5	Vipul A M	2017-03-12	1	-1/+1
\|\ \ \ \ \ \ \ \ \| \|_\|/ / / / / / \|/\| \| \| \| \| \| \|	Add link to API documentation [ci skip]
\| * \| \| \| \| \| \|	Add link to API documentation	Kirill Zhuravlov	2016-11-23	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add a link to http://api.rubyonrails.org/classes/ActionController.html in the beginning of an article.
* \| \| \| \| \| \| \|	Merge pull request #28390 from bogdanvlviv/fix-typo-in-security-guide	Vipul A M	2017-03-12	1	-2/+2
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix typo in the security guide
\| * \| \| \| \| \| \| \|	Fix typo in the security guide	bogdanvlviv	2017-03-12	1	-2/+2
\|/ / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
* \| \| \| \| \| \| \|	AS:Cache:MemoryStore doc fixes [ci skip] (#28389)	Vipul A M	2017-03-12	1	-1/+1
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge pull request #27051 from devonestes/adding-cache-clear-docs	Vipul A M	2017-03-12	1	-0/+2
\|\ \ \ \ \ \ \ \ \| \|_\|_\|_\|/ / / / \|/\| \| \| \| \| \| \|	Add missing documentation for MemoryStore#clear [ci skip]
\| * \| \| \| \| \| \|	Add missing documentation for MemoryStore#clear [ci skip]	Devon Estes	2016-11-15	1	-0/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	We were missing some form of documentation for this method, so I've gone ahead and added some!
* \| \| \| \| \| \| \|	Merge pull request #28378 from y-yagi/use_correct_variable_in_reverse_merge_test	Eileen M. Uchitelle	2017-03-11	1	-8/+4
\|\ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|/ / / \|/\| \| \| \| \| \| \|	Use correct value in `reverse_merge` test
\| * \| \| \| \| \| \|	Use correct value in `reverse_merge` test	yuuji.yaginuma	2017-03-11	1	-8/+4
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge pull request #28380 from shime/docs-actionpack-api	Andrew White	2017-03-11	1	-4/+3
\|\ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|/ / \|/\| \| \| \| \| \| \|	[docs] remove unnecessary sentence
\| * \| \| \| \| \| \|	[docs] remove unnecessary sentence	Hrvoje Šimić	2017-03-11	1	-4/+3
\|/ / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
* / / / / / /	Fix indentation and formatting in CHANGELOGs [ci skip]	Ryuta Kamizono	2017-03-11	2	-19/+19
\|/ / / / / /
* \| \| \| \| \|	Add @takkanm credits in the changelog [ci skip]	Rafael Mendonça França	2017-03-10	1	-1/+1
\| \| \| \| \| \|
* \| \| \| \| \|	Merge pull request #28355 from Edouard-chin/reversemerge-for-strongparameters	Rafael Mendonça França	2017-03-10	3	-0/+48
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Added `reverse_merge`/`reverse_merge!` to AC::Parameters: [Rafael Mendonça França + Mitsutaka Mimura]
\| * \| \| \| \| \|	Added `reverse_merge`/`reverse_merge!` to AC::Parameters:	Edouard CHIN	2017-03-09	3	-0/+48
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- This PR adds the `reverse_merge` and `reverse_merge!` method to `ActionController::Parameters` - Fixes #28353
* \| \| \| \| \| \|	Merge pull request #28373 from godfat/fix-cache-middleware-with-throw	Rafael França	2017-03-10	2	-4/+15
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Make sure local cache cleared even it's throwing:
\| * \| \| \| \| \| \|	Make sure local cache cleared even it's throwing:	Lin Jen-Shin	2017-03-10	2	-4/+15
\| \| \|_\|_\|/ / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	We (GitLab) hit into an issue that somewhere in the middleware chain was throwing `:warden`, which was caught in the wrapping middleware, but `LocalCache::Middleware` was not aware of it. It should look like: ``` ruby result = catch(:warden) do @app.call(env) end ``` Source: https://github.com/hassox/warden/blob/090ed153dbd2f5bf4a1ca672b3018877e21223a4/lib/warden/manager.rb#L35-L37 Using `ensure` could make sure that we would always do the cleanup, and better yet, avoid `rescue Exception` which we all should know that could cause some issues which could be very hard to debug. Please check the discussion thread for more context: https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/1402#note_25128108
* \| \| \| \| \| \|	Merge pull request #28370 from kamipo/remove_conditions_params_from_delete_all	Rafael França	2017-03-10	1	-1/+1
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove conditions parameter from `NullRelation#delete_all`
\| * \| \| \| \| \| \|	Remove conditions parameter from `NullRelation#delete_all`	Ryuta Kamizono	2017-03-10	1	-1/+1
\| \|/ / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Follow up of e7381d289e4f8751dcec9553dcb4d32153bd922b.
* \| \| \| \| \| \|	Merge pull request #28375 from baerjam/improve-testing-documentaion	Vipul A M	2017-03-11	1	-1/+1
\|\ \ \ \ \ \ \ \| \|/ / / / / / \|/\| \| \| \| \| \|	Improve readability of testing guide [ci skip]
\| * \| \| \| \| \|	Improve readability of testing guide [ci skip]	James Baer	2017-03-10	1	-1/+1
\|/ / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Small change to improve the readability in section 2.3 of the testing guide.