aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Show the failed queries in `test_has_one_does_not_use_order_by`Ryuta Kamizono2017-10-141-1/+2
| | | | | | For investigating the cause of failure. https://travis-ci.org/rails/rails/jobs/287474883#L797-L799
* Merge pull request #30889 from ↵Ryuta Kamizono2017-10-141-0/+6
|\ | | | | | | | | yhirano55/add_unpermitted_parameters_hook_to_instrument_guide Add unpermitted_parameters hook to instrumentation guide [ci skip]
| * Add unpermitted_parameters.action_controller hook to instrument guide [ci skip]Yoshiyuki Hirano2017-10-141-0/+6
| |
* | Merge pull request #30888 from y-yagi/fix_test_name_for_daemon_optionGeorge Claghorn2017-10-131-2/+2
|\ \ | |/ |/| Fix test name for daemon option test
| * Fix test name for daemon option testyuuji.yaginuma2017-10-141-2/+2
| | | | | | | | | | | | | | In this test file, "server option" refers to the server used to start Rails(e.g. `puma`, `thin`). But this test, "server option" is not specified. Therefore, I think that it is incorrect that `server_option` is included in the test name.
* | Merge pull request #30877 from y-yagi/remove_jquery-railsRyuta Kamizono2017-10-142-6/+0
|\ \ | |/ |/| Remove unsued `jquery-rails`
| * Remove unsued `jquery-rails`yuuji.yaginuma2017-10-132-6/+0
| | | | | | | | | | This has been added by 8f8cb1baa3b5609969805fcdd7295f3d7de2bd6b. But now it is unnecessary because it is not used in the test.
* | Merge pull request #30887 from bogdanvlviv/use-__dir__-in-activestorageRyuta Kamizono2017-10-143-5/+5
|\ \ | | | | | | Use __dir__ in activestorage/
| * | Use `require_relative` instead of `require` with full path in activestorage/bogdanvlviv2017-10-131-1/+1
| | | | | | | | | | | | Related to #29417
| * | Define path with __dir__ in activestorage/bogdanvlviv2017-10-133-4/+4
| | | | | | | | | | | | Related to #29176
* | | Merge pull request #30883 from PHedkvist/add_daemon_command_testRyuta Kamizono2017-10-141-0/+12
|\ \ \ | | | | | | | | Added test case for starting rails with daemon option
| * | | Added test case for starting rails with daemon option, this should set the ↵Pierre Hedkvist2017-10-131-0/+12
| | | | | | | | | | | | | | | | option[:daemonize] to true, otherwise the option[:daemonize] will be set to false
* | | | Merge pull request #30885 from ↵Ryuta Kamizono2017-10-141-0/+39
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | yhirano55/add_action_cable_notifications_to_instrument_guide Add Action Cable notifications to instrument guide [ci skip]
| * | | Add Action Cable notifications to instrument guide [ci skip]Yoshiyuki Hirano2017-10-131-0/+39
|/ / /
* | | Merge pull request #30882 from ↵Ryuta Kamizono2017-10-131-0/+16
|\ \ \ | |/ / |/| | | | | | | | yhirano55/add_mailer_notification_in_instrumentation_guide Add process.action_mailer notification to Instrument guide [ci skip]
| * | Add process.action_mailer notification to Instrumentation guide [ci skip]Yoshiyuki Hirano2017-10-131-0/+16
|/ /
* / Clarify comment [ci skip]George Claghorn2017-10-131-1/+1
|/
* Merge pull request #30874 from koic/bump_rubocop_to_0_50_0Ryuta Kamizono2017-10-132-4/+4
|\ | | | | Bump RuboCop 0.50.0
| * Bump RuboCop 0.50.0Koichi ITO2017-10-132-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | RuboCop 0.50.0 was released. https://github.com/bbatsov/rubocop/releases/tag/v0.50.0 And `rubocop-0-50` channel is available in Code Climate. https://github.com/codeclimate/codeclimate-rubocop/issues/107#issuecomment-336234260 This commit will bump RuboCop to 0.50.0. There are no new offences in this change. ```console % bundle exec rubocop --version 0.50.0 % bundle exec rubocop Inspecting 2350 files (snip) 2350 files inspected, no offenses detected ```
* | Merge pull request #30750 from k2nr/fix-active-jobRyuta Kamizono2017-10-133-3/+3
|\ \ | |/ |/| Yield with an error instance instead of error class
| * Test exception message to ensure an exception instance is yieldedKazunori Kajihiro2017-10-132-2/+2
| |
| * Yield with an error instance instead of error classKazunori Kajihiro2017-09-291-1/+1
| |
* | Accept variation keys in #preview and #variantGeorge Claghorn2017-10-122-7/+12
| |
* | Introduce ActiveStorage::Blob#representationGeorge Claghorn2017-10-124-0/+73
| |
* | Merge pull request #30867 from aditya-kapoor/guide-select_all-fixRyuta Kamizono2017-10-121-2/+2
|\ \ | | | | | | fix the description for the `select_all` [ci skip]
| * | fix the description for the `select_all` [ci skip]Aditya Kapoor2017-10-121-2/+2
| | |
* | | Merge pull request #30864 from willnet/enable-link-in-rdocRyuta Kamizono2017-10-121-12/+12
|\ \ \ | | | | | | | | [ci skip]Enable link to ActionDispatch::Integration::Session#process in rdoc
| * | | [ci skip]Enable link to ActionDispatch::Integration::Session#process in rdocwillnet2017-10-121-12/+12
| |/ /
* | | Merge pull request #30863 from y-yagi/fix_warning_unused_variableRyuta Kamizono2017-10-121-2/+1
|\ \ \ | |/ / |/| | Fix "warning: assigned but unused variable - message"
| * | Fix "warning: assigned but unused variable - message"yuuji.yaginuma2017-10-121-2/+1
|/ / | | | | | | Ruby 2.5 warns about this. Ref: https://travis-ci.org/rails/rails/jobs/286338999
* | Merge pull request #30855 from boone/fix_typosRafael França2017-10-104-6/+6
|\ \ | | | | | | Fix some typos [ci skip]
| * | Fix some typos.Mike Boone2017-10-104-6/+6
|/ /
* | Merge pull request #30850 from timsly/safe-redirect-backRafael França2017-10-102-7/+37
|\ \ | | | | | | Add allow_other_host option to redirect_back method
| * | Add allow_other_host option to redirect_back methodTim Masliuchenko2017-10-102-7/+37
| | |
* | | Fix documentation [ci skip]Rafael Mendonça França2017-10-101-1/+1
| | |
* | | Merge pull request #30847 from mikeycgto/signed-cookie-rotation-updatesRafael França2017-10-102-2/+22
|\ \ \ | |/ / |/| | Update security guide for signed cookie rotations
| * | Update security guide for signed cookie rotationsMichael Coyne2017-10-092-2/+22
|/ / | | | | | | | | The example was slightly incorrect. This commit also adds a test case for this example to cookies middleware unit tests.
* | Merge pull request #30595 from bogdanvlviv/use-railties-rails-commandMatthew Draper2017-10-106-249/+207
|\ \ | | | | | | Improve railties' tests
| * | Improve RakeTest#test_db_test_prepare_when_using_sql_formatbogdanvlviv2017-10-081-3/+1
| | | | | | | | | | | | | | | - Remove redundant setting `RAILS_ENV` for `db:test:prepare`. `db:test:prepare` doesn't require it.
| * | Invoke rails command inside the railties' test app with ↵bogdanvlviv2017-10-083-16/+12
| | | | | | | | | | | | | | | | | | TestHelpers::Generation#rails See #30520
| * | Remove redundant execution of `Dir.chdir(app_path) { }` in railties' testsbogdanvlviv2017-10-084-230/+194
| | |
* | | Merge pull request #30836 from ↵Matthew Draper2017-10-102-2/+9
|\ \ \ | | | | | | | | | | | | | | | | shioyama/generated_attribute_methods_include_mutex Include Mutex_m into GeneratedAttributeMethods instead of extending instance
| * | | Add test for class of GeneratedAttributeMethods instance in ancestorsChris Salzberg2017-10-091-0/+5
| | | |
| * | | Include Mutex_m into module class instead of extending instanceChris Salzberg2017-10-081-2/+4
| | | |
* | | | Merge pull request #30832 from y-yagi/simplify_console_testRyuta Kamizono2017-10-101-16/+3
|\ \ \ \ | | | | | | | | | | Simplify parse arguments in `ConsoleTest`
| * | | | Simplify parse arguments in `ConsoleTest`yuuji.yaginuma2017-10-081-16/+3
| | | | | | | | | | | | | | | | | | | | | | | | | If need a parse result of arguments, can obtain it by creating an instance of the command.
* | | | | Merge pull request #30798 from ↵Sean Griffin2017-10-091-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | bogdanvlviv/express-change_column_comment-as-public-api Express #change_column_comment as public api
| * | | | | Express #change_column_comment as public apibogdanvlviv2017-10-041-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Implemented by #22911 Related to #30677
* | | | | | Merge pull request #30843 from y-yagi/use_released_gemRyuta Kamizono2017-10-102-12/+7
|\ \ \ \ \ \ | | | | | | | | | | | | | | Use released `sidekiq` instead of master version
| * | | | | | Use released `sidekiq` instead of master versionyuuji.yaginuma2017-10-092-12/+7
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | The sidekiq 5.0.5 includes redis-rb 4.0 support. Ref: https://github.com/mperham/sidekiq/blob/90db3b84208cbb73a50d1a77a1dea97d3490ce70/Changes.md#505
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-19 01:52:18 +0000