Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #30909 from ahorek/compatibility_fix | Ryuta Kamizono | 2017-10-18 | 2 | -1/+4 |
|\ | | | | | 42 compatibility - use int instead of bigint | ||||
| * | compatibility - use int instead of bigint | pavel | 2017-10-18 | 2 | -1/+4 |
| | | |||||
* | | Merge pull request #30876 from y-yagi/selenium_chrome_headless | Eileen M. Uchitelle | 2017-10-17 | 6 | -1/+41 |
|\ \ | |/ |/| | Add headless chrome driver to System Tests | ||||
| * | Add headless chrome driver to System Tests | yuuji.yaginuma | 2017-10-17 | 6 | -1/+41 |
| | | |||||
* | | Merge pull request #30907 from yhirano55/update_mailing_list_url_in_i18n_guide | Ryuta Kamizono | 2017-10-17 | 1 | -3/+3 |
|\ \ | | | | | | | Update mailing list URL in I18n guide [ci skip] | ||||
| * | | Update mailing list URL in I18n guide [ci skip] | Yoshiyuki Hirano | 2017-10-17 | 1 | -3/+3 |
|/ / | |||||
* | | Merge pull request #30901 from aditya-kapoor/fix-range-to-s | Sean Griffin | 2017-10-16 | 2 | -1/+12 |
|\ \ | | | | | | | Fix `to_s(:db)` for range comprising of alphabets. | ||||
| * | | Fix `to_s(:db)` for range comprising of alphabets. | Aditya Kapoor | 2017-10-16 | 2 | -1/+12 |
|/ / | |||||
* | | Merge pull request #30899 from eugeneius/rm_force_reload_docs | George Claghorn | 2017-10-15 | 2 | -5/+1 |
|\ \ | | | | | | | Remove association(true) references from docs [ci skip] | ||||
| * | | Remove association(true) references from docs [ci skip] | Eugene Kenny | 2017-10-16 | 2 | -5/+1 |
|/ / | | | | | | | | | Passing `true` to force an association to reload its records from the database was deprecated in 5.0 and removed in 5.1. | ||||
* | | Remove extra spaces in the args in the `time_zone_select` [ci skip] | Ryuta Kamizono | 2017-10-16 | 1 | -6/+6 |
| | | | | | | | | Follow up of #30862. | ||||
* | | Merge pull request #30862 from ↵ | Eileen M. Uchitelle | 2017-10-15 | 1 | -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 Hirano | 2017-10-12 | 1 | -1/+1 |
| |/ | |||||
* | | Merge pull request #30872 from yhirano55/capitalize_sprockets_in_engine_guide | Eileen M. Uchitelle | 2017-10-15 | 1 | -1/+1 |
|\ \ | | | | | | | Capitalize "sprockets" in Engine guide [ci skip] | ||||
| * | | Capitalize "sprockets" in Engine guide [ci skip] | Yoshiyuki Hirano | 2017-10-13 | 1 | -1/+1 |
| |/ | |||||
* | | Add a test case that eager-loading with a polymorphic association and using ↵ | Ryuta Kamizono | 2017-10-16 | 1 | -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 Kamizono | 2017-10-15 | 6 | -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-1 | Eileen M. Uchitelle | 2017-10-15 | 1 | -0/+1 |
|\ \ | | | | | | | Update Gemfile with comment for Active Storage group | ||||
| * | | Update Gemfile | Olivier | 2017-10-11 | 1 | -0/+1 |
| |/ | |||||
* | | MySQL: Don't lose `auto_increment: true` in the `db/schema.rb` | Ryuta Kamizono | 2017-10-15 | 3 | -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_filters | Ryuta Kamizono | 2017-10-15 | 1 | -6/+0 |
|\ \ | | | | | | | Remove unused `before_filters` | ||||
| * | | Remove unused `before_filters` | yuuji.yaginuma | 2017-10-15 | 1 | -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_guide | Ryuta Kamizono | 2017-10-15 | 1 | -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 Hirano | 2017-10-15 | 1 | -1/+1 |
|/ / | |||||
* | | Fix `COUNT(DISTINCT ...)` for `GROUP BY` with `ORDER BY` and `LIMIT` | Ryuta Kamizono | 2017-10-14 | 3 | -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 Kamizono | 2017-10-14 | 1 | -1/+2 |
| | | | | | | | | | | | | For investigating the cause of failure. https://travis-ci.org/rails/rails/jobs/287474883#L797-L799 | ||||
* | | Merge pull request #30889 from ↵ | Ryuta Kamizono | 2017-10-14 | 1 | -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 Hirano | 2017-10-14 | 1 | -0/+6 |
| | | | |||||
* | | | Merge pull request #30888 from y-yagi/fix_test_name_for_daemon_option | George Claghorn | 2017-10-13 | 1 | -2/+2 |
|\ \ \ | |/ / |/| | | Fix test name for daemon option test | ||||
| * | | Fix test name for daemon option test | yuuji.yaginuma | 2017-10-14 | 1 | -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-rails | Ryuta Kamizono | 2017-10-14 | 2 | -6/+0 |
|\ \ \ | |/ / |/| | | Remove unsued `jquery-rails` | ||||
| * | | Remove unsued `jquery-rails` | yuuji.yaginuma | 2017-10-13 | 2 | -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-activestorage | Ryuta Kamizono | 2017-10-14 | 3 | -5/+5 |
|\ \ \ | | | | | | | | | Use __dir__ in activestorage/ | ||||
| * | | | Use `require_relative` instead of `require` with full path in activestorage/ | bogdanvlviv | 2017-10-13 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | Related to #29417 | ||||
| * | | | Define path with __dir__ in activestorage/ | bogdanvlviv | 2017-10-13 | 3 | -4/+4 |
| | | | | | | | | | | | | | | | | Related to #29176 | ||||
* | | | | Merge pull request #30883 from PHedkvist/add_daemon_command_test | Ryuta Kamizono | 2017-10-14 | 1 | -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 Hedkvist | 2017-10-13 | 1 | -0/+12 |
| | | | | | | | | | | | | | | | | | | | | option[:daemonize] to true, otherwise the option[:daemonize] will be set to false | ||||
* | | | | | Merge pull request #30885 from ↵ | Ryuta Kamizono | 2017-10-14 | 1 | -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 Hirano | 2017-10-13 | 1 | -0/+39 |
|/ / / / | |||||
* | | | | Merge pull request #30882 from ↵ | Ryuta Kamizono | 2017-10-13 | 1 | -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 Hirano | 2017-10-13 | 1 | -0/+16 |
|/ / / | |||||
* / / | Clarify comment [ci skip] | George Claghorn | 2017-10-13 | 1 | -1/+1 |
|/ / | |||||
* | | Merge pull request #30874 from koic/bump_rubocop_to_0_50_0 | Ryuta Kamizono | 2017-10-13 | 2 | -4/+4 |
|\ \ | | | | | | | Bump RuboCop 0.50.0 | ||||
| * | | Bump RuboCop 0.50.0 | Koichi ITO | 2017-10-13 | 2 | -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-job | Ryuta Kamizono | 2017-10-13 | 3 | -3/+3 |
|\ \ \ | |/ / |/| | | Yield with an error instance instead of error class | ||||
| * | | Test exception message to ensure an exception instance is yielded | Kazunori Kajihiro | 2017-10-13 | 2 | -2/+2 |
| | | | |||||
| * | | Yield with an error instance instead of error class | Kazunori Kajihiro | 2017-09-29 | 1 | -1/+1 |
| | | | |||||
* | | | Accept variation keys in #preview and #variant | George Claghorn | 2017-10-12 | 2 | -7/+12 |
| | | | |||||
* | | | Introduce ActiveStorage::Blob#representation | George Claghorn | 2017-10-12 | 4 | -0/+73 |
| | | | |||||
* | | | Merge pull request #30867 from aditya-kapoor/guide-select_all-fix | Ryuta Kamizono | 2017-10-12 | 1 | -2/+2 |
|\ \ \ | | | | | | | | | fix the description for the `select_all` [ci skip] |