aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | | | | | | | Merge pull request #28765 from y-yagi/fix_module_name_typoRyuta Kamizono2017-04-151-10/+10
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / |/| | | | | | | | | | | Fix module name [ci skip]
| * | | | | | | | | | | Fix module name [ci skip]yuuji.yaginuma2017-04-151-10/+10
|/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replace `FormOptionHelper` to `FormOptionsHelper`.
* | | | | | | | | | | Merge pull request #28760 from rails/fix-attributes_nameAaron Patterson2017-04-144-12/+30
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Move around AR::Dirty and fix _attribute method
| * | | | | | | | | | | Move around AR::Dirty and fix _attribute methodAaron Patterson2017-04-144-12/+30
|/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We already have a _read_attribute method that can get the value we need from the model. Lets define that method in AM::Dirty and use the existing one from AR::Dirty rather than introducing a new method.
* | | | | | | | | | | Merge pull request #28661 from ↵Aaron Patterson2017-04-144-4/+35
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bogdanvlviv/fix-dirty-attributes-if-override-attr_accessor Fix inconsistency with changed attributes when overriding AR attribute reader
| * | | | | | | | | | | Fix inconsistency with changed attributes when overriding AR attribute readerbogdanvlviv2017-04-124-4/+35
| | | | | | | | | | | |
* | | | | | | | | | | | Add additional options to time `change` methodsAndrew White2017-04-146-15/+83
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Support `:offset` in `Time#change` and `:zone` or `:offset` in `ActiveSupport::TimeWithZone#change`. Fixes #28723.
* | | | | | | | | | | | Merge pull request #28715 from ↵Andrew White2017-04-144-60/+32
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | kamipo/convert_association_queries_to_poro_queries Convert association queries to PORO queries
| * | | | | | | | | | | | `AssociationQueryValue#queries` returns an array for more concise ↵Ryuta Kamizono2017-04-112-14/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | association handling
| * | | | | | | | | | | | Convert `PolymorphicArrayValue` to PORO queriesRyuta Kamizono2017-04-093-28/+19
| | | | | | | | | | | | |
| * | | | | | | | | | | | Convert `AssociationQueryValue` to PORO queriesRyuta Kamizono2017-04-092-35/+23
| | | | | | | | | | | | |
* | | | | | | | | | | | | Merge pull request #28743 from kamipo/add_test_case_for_20802Andrew White2017-04-142-0/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a test case for #20802
| * | | | | | | | | | | | | Add a test case for #20802Ryuta Kamizono2017-04-132-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The issue #20802 has been fixed in cc0b566. Closes #20802.
* | | | | | | | | | | | | | Merge pull request #28748 from DmytroVasin/rails-ujs-fix-ajax-response-parsingRafael França2017-04-132-3/+31
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / / / / |/| | | | | | | | | | | | | Fix mistake in JS response parser
| * | | | | | | | | | | | | Fix mistake in JS response parser:Dmytro Vasin2017-04-132-3/+31
| |/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Restore ability to accept ecmascript JS response should not modify DOM.
* | | | | | | | | | | | | Merge pull request #28744 from ↵Rafael França2017-04-131-1/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | y-yagi/make_code_statistics_task_handle_system_tests_properly Make code statistics task handle system tests properly
| * | | | | | | | | | | | | Make code statistics task handle system tests properlyyuuji.yaginuma2017-04-131-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If it is not added to `TEST_TYPES`, it is not regarded as a test when counting the total count.
* | | | | | | | | | | | | | Merge pull request #28750 from alexmuller/patch-1Rafael França2017-04-131-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / |/| | | | | | | | | | | | | Close form_for tag in FormHelper API docs
| * | | | | | | | | | | | | Close form_for tag in FormHelper API docsAlex Muller2017-04-131-2/+2
|/ / / / / / / / / / / / /
* / / / / / / / / / / / / :scissors:Ryuta Kamizono2017-04-137-7/+1
|/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | | | | | | | 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
| | | | | | | | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-04 10:14:39 +0000