aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Remove dead constantsFumiaki MATSUSHIMA2016-09-061-30/+0
| | | | It seems that we forgot to remove some codes on https://github.com/rails/rails/commit/7ab47751068c6480e7e44fc9265a7e690dd4af3b
* Merge pull request #26394 from kamipo/remove_redundant_conditionAndrew White2016-09-061-2/+2
|\ | | | | Remove redundant `!loaded?` condition
| * Remove redundant `!loaded?` conditionRyuta Kamizono2016-09-061-2/+2
| | | | | | | | | | Already checked `if !find_target? || loaded?`, unnecessary `!loaded?` in elsif condition.
* | Merge pull request #26397 from yui-knk/unused_inner_aliasMatthew Draper2016-09-061-1/+0
|\ \ | |/ |/| Remove not used alias method
| * Remove not used alias methodyui-knk2016-09-061-1/+0
|/ | | | | Bang methods of `AR::QueryMethods` are used only internally. We only use `left_outer_joins!`, so we can remove this alias.
* Merge pull request #26370 from yahonda/rails26368Andrew White2016-09-052-2/+2
|\ | | | | Move `require "models/post"` before `require "models/comment"`
| * Change require order to come `require "models/post"` before `require ↵Yasuo Honda2016-09-022-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | "models/comment"` to address BasicsTest#test_readonly_attributes failure #26368 It reproduces only when both of these conditions are satisfied: - Other test files `autosave_association_test.rb` or `where_test.rb` which executes `require "models/comment"` then `require "models/post"` - When `autosave_association_test.rb` or `where_test.rb` executed before `base_test.rb`
* | Merge pull request #26391 from y-yagi/use_descendants_to_get_all_subclassesAndrew White2016-09-054-1/+17
|\ \ | | | | | | use `descendants` to get class that inherited `ActiveJob::Base`
| * | use `descendants` to get class that inherited `ActiveJob::Base`yuuji.yaginuma2016-09-054-1/+17
| |/ | | | | | | | | | | `subclasses` get only child classes. Therefore, if create a job common parent class as `ApplicationJob`, inherited class does not get properly.
* | Merge pull request #26379 from kamipo/remove_unnecessary_query_scopeAndrew White2016-09-051-4/+0
|\ \ | | | | | | Remove unnecessary `query_scope`
| * | Remove unnecessary `query_scope`Ryuta Kamizono2016-08-161-4/+0
| | |
* | | Merge pull request #26392 from y-yagi/chage_descendants_to_public_apiVipul A M2016-09-051-2/+15
|\ \ \ | | | | | | | | change `Class#descendants` to public API [ci skip]
| * | | change `Class#descendants` to public API [ci skip]yuuji.yaginuma2016-09-051-2/+15
|/ / / | | | | | | | | | | | | | | | `Class#descendants` has already been displayed in Rails guide, so I think that may be displayed in doc. http://guides.rubyonrails.org/active_support_core_extensions.html#descendants
* | | Merge pull request #26377 from y-yagi/rename_test_method_to_avoid_overridingEileen M. Uchitelle2016-09-041-1/+1
|\ \ \ | | | | | | | | rename test method to avoid overriding
| * | | rename test method to avoid overridingyuuji.yaginuma2016-09-031-1/+1
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | This removes the following warning. ``` ./test/dispatch/routing_test.rb:3696: warning: method redefined; discarding old test_namespaced_roots ./test/dispatch/routing_test.rb:1632: warning: previous definition of test_namespaced_roots was here ```
* | | Merge pull request #26383 from ↵Eileen M. Uchitelle2016-09-042-36/+14
|\ \ \ | | | | | | | | | | | | | | | | kamipo/remove_unnecessary_count_for_collection_proxy Remove unnecessary `count` method for collection proxy
| * | | Remove unnecessary `count` method for collection proxyRyuta Kamizono2016-09-042-36/+14
| | | | | | | | | | | | | | | | Simply use its own method because `CollectionProxy` inherits `Relation`.
* | | | Merge pull request #26384 from ↵Eileen M. Uchitelle2016-09-043-1/+43
|\ \ \ \ | |/ / / |/| | | | | | | | | | | y-yagi/make_fixture_file_upload_in_integration_test make `fixture_file_upload` work in integration tests
| * | | make `fixture_file_upload` work in integration testsyuuji.yaginuma2016-09-043-1/+43
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | Currently, `fixture_file_upload` does not work in integration test. Because, `TestProcess` module has been include in `Session` class, but `fixture_path` can not get from `Session` class. Modify to include `TestProcess` in `IntegrationTest` class in order to get correct value of `fixture_path`.
* | | Merge pull request #26382 from naw/transaction-callback-docsVipul A M2016-09-042-1/+9
|\ \ \ | | | | | | | | Update ActiveRecord callback guide for exceptions [ci skip]
| * | | Update docs for change in transaction callback exceptionsNathan Wenneker2016-09-032-1/+9
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | 07d3d40 changed how exceptions are handled in after_commit and after_destroy callbacks. This commit updates the 5.0 release notes and the ActiveRecord callback guide to reflect the new behavior. [ci skip]
* | | Merge pull request #26371 from duffyjp/masterGuillermo Iguaran2016-09-031-1/+4
|\ \ \ | | | | | | | | Allow download of email attachments in the Mailer Preview template.
| * | | Allow download of email attachments in the Mailer Preview template.jpd8002016-09-021-1/+4
| |/ /
* | | Merge pull request #26375 from kamipo/remove_blank_else_branchGuillermo Iguaran2016-09-031-3/+0
|\ \ \ | | | | | | | | Remove blank else branch
| * | | Remove blank else branchRyuta Kamizono2016-09-031-3/+0
| | | |
* | | | Merge pull request #26381 from kamipo/extract_duplicated_create_for_associationYves Senn2016-09-033-16/+8
|\ \ \ \ | | | | | | | | | | Extract duplicated `create` and `create!` definition for association
| * | | | Extract duplicated `create` and `create!` definition for associationRyuta Kamizono2016-09-033-16/+8
|/ / / /
* | | | Merge pull request #26374 from kamipo/fix_broken_heredoc_indentationXavier Noria2016-09-0321-107/+108
|\ \ \ \ | |/ / / |/| | | Fix broken heredoc indentation caused by rubocop auto-correct
| * | | Fix broken heredoc indentation caused by rubocop auto-correctRyuta Kamizono2016-09-0321-107/+108
|/ / / | | | | | | | | | | | | | | | All indentation was normalized by rubocop auto-correct at 80e66cc4d90bf8c15d1a5f6e3152e90147f00772. But heredocs was still kept absolute position. This commit aligns heredocs indentation for consistency.
* | | Merge pull request #26373 from ↵Guillermo Iguaran2016-09-021-0/+1
|\ \ \ | |/ / |/| | | | | | | | y-yagi/add_active_job_bug_report_templates_to_guide add Active Job bug report templates to guide [ci skip]
| * | add Active Job bug report templates to guide [ci skip]yuuji.yaginuma2016-09-031-0/+1
|/ / | | | | | | Follow up to #26362
* | Merge pull request #26364 from ↵Kasper Timm Hansen2016-09-022-4/+4
|\ \ | | | | | | | | | | | | y-yagi/fix_class_name_typo_in_bug_report_templates fix class name typo in bug report templates for Active Job
| * | fix class name typoyuuji.yaginuma2016-09-022-4/+4
| | |
* | | Merge pull request #26365 from riseshia/patch-1Vipul A M2016-09-021-2/+1
|\ \ \ | |/ / |/| | Improve Getting Started [ci skip]
| * | Improve Getting Started [ci skip]Shia2016-09-021-2/+1
|/ /
* | Merge pull request #26362 from prathamesh-sonpatki/add-aj-bug-report-templatesGuillermo Iguaran2016-09-022-0/+63
|\ \ | | | | | | Added bug report templates for Active Job
| * | Added bug report templates for Active JobPrathamesh Sonpatki2016-09-022-0/+63
| | |
* | | Merge pull request #26361 from wytesk133/masterप्रथमेश Sonpatki2016-09-021-1/+1
|\ \ \ | |/ / |/| | Grammar fix
| * | Grammar fix [ci skip]Waitaya Krongapiradee2016-09-021-1/+1
|/ /
* | apply case-in-assignment patternXavier Noria2016-09-022-11/+13
| |
* | RuboCop is 100% green :tada:Xavier Noria2016-09-029-44/+53
| |
* | fix RuboCop errors re \xFCXavier Noria2016-09-021-2/+4
| |
* | fixes remaining RuboCop issues [Vipul A M, Xavier Noria]Xavier Noria2016-09-0140-71/+71
| |
* | Cache to_datetime for performanceAndrew White2016-09-011-1/+1
| | | | | | | | | | | | | | As demonstrated in #25880 the to_time method converts the utc time instance to a local time instance which is an expensive operation. Since to_datetime involves similar expensive operations we should also cache it to speed up comparison with lots of values.
* | Merge pull request #26354 from shingo-nakanishi/fix_documentVipul A M2016-09-011-1/+2
|\ \ | | | | | | fix document for radio_button [ci skip]
| * | fix document for radio_buttonshingo-nakanishi2016-09-011-1/+2
|/ / | | | | | | add `# Let's say that @user.receive_newsletter returns "no":` for `def radio_button(object_name, method, tag_value, options = {})`. fix `# Let's say that @user.category returns "no":` to `# Let's say that @user.receive_newsletter returns "no":`
* | Merge pull request #26351 from y-yagi/fix_ruby_warningSean Griffin2016-08-311-3/+3
|\ \ | | | | | | remove warning from `video_tag`
| * | remove warning from `video_tag`yuuji.yaginuma2016-09-011-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | This removes the following warning. ``` actionview/lib/action_view/helpers/asset_tag_helper.rb:291: warning: shadowing outer local variable - options ```
* | | Merge pull request #25758 from vipulnsward/fix-key-len-issueMatthew Draper2016-09-014-9/+39
|\ \ \ | |/ / |/| | Follow up of #25602
| * | Start passing cipher from EncryptedCookieJar since we use it to determine ↵Vipul A M2016-09-014-22/+26
| | | | | | | | | | | | key length
generated by cgit v1.2.3 (git 2.25.1) at 2024-10-02 17:44:45 +0000