aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Doc updates for ActiveRecord::BatchesT.J. Schuck2017-05-261-12/+12
| | | [ci skip]
* 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
* | | Merge pull request #29221 from koic/remove_duplicate_migration_testMatthew Draper2017-05-261-27/+0
|\ \ \ | | | | | | | | Remove a duplicate test of migration_test in AR
| * | | Remove a duplicate test of migration_test in ARKoichi ITO2017-05-251-27/+0
| | | |
* | | | Merge pull request #29230 from koic/remove_duplicate_schema_authorization_testMatthew Draper2017-05-261-11/+0
|\ \ \ \ | | | | | | | | | | Remove a duplicate test of schema_authorization_test in AR
| * | | | Remove a duplicate test of schema_authorization_test in ARKoichi ITO2017-05-251-11/+0
| | | | |
* | | | | Merge pull request #29215 from voxmedia/ar_optimizationsMatthew Draper2017-05-263-3/+4
|\ \ \ \ \ | | | | | | | | | | | | ActiveRecord initialization optimizations
| * | | | | Make #deep_dup use #allocate instead of #newMichael Lovitt2017-05-251-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change preserves the speedup made in a24912cb1d3 (by avoiding the wasted shallow dup of @attributes) while ensuring that the performance of #deep_dup won't be tied to the performance of #initialize
| * | | | | Performance optimization for ActiveRecord#column_defaultsMichael Lovitt2017-05-241-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Memoize the #column_defaults class property, as ActiveRecord does for other properties in this module. This change addresses slowness in ActiveRecord initialization introduced starting in Rails 5.0. This method's performance has not changed with Rails 5, but it is now called much more frequently than before: every time an STI model is instantiated.
| * | | | | Performance optimization for ActiveRecord#subclass_from_attributesMichael Lovitt2017-05-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change addresses slowness in ActiveRecord initialization introduced starting in Rails 5.0.
| * | | | | Performance optimization for AttributeSet#deep_dupMichael Lovitt2017-05-241-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Skip the call to #dup, since it does a shallow copy of attributes, which is wasted effort, since #deep_dup then replaces that shallow copy with a #deep_dup of the given attributes. This change addresses slowness in ActiveRecord initialization introduced starting in Rails 5.0.
* | | | | | Merge pull request #29226 from koic/remove_duplicate_mysql_rake_testMatthew Draper2017-05-261-7/+0
|\ \ \ \ \ \ | | | | | | | | | | | | | | Remove a duplicate test of mysql_rake_test
| * | | | | | Remove a duplicate test of mysql_rake_testKoichi ITO2017-05-261-7/+0
| | |/ / / / | |/| | | |
* | | | | | Merge pull request #29216 from matthewd/threadsafe-load-schemaMatthew Draper2017-05-263-3/+56
|\ \ \ \ \ \ | | | | | | | | | | | | | | Add a Monitor to ModelSchema#load_schema
| * | | | | | Add a Monitor to ModelSchema#load_schemaMatthew Draper2017-05-253-3/+56
| | |/ / / / | |/| | | | | | | | | | | | | | | | [Vikrant Chaudhary, David Abdemoulaie, Matthew Draper]
* | | | | | Merge pull request #29229 from andyatkinson/remove-redundant-test-methodMatthew Draper2017-05-261-7/+1
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | Remove redundant test method
| * | | | | Remove redundant test methodAndy Atkinson2017-05-251-7/+1
|/ / / / /
* | | | | Merge pull request #29195 from kaspth/rails-secrets-better-edit-exceptionKasper Timm Hansen2017-05-255-34/+61
|\ \ \ \ \ | | | | | | | | | | | | Make `secrets:edit` run `secrets:setup` if it hasn't already.
| * | | | | Reorder first secrets edit flow.Kasper Timm Hansen2017-05-255-33/+61
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Setup config/secrets.yml.enc with template contents for people to edit. Then generate encryption key and encrypt the initial secrets.
| * | | | | Remove needless waiting message.Kasper Timm Hansen2017-05-231-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Needed back when we attempted to wait for editors, but now we expect users to pass a -w flag to their $EDITOR.
* | | | | | Merge pull request #29225 from maicher/masterRyuta Kamizono2017-05-251-0/+13
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | Add ActiveRecord::Relation#or description to guides
| * | | | | Add ActiveRecord::Relation#or description to guides [ci skip]Krzysztof Maicher2017-05-251-0/+13
| | | | | |
* | | | | | Merge pull request #29175 from kamipo/extract_json_shared_testsMatthew Draper2017-05-253-351/+184
|\ \ \ \ \ \ | | | | | | | | | | | | | | Extract `JSONSharedTestCases`
| * | | | | | Extract `JSONSharedTestCases`Ryuta Kamizono2017-05-223-351/+184
| | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | Both `mysql2/json_test.rb` and `postgresql/json_test.rb` have same test cases.
* | | | | | Merge pull request #29211 from yahonda/rubocop_namespacesMatthew Draper2017-05-251-21/+21
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | rubocop namespace changes from `Style` to `Layout`
| * | | | | rubocop namespace changes from `Style` to `Layout`Yasuo Honda2017-05-241-21/+21
| | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refer https://github.com/bbatsov/rubocop/pull/4278/commits/54166bf76ba76b14f1bbc8a34165f175dbc3f227 for the commit ``` /path/to/rails/.rubocop.yml: Style/CaseIndentation has the wrong namespace - should be Layout /path/to/rails/.rubocop.yml: Style/CommentIndentation has the wrong namespace - should be Layout /path/to/rails/.rubocop.yml: Style/EmptyLines has the wrong namespace - should be Layout /path/to/rails/.rubocop.yml: Style/EmptyLinesAroundClassBody has the wrong namespace - should be Layout /path/to/rails/.rubocop.yml: Style/EmptyLinesAroundMethodBody has the wrong namespace - should be Layout /path/to/rails/.rubocop.yml: Style/EmptyLinesAroundModuleBody has the wrong namespace - should be Layout /path/to/rails/.rubocop.yml: Style/IndentationConsistency has the wrong namespace - should be Layout /path/to/rails/.rubocop.yml: Style/IndentationWidth has the wrong namespace - should be Layout /path/to/rails/.rubocop.yml: Style/SpaceAfterColon has the wrong namespace - should be Layout /path/to/rails/.rubocop.yml: Style/SpaceAfterComma has the wrong namespace - should be Layout /path/to/rails/.rubocop.yml: Style/SpaceAroundEqualsInParameterDefault has the wrong namespace - should be Layout /path/to/rails/.rubocop.yml: Style/SpaceAroundKeyword has the wrong namespace - should be Layout /path/to/rails/.rubocop.yml: Style/SpaceAroundOperators has the wrong namespace - should be Layout /path/to/rails/.rubocop.yml: Style/SpaceBeforeFirstArg has the wrong namespace - should be Layout /path/to/rails/.rubocop.yml: Style/SpaceBeforeBlockBraces has the wrong namespace - should be Layout /path/to/rails/.rubocop.yml: Style/SpaceInsideBlockBraces has the wrong namespace - should be Layout /path/to/rails/.rubocop.yml: Style/SpaceInsideHashLiteralBraces has the wrong namespace - should be Layout /path/to/rails/.rubocop.yml: Style/SpaceInsideParens has the wrong namespace - should be Layout /path/to/rails/.rubocop.yml: Style/Tab has the wrong namespace - should be Layout /path/to/rails/.rubocop.yml: Style/TrailingBlankLines has the wrong namespace - should be Layout /path/to/rails/.rubocop.yml: Style/TrailingWhitespace has the wrong namespace - should be Layout ```
* | | | | Merge pull request #29181 from kamipo/fix_circular_left_joins_with_scopingMatthew Draper2017-05-252-3/+10
|\ \ \ \ \ | | | | | | | | | | | | Fix crashing on circular left join references with scoping
| * | | | | Fix crashing on circular left join references with scopingRyuta Kamizono2017-05-242-3/+10
| | |_|/ / | |/| | | | | | | | | | | | | Follow up of #25702.
* | | | | Capitalize GmailJon Moss2017-05-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `gmail` --> `Gmail` [ci skip]
* | | | | Merge pull request #29213 from nihemak/fix-docs-has-manyRyuta Kamizono2017-05-251-1/+1
|\ \ \ \ \ | |_|/ / / |/| | | | [ci skip]fix wrong variable name in docs
| * | | | [ci skip]fix wrong variable name in docsMakoto Nihei2017-05-251-1/+1
|/ / / /
* | | | Merge pull request #29203 from koic/bump_rubocop_and_fix_rubocop_offencesRafael França2017-05-245-9/+9
|\ \ \ \ | | | | | | | | | | Bump RuboCop to 0.49.0 and fix offences
| * | | | Fix a RuboCop offences using `rubocop -a`Koichi ITO2017-05-244-7/+4
| | | | |
| * | | | Bump rubocop and dependent gem versionsKoichi ITO2017-05-241-2/+5
| | | | |
* | | | | Merge pull request #29169 from ffmike/api-guide-editRafael França2017-05-241-9/+11
|\ \ \ \ \ | | | | | | | | | | | | Update Rails API Application guide to match current code [ci skip]
| * | | | | Update Rails API Application guide to match current code [ci skip]Mike Gunderloy2017-05-211-9/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Adjust list of middlewares loaded by default * Add routing middleware to list to match the list in the Rack guide * Adjust list of Controller modules loaded by default Plus fix one singular/plural mistake
* | | | | | Merge pull request #29209 from ffmike/action-mailer-gmail-noteRafael França2017-05-241-1/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | Update information on using Gmail when 2FA is in use [ci skip]
| * | | | | | Update information on using Gmail when 2FA is in use [ci skip]Mike Gunderloy2017-05-241-1/+2
|/ / / / / /
* | | | | | We dont actually use the ultra short-hand, so no need to complicate things ↵David Heinemeier Hansson2017-05-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | with it
* | | | | | Slim down the source definitionDavid Heinemeier Hansson2017-05-241-5/+1
| |_|/ / / |/| | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-16 21:49:23 +0000