aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Use frozen string literal in tools/Koichi ITO2017-08-134-0/+7
* Use frozen string literal in tasks/Koichi ITO2017-08-132-4/+7
* Use frozen string literal in guides/Koichi ITO2017-08-1322-0/+42
* Wait for the Delayed Job worker thread to finishMatthew Draper2017-08-131-0/+1
* Merge pull request #30228 from kamipo/fix_random_ci_failureMatthew Draper2017-08-131-2/+4
|\
| * Fix random CI failure due to non-deterministic sorting orderRyuta Kamizono2017-08-131-2/+4
* | Merge pull request #30211 from koic/frozen_activestorageMatthew Draper2017-08-1375-4/+149
|\ \
| * | Use frozen string literal in Active StorageKoichi ITO2017-08-1275-4/+149
* | | Merge pull request #30079 from kamipo/move_test_not_compatible_with_serialize...Matthew Draper2017-08-132-11/+11
|\ \ \
| * | | Move `test_not_compatible_with_serialize_macro` to `JSONSharedTestCases`Ryuta Kamizono2017-08-112-11/+11
* | | | Merge pull request #30222 from kamipo/respect_pk_typeMatthew Draper2017-08-131-5/+3
|\ \ \ \
| * | | | Use `references` to respect primary key type in active storage tablesRyuta Kamizono2017-08-131-5/+3
| | |_|/ | |/| |
* | | | Merge pull request #30226 from kamipo/delegate_to_enumerable_findMatthew Draper2017-08-132-17/+14
|\ \ \ \ | |/ / / |/| | |
| * | | Delegate to `Enumerable#find` for `CollectionProxy`Ryuta Kamizono2017-08-132-17/+14
|/ / /
* | | Merge pull request #30209 from kamipo/remove_duplicated_table_nameRafael França2017-08-121-8/+0
|\ \ \
| * | | Remove duplicated `table_name`Ryuta Kamizono2017-08-121-8/+0
| | |/ | |/|
* / | Test for the new exception of delegate_missing_to (#30191)Anton Khamets2017-08-123-3/+22
|/ /
* | Fix outdated comment for `Core::ClassMethods#===` [ci skip] (#30146)Ryuta Kamizono2017-08-121-2/+2
* | Merge pull request #30166 from yhirano55/fix_generator_method_environmentRafael Mendonça França2017-08-114-19/+99
|\ \
| * | Optimize indentation for generator actionsYoshiyuki Hirano2017-08-114-19/+99
* | | Merge pull request #30165 from tjschuck/code_formatting_fixRafael França2017-08-111-10/+10
|\ \ \
| * | | Add code formatting and minor grammar clarificationsT.J. Schuck2017-08-091-10/+10
* | | | Merge pull request #30126 from chopraanmol1/support_for_has_many_and_has_one_...Rafael França2017-08-114-12/+26
|\ \ \ \
| * | | | Changed join_fk private method to join_foreign_key public methodchopraanmol12017-08-093-15/+11
| * | | | Currently if relation object are passed to where condition for has one or has...chopraanmol12017-08-083-3/+21
* | | | | Merge pull request #29559 from kirs/eager-load-controller-actionsRafael França2017-08-113-0/+72
|\ \ \ \ \
| * | | | | Eager load controller and mailer actionsKir Shatrov2017-07-293-0/+72
* | | | | | Merge pull request #30114 from yhirano55/remove_empty_line_from_dummy_manifestRafael França2017-08-111-1/+0
|\ \ \ \ \ \
| * | | | | | Removed empty line from dummy_manifestYoshiyuki Hirano2017-08-071-1/+0
| | |/ / / / | |/| | | |
* | | | | | Merge pull request #30103 from yahonda/has_one_associations_failuresRafael França2017-08-111-1/+1
|\ \ \ \ \ \
| * | | | | | Add `:authors` fixture to address two random failures at HasOneAssociationsTestYasuo Honda2017-08-061-1/+1
* | | | | | | Merge pull request #30116 from yhirano55/skip_unused_components_when_running_...Rafael Mendonça França2017-08-113-1/+32
|\ \ \ \ \ \ \
| * | | | | | | Skip unused components when running in Rails pluginYoshiyuki Hirano2017-08-093-1/+32
* | | | | | | | Merge pull request #30105 from bogdanvlviv/remove-sorted-test_orderRafael França2017-08-111-2/+0
|\ \ \ \ \ \ \ \
| * | | | | | | | Remove :sorted test order for isolated testsbogdanvlviv2017-08-071-2/+0
* | | | | | | | | Merge pull request #30198 from betesh/activestorage-rack-test-uploaded-fileRafael França2017-08-112-2/+8
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Make activestorage treat Rack::Test::UploadedFile just like ActionDispatch::H...Isaac Betesh2017-08-112-2/+8
* | | | | | | | | | Merge pull request #30110 from yhirano55/add_git_sourceRafael Mendonça França2017-08-113-0/+10
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Add git_source to Gemfile for plugin generatorYoshiyuki Hirano2017-08-093-0/+10
| | |_|/ / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge pull request #30060 from bdewater/aj-callback-docsRafael França2017-08-111-22/+30
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Make one line example fit on one line [ci skip]Bart de Water2017-08-091-3/+1
| * | | | | | | | | | Improve callback examples in Active Job guide [ci skip]Bart de Water2017-08-031-22/+32
* | | | | | | | | | | Merge pull request #30159 from allcentury/dump-temp-file-permissionsRafael França2017-08-111-1/+1
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Use copy to preserve file permissionsAnthony Ross2017-08-091-1/+1
* | | | | | | | | | | | Merge pull request #30092 from bogdanvlviv/prevent-generation-extra-empty-linesRafael França2017-08-112-7/+6
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Prevent generation extra empty lines in a plugin's Rakefilebogdanvlviv2017-08-092-7/+6
| | |_|_|_|_|/ / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge pull request #30147 from yhirano55/fix_trailing_blank_linesRafael França2017-08-112-2/+0
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | [Active Storage] `rubocop -a --only Layout/TrailingBlankLines`Yoshiyuki Hirano2017-08-093-3/+1
* | | | | | | | | | | | | Merge pull request #30113 from dixpac/remove_unecessary_require_in_test_helperRafael França2017-08-111-2/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Remove unecessary require in test_helperdixpac2017-08-091-2/+0
| |/ / / / / / / / / / / /