aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | | | | | | | | | | | | Merge pull request #29097 from ↵Matthew Draper2017-05-283-6/+20
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | EilisHamilton/fix_uncountable_pluralization_locale Fix pluralization of uncountables when given a locale
| * | | | | | | | | | | | | | | | | Fix pluralization of uncountables when given a localeEilis Hamilton2017-05-193-6/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously apply_inflections would only use the :en uncountables rather then the ones for the locale that was passed to pluralize or singularize. This changes apply_inflections to take a locale which it will use to find the uncountables.
* | | | | | | | | | | | | | | | | | Merge pull request #29197 from kamipo/enable_extending_even_if_scope_returns_nilMatthew Draper2017-05-282-7/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Enable extending even if scope returns nil
| * | | | | | | | | | | | | | | | | | Enable extending even if scope returns nilRyuta Kamizono2017-05-242-7/+7
| | |_|_|_|_|_|_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | Merge pull request #29250 from kamipo/remove_unused_association_interpolateMatthew Draper2017-05-281-8/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove unused `Association#interpolate`
| * | | | | | | | | | | | | | | | | | Remove unused `Association#interpolate`Ryuta Kamizono2017-05-281-8/+0
| | |_|_|_|_|_|_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Using `Association#interpolate` was removed since #11251.
* | | | | | | | | | | | | | | | | | Merge pull request #29255 from y-yagi/bring_back_delayed_job_to_integration_testKasper Timm Hansen2017-05-282-6/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bring back delayed_job to test list
| * | | | | | | | | | | | | | | | | | Bring back delayed_job to test listyuuji.yaginuma2017-05-281-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `delayed_job_active_record` 4.1.2 supports Rails 5.1. Ref: https://github.com/collectiveidea/delayed_job_active_record/pull/138
| * | | | | | | | | | | | | | | | | | Bump `delayed_job_active_record` gemyuuji.yaginuma2017-05-281-4/+4
| | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | Clear all current instances before a reload.Kasper Timm Hansen2017-05-282-2/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If users added an attribute or otherwise changed a CurrentAttributes subclass they'd see exceptions on the next page load. Because `ActiveSupport::CurrentAttributes.current_instances` would keep references to the old instances from the previous request. We can fix this by clearing out the `current_attributes` before we unload constants. Then any change to the model can be autoloaded again since its slot isn't taken by an old instance. We'll still have to call reset before we clear so external collaborators, like Time.zone, won't linger with their current value throughout other code.
* | | | | | | | | | | | | | | | | | | Make reset execution assertions easier to read.Kasper Timm Hansen2017-05-281-15/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The app is booted by then, so there's no need to stash the code away in some other script.
* | | | | | | | | | | | | | | | | | | Remove double Thread.current storage.Kasper Timm Hansen2017-05-281-5/+3
|/ / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since we're generating a key through the class name we can combine the two Thread.current calls into a single hash version.
* | | | | | | | | | | | | | | | | | Merge pull request #28895 from codeforkjeff/fix-session-keys-and-values-methodsMatthew Draper2017-05-282-0/+20
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add lazy loading to #keys and #values methods in Session
| * | | | | | | | | | | | | | | | | | Add lazy loading to #keys and #values methods in Sessioncodeforkjeff2017-04-262-0/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes a bug where session.keys and session.values return an empty array unless one of the other methods that does lazy loading from the underlying store is called first. #keys and #values should also call #load_for_read!
* | | | | | | | | | | | | | | | | | | Merge pull request #29249 from bradleypriest/numericality-precision-regressionMatthew Draper2017-05-283-1/+22
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix regression in Numericality validator
| * | | | | | | | | | | | | | | | | | | Fix regression in Numericality validator where extra decimal places on Bradley Priest2017-05-273-1/+22
| | |/ / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a user input for a decimal column were ignored by numerically validations
* | | | | | | | | | | | | | | | | | | Merge pull request #29251 from y-yagi/fix_29247Matthew Draper2017-05-282-1/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | Includes namespace in system test skelton when namespace is specified
| * | | | | | | | | | | | | | | | | | Includes namespace in system test skelton when namespace is specifiedyuuji.yaginuma2017-05-282-1/+6
|/ / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #29247
* | | | | | | | | | | | | | | | | | Use non-raising finder.Kasper Timm Hansen2017-05-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `find` raises when it can't find a record, so we'll never reach the else. Switch to `find_by` which returns nil when no record can be found.
* | | | | | | | | | | | | | | | | | [ci skip] Fix spelling that's a bit of an overreach.Kasper Timm Hansen2017-05-271-1/+1
| | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | Use models to match the docs.Kasper Timm Hansen2017-05-271-1/+1
| | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | Merge pull request #29246 from nihemak/fix-docs-take-firstMatthew Draper2017-05-271-3/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]fix wrong variable name in docs
| * | | | | | | | | | | | | | | | | | [ci skip]fix wrong variable name in docsMakoto Nihei2017-05-271-3/+3
| | |_|_|_|_|_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | Merge pull request #29245 from nihemak/fix-docs-findRichard Schneeman2017-05-261-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | [ci skip]fix wrong variable name in docs
| * | | | | | | | | | | | | | | | | [ci skip]fix wrong variable name in docsMakoto Nihei2017-05-271-1/+1
|/ / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | Switch to rb-inotify masterMatthew Draper2017-05-272-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://github.com/guard/rb-inotify/pull/49 has been merged.
* | | | | | | | | | | | | | | | | Merge pull request #29240 from tjschuck/ar_batches_doc_updatesRafael França2017-05-261-12/+12
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Doc updates for ActiveRecord::Batches
| * | | | | | | | | | | | | | | | | Doc updates for ActiveRecord::BatchesT.J. Schuck2017-05-261-12/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | | | | | | | | | | | | | Merge pull request #29242 from tjschuck/rdoc_formatting_fixRafael França2017-05-261-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix broken RDoc formatting
| * | | | | | | | | | | | | | | | | | Fix broken RDoc formattingT.J. Schuck2017-05-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | | | | | | | | | | | | | | Merge pull request #29152 from djforth/masterRafael Mendonça França2017-05-261-0/+10
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update to Rails ujs readme
| * | | | | | | | | | | | | | | | | | Update to rails-ujs documentation for yarn installAdrian Stainforth2017-05-261-0/+10
| | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | Merge pull request #29237 from mohitnatoo/arel-update-docRafael França2017-05-261-3/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip] Changed sentence formation for ActiveRecordRelation#update
| * | | | | | | | | | | | | | | | | | | [ci skip] Changed sentence formation for ActiveRecordRelation#updateMohit Natoo2017-05-261-3/+3
| | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | Merge pull request #25037 from mohitnatoo/adapter-inquirerRafael França2017-05-262-3/+21
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | Provides friendlier way to access queue adapters of a job.
| * | | | | | | | | | | | | | | | | | | Removed string inquiry.Mohit Natoo2017-05-262-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fixed indentation. rebased with master.
| * | | | | | | | | | | | | | | | | | | Provides friendlier way to access queue adapters of a job.Mohit Natoo2017-05-262-4/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - removed predicate method. Used only reader.
* | | | | | | | | | | | | | | | | | | | Merge pull request #29238 from ashishg-qburst/generatorRafael França2017-05-262-4/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | Do not show --webpack option in the plugin help message
| * | | | | | | | | | | | | | | | | | | Do not show --webpack option in the plugin help messageash2017-05-262-4/+5
| |/ / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | Merge pull request #29239 from koic/remove_redundant_test_assertionMatthew Draper2017-05-271-1/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove a redundant test assertion
| * | | | | | | | | | | | | | | | | | | Remove a redundant test assertionKoichi ITO2017-05-271-1/+0
| | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | ActiveSupport::CurrentAttributes provides a thread-isolated attributes ↵David Heinemeier Hansson2017-05-266-0/+385
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | singleton (#29180) * Add ActiveSupport::CurrentAttributes to provide a thread-isolated attributes singleton * Need to require first * Move stubs into test namespace. Thus they won't conflict with other Current and Person stubs. * End of the line for you, whitespace! * Support super in attribute methods. Define instance level accessors in an included module such that `super` in an overriden accessor works, akin to Active Model. * Spare users the manual require. Follow the example of concerns, autoload in the top level Active Support file. * Add bidelegation support * Rename #expose to #set. Simpler, clearer * Automatically reset every instance. Skips the need for users to actively embed something that resets their CurrentAttributes instances. * Fix test name; add tangible name value when blank. * Try to ensure we run after a request as well. * Delegate all missing methods to the instance This allows regular `delegate` to serve, so we don't need bidelegate. * Properly test resetting after execution cycle. Also remove the stale puts debugging. * Update documentation to match new autoreset
* | | | | | | | | | | | | | | | | | | | Merge pull request #29232 from koic/ci_against_jruby_9_1_10_0Matthew Draper2017-05-271-3/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | CI against JRuby 9.1.10.0
| * | | | | | | | | | | | | | | | | | | CI against JRuby 9.1.10.0Koichi ITO2017-05-261-3/+3
| |/ / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | http://jruby.org/2017/05/25/jruby-9-1-10-0.html
* | | | | | | | | | | | | | | | | | | Merge pull request #29234 from y-yagi/remove_unused_test_classGuillermo Iguaran2017-05-261-3/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove unused test class
| * | | | | | | | | | | | | | | | | | | Remove unused test classyuuji.yaginuma2017-05-261-3/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `AlsoDoingNothingTest` was added in cf9be89. It seems that it added to confirm that the test works in the child class of `ActiveSupport::TestCase`. But now basically use `ActiveSupport::TestCase` in test, so I think it is unnecessary.
* | | | | | | | | | | | | | | | | | | | Avoid circular require due to autoloadMatthew Draper2017-05-261-9/+9
| | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | Prevent a redefinition warning when the real Rails.root appearsMatthew Draper2017-05-261-2/+3
| |/ / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | Merge pull request #29176 from bogdanvlviv/define-path-with__dir__Matthew Draper2017-05-26117-204/+197
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Define path with __dir__
| * | | | | | | | | | | | | | | | | | | Define path with __dir__bogdanvlviv2017-05-23117-204/+197
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ".. with __dir__ we can restore order in the Universe." - by @fxn Related to 5b8738c2df003a96f0e490c43559747618d10f5f
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-08 08:02:40 +0000