aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Fix `bin/rails db:setup` and `bin/rails db:test:prepare` create wrong ↵bogdanvlviv2017-10-154-9/+72
| | | | | | | | | | | | | | | | | | | | | | ar_internal_metadata's data for a test database. Before: ``` $ RAILS_ENV=test rails dbconsole > SELECT * FROM ar_internal_metadata; key|value|created_at|updated_at environment|development|2017-09-11 23:14:10.815679|2017-09-11 23:14:10.815679 ``` After: ``` $ RAILS_ENV=test rails dbconsole > SELECT * FROM ar_internal_metadata; key|value|created_at|updated_at environment|test|2017-09-11 23:14:10.815679|2017-09-11 23:14:10.815679 ``` Fixes #26731.
* Remove extra spaces in the args in the `time_zone_select` [ci skip]Ryuta Kamizono2017-10-161-6/+6
| | | | Follow up of #30862.
* Merge pull request #30862 from ↵Eileen M. Uchitelle2017-10-151-1/+1
|\ | | | | | | | | yhirano55/remove_needless_space_in_action_view_guide Remove a needless space in Action View Guide [ci skip]
| * Remove a needless space in Action View Guide [ci skip]Yoshiyuki Hirano2017-10-121-1/+1
| |
* | Merge pull request #30872 from yhirano55/capitalize_sprockets_in_engine_guideEileen M. Uchitelle2017-10-151-1/+1
|\ \ | | | | | | Capitalize "sprockets" in Engine guide [ci skip]
| * | Capitalize "sprockets" in Engine guide [ci skip]Yoshiyuki Hirano2017-10-131-1/+1
| |/
* | Add a test case that eager-loading with a polymorphic association and using ↵Ryuta Kamizono2017-10-161-0/+4
| | | | | | | | | | | | | | | | | | | | | | `exists?` This test covers the case of 02da8aea. Previously `exists?` was always eager-loading the includes values. But now it is eager-loaded only when necessary since 07a611e0. So the case of the eager-loading had not covered in the test.
* | Fix longer sequence name detection for serial columns (#28339)Ryuta Kamizono2017-10-156-4/+64
| | | | | | | | | | | | | | | | We already found the longer sequence name, but we could not consider whether it was the sequence name created by serial type due to missed a max identifier length limitation. I've addressed the sequence name consideration to respect the max identifier length. Fixes #28332.
* | Merge pull request #30860 from olimart/patch-1Eileen M. Uchitelle2017-10-151-0/+1
|\ \ | | | | | | Update Gemfile with comment for Active Storage group
| * | Update GemfileOlivier2017-10-111-0/+1
| |/
* | MySQL: Don't lose `auto_increment: true` in the `db/schema.rb`Ryuta Kamizono2017-10-153-0/+47
| | | | | | | | | | | | | | | | | | | | Currently `AUTO_INCREMENT` is implicitly used in the default primary key definition. But `AUTO_INCREMENT` is not only used for single column primary key, but also for composite primary key. In that case, `auto_increment: true` should be dumped explicitly in the `db/schema.rb`. Fixes #30894.
* | Merge pull request #30896 from y-yagi/remove_unused_before_filtersRyuta Kamizono2017-10-151-6/+0
|\ \ | | | | | | Remove unused `before_filters`
| * | Remove unused `before_filters`yuuji.yaginuma2017-10-151-6/+0
| | | | | | | | | | | | | | | This method added by 1008511. It is unnecessary because it is no longer called by 19c3495.
* | | Merge pull request #30892 from yhirano55/add_accept_charset_to_form_in_js_guideRyuta Kamizono2017-10-151-1/+1
|\ \ \ | |/ / |/| | Add accept-charset to the output of form_with in JS guide [ci skip]
| * | Add accept-charset to the output of form_with in JS guide [ci skip]Yoshiyuki Hirano2017-10-151-1/+1
|/ /
* | Fix `COUNT(DISTINCT ...)` for `GROUP BY` with `ORDER BY` and `LIMIT`Ryuta Kamizono2017-10-143-1/+11
| | | | | | | | | | | | | | | | | | | | This is the fix for the regression of #29848. In #29848, I've kept existing select list in the subquery for the count if ORDER BY is given. But it had accidentally affect to GROUP BY queries also. It should keep the previous behavior in that case. Fixes #30886.
* | 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
| | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-26 07:27:57 +0000