aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | Merge pull request #28530 from kamipo/fix_ci_failureMatthew Draper2017-03-231-2/+2
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | Fix `assert_logged` failure
| * | | | | Fix `assert_logged` failureRyuta Kamizono2017-03-231-2/+2
| | |_|/ / | |/| | | | | | | | | | | | | | | | | | `'#{name}' file doesn't exist, so no dependencies` was removed in bb04814.
* | | | | Small grammar fixJon Moss2017-03-221-1/+1
| | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | Merge pull request #28523 from ↵Matthew Draper2017-03-232-16/+0
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | y-yagi/dont_comment_out_file_watcher_during_rails_upgrade_process Don't comment out config.file_watcher during Rails upgrade
| * | | | | Don't comment out config.file_watcher during Rails upgradeyuuji.yaginuma2017-03-222-16/+0
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | This is necessary only when updating to Rails 5.0, it is not necessary for updating to 5.1. Related #24243
* | | | | Merge pull request #28531 from yahonda/suppress_pg_warningMatthew Draper2017-03-231-0/+1
|\ \ \ \ \ | | | | | | | | | | | | Suppress `WARNING: nonstandard use of \\ in a string literal` warning
| * | | | | Suppress `WARNING: nonstandard use of \\ in a string literal` warningYasuo Honda2017-03-221-0/+1
| |/ / / / | | | | | | | | | | | | | | | by setting `escape_string_warning = off`
* | | | | Small grammar fixJon Moss2017-03-221-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Tried to make the sentence read more clearly. [ci skip]
* | | | | Fix a race in ActionCable stream testsMatthew Draper2017-03-231-0/+4
| |/ / / |/| | | | | | | | | | | | | | | These tests double-stub connection.pubsub, so we need to ensure the first call's completed before we set up for the second.
* | | | Merge pull request #28522 from larskanis/replace-deprecated-pg-constantsMatthew Draper2017-03-237-21/+21
|\ \ \ \ | | | | | | | | | | [PostgreSQL] Replace deprecated PG constants.
| * | | | [PostgreSQL]: Replace deprecated PG constants.Lars Kanis2017-03-227-21/+21
| |/ / / | | | | | | | | | | | | | | | | The old top level classes PGconn, PGresult and PGError were deprecated since pg-0.13.0: https://github.com/ged/ruby-pg/blob/master/History.rdoc#v0130-2012-02-09-michael-granger-gedfaeriemudorg
* | | | Skip isolated test runs on older rubiesMatthew Draper2017-03-231-0/+1
| | | |
* | | | Stop complaining about not being able to digest dynamic template partial ↵David Heinemeier Hansson2017-03-221-2/+4
|/ / / | | | | | | | | | names and simplify error logging to a single line when not
* | | Merge pull request #28394 from shime/docs-action-dispatchXavier Noria2017-03-2231-96/+96
|\ \ \ | | | | | | | | [docs] fix ActionDispatch documentation
| * | | [docs] fix ActionDispatch documentationHrvoje Šimić2017-03-1331-96/+96
| | | |
* | | | Update bug report templatesMatthew Draper2017-03-225-5/+5
| | | |
* | | | Start Rails 5.2 developmentMatthew Draper2017-03-2234-2447/+90
| |/ / |/| |
* | | Merge pull request #28056 from sngeth/wrap_store_accessors_in_paramsRafael França2017-03-212-1/+18
|\ \ \ | | | | | | | | Wrap stored accessors in parameters
| * | | Wrap store accessors in parametersSid Ngeth2017-03-212-1/+18
| | | | | | | | | | | | | | | | Modified params wrapper to account for model's stored_attributes
* | | | Fix test assertionRafael Mendonça França2017-03-211-1/+1
| | | |
* | | | Fix test that was asserting the wrong thingRafael Mendonça França2017-03-211-1/+1
|/ / /
* | | Revert "Merge pull request #27775 from domcleal/27774-format-reset"Rafael Mendonça França2017-03-212-15/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit c6f9f8c28a720ad4ec7cf3613dddfa451d5968e2, reversing changes made to c309073c7476f50dfb1e796d058580f176101c36. Reason: This is fixing the behavior in the wrong place. Now the request path after the request is nil and there is no way to assert that. Also the test that was added in that PR also fails in 4.2 where the reporter says it was passing. The reason the bahavior changed between Rails 4.2 and Rails 5 is that the format in the path is now respected. The correct way to fix the problem is not doign two requests in the same controller test and use integrations tests. This change caused a regression between Rails 5.0.1 and 5.0.2.
* | | Merge pull request #28450 from adamgamble/bug_fix/fix_typo_in_actionviewRafael França2017-03-211-1/+1
|\ \ \ | | | | | | | | Fix typo in actionview error message in to_form_params helper method
| * | | Fix typo in actionview error messageadamgamble2017-03-171-1/+1
| | | |
* | | | Merge pull request #28497 from jhawthorn/unscope_specific_where_valueAndrew White2017-03-212-2/+10
|\ \ \ \ | | | | | | | | | | Fix where_clause#except with specific where value
| * | | | Fix where_clause#except with specific where valueJohn Hawthorn2017-03-202-2/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes a regression introduced in 22ca710f20c3c656811df006cbf1f4dbc359f7a6 where Relation#unscope with a specific where value (vs unscoping the entire where clause) could result in the wrong binds being left on the query. This was caused by an index variable not being incremented properly.
* | | | | Remove 5.0.0 entry from 5.1.0 CHANGELOG [ci skip]claudiob2017-03-201-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The entry for PR #25430 is currently present both in the CHANGELOG for Rails 5.0 and for Rails 5.1: https://github.com/rails/rails/blame/9d3a352777c2594123583b0bc02d0dd80f1e385b/railties/CHANGELOG.md#L61-L72 Since the PR was backported to 5-0-stable in #25499, I believe it should be removed from the CHANGELOG of 5.1, otherwise it looks like something changed from 5.0 to 5.1
* | | | | Merge pull request #28498 from Erol/fix-typo-in-caching-guideJon Moss2017-03-201-1/+1
|\ \ \ \ \ | |/ / / / |/| | | | Fix typo in Caching with Rails Guide
| * | | | Fix typo in Caching with Rails Guide [skip ci]Erol Fornoles2017-03-211-1/+1
|/ / / /
* | | | Update the maintenance policy [ci skip]Rafael Mendonça França2017-03-201-3/+3
| | | |
* | | | Default to yielding a `form` variable.Kasper Timm Hansen2017-03-202-12/+12
| | | | | | | | | | | | | | | | More intention revealing and means `f` can go F itself 😋
* | | | Merge pull request #28406 from ↵Kasper Timm Hansen2017-03-201-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | chukitow/feature/user-form-with-instead-of-form-for-scaffold user form with instead of form for in scaffold generator
| * | | | disable remote submitsIvan Velasquez2017-03-141-1/+1
| | | | |
| * | | | user form with instead of form for in scaffold generatorIvan Velasquez2017-03-131-1/+1
| | | | |
* | | | | Merge pull request #28474 from kamipo/fix_extension_with_darty_targetKasper Timm Hansen2017-03-203-2/+12
|\ \ \ \ \ | | | | | | | | | | | | Fix extension method with dirty target in has_many associations
| * | | | | Fix extension method with dirty target in has_many associationsRyuta Kamizono2017-03-203-2/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Extension methods should not delegate to `scope` to respect dirty target on `CollectionProxy`. Fixes #28419.
* | | | | | Merge pull request #28487 from kamipo/remove_duplicated_columns_definitionRafael França2017-03-202-11/+5
|\ \ \ \ \ \ | | | | | | | | | | | | | | Remove duplicated `columns` definition
| * | | | | | Remove duplicated `columns` definitionRyuta Kamizono2017-03-202-11/+5
| |/ / / / /
* | | | | | Fix the blog post template headerRafael Mendonça França2017-03-201-1/+1
| | | | | |
* | | | | | Merge pull request #28486 from y-yagi/add_app_update_for_rails_engineRafael França2017-03-205-1/+51
|\ \ \ \ \ \ | | | | | | | | | | | | | | Add `app:update` task to engines
| * | | | | | Add `app:update` task to enginesyuuji.yaginuma2017-03-205-1/+51
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Occasionally we update the file generated by engine. Therefore, I think that there is a task for updating as well as application in the engine, it is convenient for updating.
* | | | | | Merge pull request #28473 from kamipo/delegate_uniq_to_recordsRafael França2017-03-204-20/+20
|\ \ \ \ \ \ | | | | | | | | | | | | | | Delegate `uniq` to `records`
| * | | | | | Use `load` rather than `collect` for force loadingRyuta Kamizono2017-03-194-20/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since b644964b `ActiveRecord::Relation` includes `Enumerable` so delegating `collect`, `all?`, and `include?` are also unneeded. `collect` without block returns `Enumerable` without preloading by that. We should use `load` rather than `collect` for force loading.
* | | | | | | Merge pull request #27939 from kamipo/fix_select_all_with_legacy_bindsRafael França2017-03-202-1/+14
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | Fix `select_all` with legacy `binds`
| * | | | | | Fix `select_all` with legacy `binds`Ryuta Kamizono2017-02-122-1/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #27923.
* | | | | | | Merge pull request #28481 from y-yagi/fix_warningKasper Timm Hansen2017-03-201-3/+3
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Fix `warning: character class has duplicated range`
| * | | | | | | Fix `warning: character class has duplicated range`yuuji.yaginuma2017-03-201-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes the following warnings: ``` railties/test/generators/encrypted_secrets_generator_test.rb:15: warning: character class has duplicated range: /[\w\d]+/ railties/test/generators/encrypted_secrets_generator_test.rb:18: warning: character class has duplicated range: /production:\n# external_api_key: [\w\d]+/ railties/test/generators/encrypted_secrets_generator_test.rb:19: warning: character class has duplicated range: /production:\n# external_api_key: [\w\d]+/ ```
* | | | | | | | Merge pull request #28479 from kamipo/evaluate_default_block_only_when_necessaryKasper Timm Hansen2017-03-203-4/+4
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Evaluate the default block only when necessary
| * | | | | | | | Evaluate the default block only when necessaryRyuta Kamizono2017-03-202-3/+3
| | |_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | Follow up of #28453.
| * | | | | | | Delegate `uniq` to `records`Ryuta Kamizono2017-03-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes CI failure due to 48f3be8c. `Enumerable#uniq` was introduced since Ruby 2.4. We should delegate `uniq` to `records` explicitly. And since b644964b `ActiveRecord::Relation` includes `Enumerable` so delegating `map` is unneeded.
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-05 00:47:13 +0000