| Commit message (Collapse) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| * | | | | 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] | |||||
| | * | | | | fix the description for the `select_all` [ci skip] | Aditya Kapoor | 2017-10-12 | 1 | -2/+2 | |
| | | |/ / | |/| | | ||||||
| * | | | | Merge pull request #30864 from willnet/enable-link-in-rdoc | Ryuta Kamizono | 2017-10-12 | 1 | -12/+12 | |
| |\ \ \ \ | | | | | | | | | | | [ci skip]Enable link to ActionDispatch::Integration::Session#process in rdoc | |||||
| | * | | | | [ci skip]Enable link to ActionDispatch::Integration::Session#process in rdoc | willnet | 2017-10-12 | 1 | -12/+12 | |
| | |/ / / | ||||||
| * | | | | Merge pull request #30863 from y-yagi/fix_warning_unused_variable | Ryuta Kamizono | 2017-10-12 | 1 | -2/+1 | |
| |\ \ \ \ | |/ / / |/| | | | Fix "warning: assigned but unused variable - message" | |||||
| | * | | | Fix "warning: assigned but unused variable - message" | yuuji.yaginuma | 2017-10-12 | 1 | -2/+1 | |
| |/ / / | | | | | | | | | | Ruby 2.5 warns about this. Ref: https://travis-ci.org/rails/rails/jobs/286338999 | |||||
| * | | | Merge pull request #30855 from boone/fix_typos | Rafael França | 2017-10-10 | 4 | -6/+6 | |
| |\ \ \ | | | | | | | | | Fix some typos [ci skip] | |||||
| | * | | | Fix some typos. | Mike Boone | 2017-10-10 | 4 | -6/+6 | |
| |/ / / | ||||||
| * | | | Merge pull request #30850 from timsly/safe-redirect-back | Rafael França | 2017-10-10 | 2 | -7/+37 | |
| |\ \ \ | | | | | | | | | Add allow_other_host option to redirect_back method | |||||
| | * | | | Add allow_other_host option to redirect_back method | Tim Masliuchenko | 2017-10-10 | 2 | -7/+37 | |
| | | | | | ||||||
| * | | | | Fix documentation [ci skip] | Rafael Mendonça França | 2017-10-10 | 1 | -1/+1 | |
| | | | | | ||||||
| * | | | | Merge pull request #30847 from mikeycgto/signed-cookie-rotation-updates | Rafael França | 2017-10-10 | 2 | -2/+22 | |
| |\ \ \ \ | |/ / / |/| | | | Update security guide for signed cookie rotations | |||||
| | * | | | Update security guide for signed cookie rotations | Michael Coyne | 2017-10-09 | 2 | -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-command | Matthew Draper | 2017-10-10 | 6 | -249/+207 | |
| |\ \ \ | | | | | | | | | Improve railties' tests | |||||
| | * | | | Improve RakeTest#test_db_test_prepare_when_using_sql_format | bogdanvlviv | 2017-10-08 | 1 | -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 ↵ | bogdanvlviv | 2017-10-08 | 3 | -16/+12 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | TestHelpers::Generation#rails See #30520 | |||||
| | * | | | Remove redundant execution of `Dir.chdir(app_path) { }` in railties' tests | bogdanvlviv | 2017-10-08 | 4 | -230/+194 | |
| | | | | | ||||||
| * | | | | Merge pull request #30836 from ↵ | Matthew Draper | 2017-10-10 | 2 | -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 ancestors | Chris Salzberg | 2017-10-09 | 1 | -0/+5 | |
| | | | | | | ||||||
| | * | | | | Include Mutex_m into module class instead of extending instance | Chris Salzberg | 2017-10-08 | 1 | -2/+4 | |
| | | | | | | ||||||
| * | | | | | Merge pull request #30832 from y-yagi/simplify_console_test | Ryuta Kamizono | 2017-10-10 | 1 | -16/+3 | |
| |\ \ \ \ \ | | | | | | | | | | | | | Simplify parse arguments in `ConsoleTest` | |||||
| | * | | | | | Simplify parse arguments in `ConsoleTest` | yuuji.yaginuma | 2017-10-08 | 1 | -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 Griffin | 2017-10-09 | 1 | -1/+1 | |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bogdanvlviv/express-change_column_comment-as-public-api Express #change_column_comment as public api | |||||
 |
index : rails.git | |
| Mirror of official rails repo with custom fixes. | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |