aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | | | Merge pull request #28726 from matthewd/transaction-lockingMatthew Draper2017-04-133-52/+70
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Add comprehensive locking around DB transactions
| * | | | | | | | Add comprehensive locking around DB transactionsMatthew Draper2017-04-113-52/+70
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Transactional-fixture using tests with racing threads and inter-thread synchronisation inside transaction blocks will now deadlock... but without this, they would just crash. In 5.0, the threads didn't share a connection at all, so it would've worked... but with the main thread inside the fixture transaction, they wouldn't've been able to see each other. So: as far as I can tell, the set of operations this "breaks" never had a compelling use case. Meanwhile, it provides an increased level of coherency to the operational feel of transactional fixtures. If this does cause anyone problems, they're probably best off disabling transactional fixtures on the affected tests, and managing transactions themselves.
* | | | | | | | | Merge pull request #28712 from kamipo/tweaks_28678Andrew White2017-04-121-4/+5
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Tweaks #28678
| * | | | | | | | | Tweaks #28678Ryuta Kamizono2017-04-091-4/+5
| | |_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Fix the comment on `formatted_version` * Extract `define_params` * Remove duplicated guard clause for `@version`
* | | | | | | | | Merge pull request #28740 from matthewd/old-postgresMatthew Draper2017-04-136-22/+33
|\ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / |/| | | | | | | | Use a query that's compatible with PostgreSQL 9.2
| * | | | | | | | Use a query that's compatible with PostgreSQL 9.2Matthew Draper2017-04-126-22/+33
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also, explicitly apply the order: generate_subscripts is unlikely to start returning values out of order, but we should still be clear about what we want.
* | | | | | | | Move CHANGELOG.md entry from Active Support to Action PackJon Moss2017-04-112-13/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Was looking through #28402, and realized the CHANGELOG.md entry is in the wrong place. Sorry we didn't catch this during code review :cry: [ci skip]
* | | | | | | | :scissors:Rafael Mendonça França2017-04-111-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | | | Merge pull request #28731 from y-yagi/fix_rubocop_violationsRafael França2017-04-112-2/+2
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Fix rubocop violations
| * | | | | | | | Fix rubocop violationsyuuji.yaginuma2017-04-122-2/+2
|/ / / / / / / /
* | | | | | | | Merge pull request #28402 from jules2689/action-controller-api-base-hooksRafael França2017-04-114-1/+127
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Add `action_controller_base` and `action_controller_api` hooks to mitigate differences between them. Also document Active Support on_load hooks
| * | | | | | | | Add Documentation for Active Support On Load HooksJulian Nadeau2017-04-101-0/+112
| | | | | | | | |
| * | | | | | | | Add action_controller_api, action_controller_base on_load hookJulian Nadeau2017-04-103-1/+15
| | | | | | | | |
* | | | | | | | | Merge pull request #28729 from matthewd/dont-freeze-inputsMatthew Draper2017-04-122-3/+17
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Don't freeze input strings
| * | | | | | | | | Don't freeze input stringsMatthew Draper2017-04-122-3/+17
| | |_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | See 34321e4a433bb7eef48fd743286601403f8f7d82 for background on ImmutableString vs String. Our String type cannot delegate typecasting to ImmutableString, because the latter freezes its input: duplicating the value after that gives us an unfrozen result, but still mutates the originally passed object.
* | | | | | | | | Merge pull request #28722 from DmytroVasin/rails-ujs-default-urlRafael França2017-04-112-22/+46
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | rails-ujs: missing default url for ajax requests.
| * | | | | | | | | Set current page as default for ajax requestsDmytro Vasin2017-04-112-22/+46
| | | | | | | | | |
* | | | | | | | | | Merge pull request #28728 from dskecse/update-documentation-on-routingRafael França2017-04-111-2/+2
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Update routing doc on the `get` `to:` option [ci skip]
| * | | | | | | | | | Update routing doc on the `get` `to:` option [ci skip]Dzianis Dashkevich2017-04-111-2/+2
| | |_|/ / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge pull request #28721 from koic/oracle_does_not_support_limit_clauseRafael França2017-04-111-1/+1
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | | Fix an AR test of relations_test when using Oracle
| * | | | | | | | | Fix an AR test of relations_test when using OracleKoichi ITO2017-04-111-1/+1
| | | | | | | | | |
* | | | | | | | | | Remove link to rack.github.ioJon Moss2017-04-101-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We mention the "resources" section of the guide in the next paragraph, and the link is listed there. IMHO we shouldn't list it twice. [ci skip]
* | | | | | | | | | Small grammar fixesJon Moss2017-04-101-3/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | | | | | Pluralize callbackJon Moss2017-04-101-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Users could have more than one `before_destroy` callback in their models. [ci skip]
* | | | | | | | | | Merge pull request #28680 from vishalzambre/callback_doc_updateJon Moss2017-04-101-0/+2
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | | Documented issue related before_destroy with dependent: :destroy
| * | | | | | | | | [ci skip] documented issue related before_destroyvishalzambre2017-04-101-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Updated text
* | | | | | | | | | Implement `fetch_values` for HashWithIndifferentAccess (#28316)Josh Pencheon2017-04-103-0/+31
| |_|/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `fetch_values` was added to Hash in Ruby 2.3.0: https://bugs.ruby-lang.org/issues/10017 This patch adds an implemention for instances of HWAI, in line with the existing definitions of `fetch` and `values_at`.
* | | | | | | | | exclude ORDER BY clause for exists? (#28699)Boris Slobodin2017-04-102-1/+6
| |/ / / / / / / |/| | | | | | |
* | | | | | | | Merge pull request #28713 from kamipo/expose_queries_for_association_queriesMatthew Draper2017-04-102-48/+44
|\ \ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | | Expose `queries` for `AssociationQueryValue` and `PolymorphicArrayValue`
| * | | | | | | Expose `queries` for `AssociationQueryValue` and `PolymorphicArrayValue`Ryuta Kamizono2017-04-092-21/+25
| | | | | | | |
| * | | | | | | Avoid to handle polymorphic association for `AssociationQueryHandler`Ryuta Kamizono2017-03-282-29/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It should be handled by `PolymorphicArrayHandler` if polymorphic association.
* | | | | | | | delegate_missing_to should fall back to superMatthew Draper2017-04-092-1/+23
| | | | | | | |
* | | | | | | | delegate_to_missing doesn't delegate private methodsMatthew Draper2017-04-092-1/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | So we shouldn't claim they're there, even when asked explicitly.
* | | | | | | | Merge pull request #28697 from ↵Kasper Timm Hansen2017-04-091-1/+0
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | y-yagi/remove_duplicated_delivery_method_definition Remove duplicated `delivery_method` definition
| * | | | | | | Remove duplicated `delivery_method` definitionyuuji.yaginuma2017-04-071-1/+0
| | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | `ActionMailer::Base.delivery_method` is already defined in https://github.com/rails/rails/blob/master/actionmailer/test/parameterized_test.rb#L13
* | | | | | | Add text to "Upgrading to Rails 5.1"Jon Moss2017-04-081-1/+8
| |_|_|_|_|/ |/| | | | | | | | | | | | | | | | | [ci skip]
* | | | | | Add scaffolding for different sections in 5.1 release notesJon Moss2017-04-081-0/+48
| | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | Merge pull request #28678 from hedgesky/use_formatted_number_as_schema_versionRafael França2017-04-081-1/+9
|\ \ \ \ \ \ | | | | | | | | | | | | | | use formatted number as schema version
| * | | | | | use formatted number as schema versionAnton Chuchkalov2017-04-051-1/+9
| | | | | | |
* | | | | | | Merge pull request #28705 from kamipo/extract_construct_relation_for_existsRafael França2017-04-082-17/+33
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Extract `construct_relation_for_exists` in `FinderMethods`
| * | | | | | | Extract `construct_relation_for_exists` in `FinderMethods`Ryuta Kamizono2017-04-091-12/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To ease to customize a relation for `exists?`.
| * | | | | | | More exercise `exists?` testsRyuta Kamizono2017-04-081-5/+18
| | | | | | | |
* | | | | | | | Drop the "Sanity Check" contributing stepMatthew Draper2017-04-091-10/+0
| | | | | | | |
* | | | | | | | Remove mentions and instructions for docrailsMatthew Draper2017-04-092-18/+2
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | It's been retired; all contributions now come in via PRs.
* | | | | | | Merge pull request #28692 from kmcphillips/masterRafael França2017-04-073-4/+49
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Calling fixture accessor method with no arguments returns all fixtures rather than empty array
| * | | | | | | Passing in no arguments to the dynamic fixture accessor method returns all ↵Kevin McPhillips2017-04-073-4/+49
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fixtures, not an empty array.
* | | | | | | | SpacesRafael Mendonça França2017-04-071-0/+1
| | | | | | | |
* | | | | | | | More :scissors:Rafael Mendonça França2017-04-071-1/+1
| | | | | | | |
* | | | | | | | :scissors:Rafael França2017-04-071-1/+1
| | | | | | | |
* | | | | | | | Fix Guides to include #23138 [ci skip]claudiob2017-04-071-8/+1
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A long-standing bug has been fixed in Rails 5.1 by @pixeltrix See https://github.com/rails/rails/blame/5-1-stable/actionpack/CHANGELOG.md#L52-L64 This PR updates the guides accordingly. Before: <img width="799" alt="before" src="https://cloud.githubusercontent.com/assets/10076/24809105/4ec7066c-1b73-11e7-98c6-c709c3465306.png"> After: <img width="799" alt="after" src="https://cloud.githubusercontent.com/assets/10076/24809109/50b21188-1b73-11e7-8a1a-32c3d0ed512a.png">