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

	Commit message (Collapse)	Author	Age	Files	Lines
...
\| * \| \| \| \| \| \| \| \|	fixes #27157 CSRF protection documentation	gingerlime	2018-01-05	1	-4/+11
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* removed reference to GET requests where it applies also to other HTTP verbs * updated documentation to try and better explain how CSRF protection works with XHR, and the potential exposure with CORS
* \| \| \| \| \| \| \| \| \|	Extract transformers	George Claghorn	2018-08-10	6	-70/+146
\| \|_\|_\|_\|_\|_\|/ / / \|/\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge pull request #33568 from mohitnatoo/perform-or-enqueue	George Claghorn	2018-08-09	1	-3/+3
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	perform_or_enqueue instead of enqueue_or_perform
\| * \| \| \| \| \| \| \| \|	perform_or_enqueue instead of enqueue_or_perform	Mohit Natoo	2018-08-09	1	-3/+3
\| \| \|_\|_\|_\|/ / / / \| \|/\| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	DRY up web image checks in ActiveStorage::Variant	George Claghorn	2018-08-09	1	-18/+24
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Fix a typo in Active Support's CHANGELOG [ci skip]	Robin Dupret	2018-08-10	1	-1/+1
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Add missing instructions for FreeBSD [ci skip]	Robin Dupret	2018-08-09	1	-10/+18
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The development dependencies installation guides have the installation instructions for FreeBSD in other sections so let's be consistent regarding the dependencies for Active Storage setup. Also fix a few typos.
* \| \| \| \| \| \| \| \|	Merge pull request #33566 from yahonda/use_i18n_101	Ryuta Kamizono	2018-08-10	2	-0/+2
\|\ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / \|/\| \| \| \| \| \| \| \|	Avoid i18n 1.1.0 for now
\| * \| \| \| \| \| \| \|	Avoid i18n 1.1.0 for now	Yasuo Honda	2018-08-09	2	-0/+2
\|/ / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[Yasuo Honda & lsylvester]
* \| \| \| \| \| \| \|	Merge pull request #33554 from ↵	Eileen M. Uchitelle	2018-08-08	1	-1/+1
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	saveriomiroddi/sav-correct_updated_at_guide_explanation ActiveRecord Basics guide: correct explanation of the `updated_at` logic [ci skip]
\| * \| \| \| \| \| \| \|	ActiveRecord Basics guide: correct explanation of the `updated_at` logic [ci ↵	Saverio Miroddi	2018-08-08	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	skip] It's misleanding/incorrect to state that `updated_at` is set on updates, since creation != update (and the column is actually set on creation, too).
* \| \| \| \| \| \| \| \|	Merge pull request #33552 from seratch/fix-obvious-typos	Matthew Draper	2018-08-08	8	-19/+19
\|\ \ \ \ \ \ \ \ \ \| \|_\|_\|/ / / / / / \|/\| \| \| \| \| \| \| \|	Fix the obvious typos detected by github.com/client9/misspell
\| * \| \| \| \| \| \| \|	Fix a wrong correction	Kazuhiro Sera	2018-08-08	1	-1/+1
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Fix the obvious typos detected by github.com/client9/misspell	Kazuhiro Sera	2018-08-08	8	-19/+19
\|/ / / / / / / /
* \| \| \| \| \| \| \|	Merge pull request #33548 from Ana06/lambda-validation	Rafael França	2018-08-07	1	-0/+7
\|\ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|_\|/ \|/\| \| \| \| \| \| \|	Add lambdas in conditional validations
\| * \| \| \| \| \| \|	Add lambdas in conditional validations	Ana María Martínez Gómez	2018-08-07	1	-0/+7
\|/ / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	As `Lambdas` are a type of `Proc`, they can also be used in the `if`/`unless` option of a validation to decide when the validation is executed. Add this case to the guide for clarification. Closes https://github.com/rails/rails/issues/33212
* \| \| \| \| \| \|	Merge pull request #33541 from lsylvester/clean-template-method-names	Eileen M. Uchitelle	2018-08-07	2	-1/+8
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix filtering out ActionView::Template method names from backtrace.
\| * \| \| \| \| \| \|	update BacktraceCleaner::RENDER_TEMPLATE_PATTERN to match the ↵	Lachlan Sylvester	2018-08-07	2	-1/+8
\|/ / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	ActionView::Template method names
* \| \| \| \| \| \|	Camelize instead of classifying	George Claghorn	2018-08-06	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Avoid mangling service names that end in S: "GCS".classify # => "GC" "GCS".camelize # => "GCS"
* \| \| \| \| \| \|	Merge pull request #33540 from joeltaylor/improve_service_adapter_error_handling	George Claghorn	2018-08-06	2	-1/+9
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Improve ActiveStorage service adapter error handling
\| * \| \| \| \| \| \|	Improve ActiveStorage service adapter error handling	Joel Taylor	2018-08-06	2	-1/+9
\|/ / / / / / /
* \| \| \| \| \| \|	Merge pull request #33533 from lsylvester/fix-irb-backtrace-cleaner-test	Matthew Draper	2018-08-06	1	-5/+6
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Filter backtrace in test to ensure irb counts as user code
\| * \| \| \| \| \| \|	Filter backtrace in test to ensure irb counts as user code	Lachlan Sylvester	2018-08-06	1	-5/+6
\|/ / / / / / /
* \| \| \| \| \| \|	Merge pull request #33531 from bogdanvlviv/move-changelog-entry-of-47018a82-up	Ryuta Kamizono	2018-08-06	1	-11/+11
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Move changelog entry of 47018a82 up [ci skip]
\| * \| \| \| \| \| \|	Move changelog entry of 47018a82 up [ci skip]	bogdanvlviv	2018-08-05	1	-11/+11
\|/ / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	We always add new entries on the top of changelog file. This commit moves the entry added in 47018a82 up in order to preserve the chronology. Follows up 3e2629eb7fae33cd521bf1c265d1bbe8ed04c59e
* \| \| \| \| \| \|	Support skip nil for cache fetch (#25437)	Martin	2018-08-05	3	-1/+23
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* test case for fetch cache miss with skip_nil * abondon nil cache if skip_nil specified * ensure not cache key for skip nil * add document with skip_nil for Store#fetch * add a new change log entry for #25437
* \| \| \| \| \| \|	Merge pull request #33454 from azbshiri/extend-affects-nested-attributes	Richard Schneeman	2018-08-04	3	-2/+20
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Call build when extend with nested attributes defined
\| * \| \| \| \| \| \|	Call build when extend with nested attributes defined	Alireza Bashiri	2018-08-02	3	-2/+20
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	What? From now on when `accepts_nested_attributes_for` defined and `extend` option added the overwritten `build` method being called. [Alireza Bashiri, Martins Polakovs]
* \| \| \| \| \| \| \|	Merge pull request #33511 from ↵	Richard Schneeman	2018-08-04	4	-6/+7
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	albertoalmagro/change-references-from-rake-to-rails-command Change references from Rake task to Rails command
\| * \| \| \| \| \| \| \|	[ci skip] Change references from Rake task to Rails command	Alberto Almagro	2018-08-01	4	-6/+7
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This commit follows the path we started at commit #ea4f0e2 and continued at PR #33229.
* \| \| \| \| \| \| \| \|	Fix uploading Tempfiles to Azure Storage	George Claghorn	2018-08-03	2	-1/+18
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #32530.
* \| \| \| \| \| \| \| \|	Merge pull request #33507 from jackc/patch-1	George Claghorn	2018-08-03	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix file upload location recommendation
\| * \| \| \| \| \| \| \| \|	Fix file upload location recommendation	Jack Christensen	2018-08-01	1	-1/+1
\| \|/ / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Going one level downwards from Rails' /public directory would still be inside the public directory and therefore servable by the web server. Files should stored upwards of the public directory.
* \| \| \| \| \| \| \| \|	Merge pull request #33452 from thetizzo/rails_32_to_40_doc_update	George Claghorn	2018-08-03	1	-0/+11
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[Documentation] Mention default HTTP headers in Rails 3.2 to 4.0 upgrade guide
\| * \| \| \| \| \| \| \| \|	Update Rails 3.2 to 4.0 upgrade guide to include a mention and tip for ↵	thetizzo	2018-08-03	1	-0/+11
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	handling the addition of configurable default HTTP headers. [ci skip]
* \| \| \| \| \| \| \| \| \|	Merge pull request #33524 from spikeheap/master	Prem Sichanugrist	2018-08-03	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[Documentation] Fix "adding member routes" guide inconsistency
\| * \| \| \| \| \| \| \| \| \|	[ci skip] Update adding member routes guide to fix inconsistency with the ↵	Ryan Brooks	2018-08-03	1	-1/+1
\|/ / / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	implementation. Closes #33518
* \| \| \| \| \| \| \| \| \|	`retrieve_connection_pool` return a pool, not a connection	Ryuta Kamizono	2018-08-03	1	-2/+2
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Remove another unused require	George Claghorn	2018-08-02	1	-2/+0
\| \|_\|/ / / / / / / \|/\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge pull request #33513 from twitnithegirl/only_connect_once_in_parallel_tests	Ryuta Kamizono	2018-08-02	1	-1/+0
\|\ \ \ \ \ \ \ \ \ \| \|_\|/ / / / / / / \|/\| \| \| \| \| \| \| \|	remove redundant establish_connection call in test_databases.rb
\| * \| \| \| \| \| \| \|	don't establish connection test_database since it gets established in ↵	Britni Alexander	2018-08-01	1	-1/+0
\|/ / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	load_schema
* \| \| \| \| \| \| \|	Remove unused require	George Claghorn	2018-08-01	1	-2/+0
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge pull request #33479 from twitnithegirl/make_parallel_testing_db_faster	Eileen M. Uchitelle	2018-08-01	2	-6/+9
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Make parallel testing db faster
\| * \| \| \| \| \| \| \|	use load_schema instead of migrate for parallel testing	Britni Alexander	2018-07-31	2	-6/+9
\|/ / / / / / / /
* \| \| \| \| \| \| \|	Retry ActiveStorage::PurgeJobs on DB deadlock	George Claghorn	2018-07-31	1	-0/+1
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge pull request #33492 from kamipo/revert_breaking_default_order_contract	Ryuta Kamizono	2018-08-01	3	-22/+14
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Revert the breaking existing default sort order contract
\| * \| \| \| \| \| \| \|	Revert "Merge pull request #24131 from brchristian/limit_and_primary_key"	Ryuta Kamizono	2018-08-01	3	-22/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This reverts commit d162188dd662a7d9f62ba8431474f50bc35e3e93, reversing changes made to 3576782888c307e3e192c44e332b957cd1174128. Reason: #24131 conflicts the #5153's default order contract, it means that existing apps would be broken by that change. We don't want to break existing apps without a deprecation cycle.
\| * \| \| \| \| \| \| \|	Add test case for the #5153's default order contract	Ryuta Kamizono	2018-08-01	1	-0/+13
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge pull request #28937 from maclover7/jm-fix-28927	Rafael França	2018-07-31	2	-1/+15
\|\ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / \|/\| \| \| \| \| \| \| \|	Default content type for `head` is `text/html`
\| * \| \| \| \| \| \| \|	Default content type for `head` is `text/html`	Jon Moss	2017-04-30	2	-1/+15
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Otherwise Mime::NullType will be returned as the `Content-Type` header.