aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Allow unscoping of left_outer_joinsAndrei Shaidurov2017-03-061-1/+1
|
* Add CHANGELOG entry for #28250Andrew White2017-03-061-0/+10
|
* Merge pull request #28250 from tzabaman/fix_malformed_asset_url_in_ac_rendererAndrew White2017-03-062-0/+15
|\ | | | | Fix malformed asset_url in ActionController::Renderer
| * Fix malformed asset_url when rendering template with ActionController::RendererGiorgos Vrettos2017-03-062-0/+15
| |
* | Merge pull request #28305 from kamipo/extract_schema_migration_all_versionsAndrew White2017-03-063-4/+8
|\ \ | |/ |/| Extract `SchemaMigration.all_versions`
| * Extract `SchemaMigration.all_versions`Ryuta Kamizono2017-03-063-4/+8
| | | | | | | | | | Use `SchemaMigration.all_versions` instead of `SchemaMigration.all.map(&:version)` to avoid to instantiate AR objects.
* | Merge pull request #28295 from kamipo/fix_deserialize_with_json_arrayAndrew White2017-03-063-1/+17
|\ \ | | | | | | Fix `deserialize` with JSON array
| * | Fix `deserialize` with JSON arrayRyuta Kamizono2017-03-063-1/+17
| |/ | | | | | | Fixes #28285.
* | Merge pull request #28301 from y-yagi/fix_direct_with_params_exampleJon Moss2017-03-051-1/+1
|\ \ | |/ |/| Fix `direct` with params example [ci skip]
| * Fix `direct` with params example [ci skip]yuuji.yaginuma2017-03-061-1/+1
| | | | | | | | | | | | | | Since `ActionController:Parameters` does not inherit `Hash`, need to explicitly convert it to `Hash`. Also, `Parameters#to_h` returns `Hash` whose key is `String`. Therefore, if merge as it is, the value will not be overwritten as expected.
* | Merge pull request #28296 from kamipo/fix_ci_failureJon Moss2017-03-051-2/+2
|\ \ | | | | | | Fix CI failure due to contain <U+2028>
| * | Fix CI failure due to contain <U+2028>Ryuta Kamizono2017-03-061-2/+2
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ```diff diff --git a/actionpack/lib/action_controller/metal/redirecting.rb b/actionpack/lib/action_controller/metal/redirecting.rb index a3159c29dd..1836a07d4e 100644 --- a/actionpack/lib/action_controller/metal/redirecting.rb +++ b/actionpack/lib/action_controller/metal/redirecting.rb @@ -50,8 +50,8 @@ module Redirecting # redirect_to post_url(@post), status: 301, flash: { updated_post_id: @post.id } # redirect_to({ action: 'atom' }, alert: "Something serious happened") # - # Statements after redirect_to in our controller get executed, so redirect_to doesn't stop the execution of the function. - <U+2028># To terminate the execution of the function immediately after the redirect_to, use return. + # Statements after +redirect_to+ in our controller get executed, so +redirect_to+ doesn't stop the execution of the function. + # To terminate the execution of the function immediately after the +redirect_to+, use return. # redirect_to post_url(@post) and return def redirect_to(options = {}, response_status = {}) raise ActionControllerError.new("Cannot redirect to nil!") unless options ``` https://travis-ci.org/rails/rails/jobs/207908041#L549
* | Merge pull request #28293 from ↵Eileen M. Uchitelle2017-03-053-12/+8
|\ \ | | | | | | | | | | | | kamipo/remove_useless_migrator_schema_migrations_table_name Remove useless `Migrator.schema_migrations_table_name`
| * | Remove useless `Migrator.schema_migrations_table_name`Ryuta Kamizono2017-03-053-12/+8
| |/ | | | | | | Simply use `SchemaMigration.table_name` instead.
* | Merge pull request #28259 from ChakreshwarSharma/redirect_to_docVipul A M2017-03-051-0/+3
|\ \ | | | | | | [ci skip] Use return with redirect_to
| * | [ci skip] Use return with redirect_toChakreshwarSharma2017-03-041-0/+3
| | |
* | | Merge pull request #28264 from ↵Eileen M. Uchitelle2017-03-052-1/+30
|\ \ \ | | | | | | | | | | | | | | | | y-yagi/do_not_take_screenshot_if_driver_does_not_support_it Do not take screenshot if driver does not support screenshot
| * | | Do not take screenshot if driver does not support screenshotyuuji.yaginuma2017-03-042-1/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `Capybara::RackTest::Driver` does not support taking screenshots. If call `#save_screenshot` on `Capybara::RackTest::Driver` will raise the error. ```ruby Error: UsersTest#test_visiting_the_index: Capybara::NotSupportedByDriverError: Capybara::Driver::Base#save_screenshot ``` To prevent errors, if driver does not support screenshot, do not call it.
* | | | Revert "Add a changelog entry for #28284 [ci skip]"eileencodes2017-03-051-6/+0
| | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 84c1b107b9daab90b3ccf520f0f09752e4eaf425. Reverted #28283 so reverted it's changelog update as well.
* | | | Revert "Merge pull request #28283 from ↵eileencodes2017-03-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | y-yagi/silence_puma_startup_messages_in_system_test" This reverts commit 0d73f9116ccd3ded23e69d70ff5ed23dd339df5b, reversing changes made to 21ff8a493206cd50558b03975a7eaaaeb6ec7900. We don't want to silence Puma because it's start up messages can be useful (to see threads, port etc). #28109 was instead fixed by not running system tests by defaul with `bin/rails test` in #28286.
* | | | Merge pull request #28286 from robin850/skip-system-tests-by-defaultEileen M. Uchitelle2017-03-056-10/+73
|\ \ \ \ | |_|_|/ |/| | | Avoid running system tests by default
| * | | Avoid running system tests by defaultRobin Dupret2017-03-056-10/+73
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These tests may be expansive so let's only allow users to run them through `bin/rails test:system` or by passing a path to the `test` command. The same applies for `bin/rake test`. Refs #28109.
* | | | Merge branch 'master' of github.com:rails/docrailsVijay Dev2017-03-042-2/+2
|\ \ \ \
| * | | | Fix generated query in Retrieving specific data from multiple tables section ↵Vipul A M2017-03-041-1/+1
| | | | | | | | | | | | | | | | | | | | [ci skip]
| * | | | Remove duplicated "does" [ci skip]Ryuta Kamizono2017-02-141-1/+1
| | | | |
* | | | | Don't hide method that's been documented API since Rails 2.1Andrew White2017-03-041-3/+3
| | | | |
* | | | | Merge pull request #28288 from tejasbubane/fix-parameter-missing-docRobin Dupret2017-03-041-1/+1
|\ \ \ \ \ | | | | | | | | | | | | [ci skip] Fix ParameterMissing exception name in docs
| * | | | | [ci skip] Fix ParameterMissing exception name in docsTejas Bubane2017-03-041-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Should be `ActionController::ParameterMissing` and not `ActionController::MissingParameter`. Corresponding change was done in guides in https://github.com/rails/rails/pull/9816.
* | | | | | Merge pull request #28287 from kamipo/fix_db_schema_loadAndrew White2017-03-043-5/+25
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Fix `rake db:schema:load` with subdirectories
| * | | | | Fix `rake db:schema:load` with subdirectoriesRyuta Kamizono2017-03-053-5/+25
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Related #25174. `db:schema:load` doesn't work with subdirectories like previous `db:migrate:status`. `Migrator.migration_files` should be used in `assume_migrated_upto_version` to fix the issue.
* | | | | Fix a wrong pull request reference [ci skip]Robin Dupret2017-03-041-1/+1
| | | | |
* | | | | Add a changelog entry for #28284 [ci skip]Robin Dupret2017-03-041-0/+6
| |/ / / |/| | |
* | | | Merge pull request #25174 from kamipo-fix_db_migrate_statusAndrew White2017-03-044-24/+75
|\ \ \ \ | | | | | | | | | | | | | | | Fix `rake db:migrate:status` with subdirectories.
| * | | | Fix `rake db:migrate:status` with subdirectoriesRyuta Kamizono2017-03-044-24/+75
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `db:migrate` supports subdirectories and have a test. https://github.com/rails/rails/blob/v5.1.0.beta1/activerecord/test/cases/migrator_test.rb#L78-L85 But `db:migrate:status` doesn't work with subdirectories. It is due to `Dir.foreach(path)` is not the same with `Dir["#{path}/**/[0-9]*_*.rb"]`. I extracted `migration_files` and sharing it in the both to fix the issue. And added tests for `db:migrate:status`.
* | | | Merge pull request #28283 from ↵Andrew White2017-03-041-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | y-yagi/silence_puma_startup_messages_in_system_test Silence puma startup messages in system test
| * | | | Silence puma startup messages in system testyuuji.yaginuma2017-03-041-1/+1
| | |/ / | |/| | | | | | | | | | Fixes #28109
* | | | [ci skip] Add CHANGELOG entry for #28282Andrew White2017-03-041-0/+10
| | | |
* | | | Merge pull request #28282 from ↵Andrew White2017-03-042-7/+10
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | kamipo/dont_share_options_with_with_reference_type_column Don't share `options` with a reference type column
| * | | | Don't share `options` with a reference type columnRyuta Kamizono2017-03-042-7/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Sharing `options` causes some unexpected behavior. If `limit: 2` is specified, this means that 2 bytes integer for a reference id column and 2 chars string for a reference type column. Another example, if `unsigned: true` is specified, this means that unsigned integer for a reference id column, but a invalid option for a reference type column. So `options` should not be shared with a reference type column.
* | | | | Merge pull request #28284 from y-yagi/fix_system_test_exampleRobin Dupret2017-03-041-7/+9
|\ \ \ \ \ | |/ / / / |/| | | | Fx system test example [ci skip]
| * | | | Fx system test example [ci skip]yuuji.yaginuma2017-03-041-7/+9
| |/ / / | | | | | | | | | | | | | | | | | | | | Since test suffix is automatically granted, it is not necessary to specify it in generator. Also, updated the generated file to contents actually generated.
* | | | Escapes and edits to configuring guide [ci skip] (#28280)Vipul A M2017-03-041-5/+5
| | | |
* | | | A private method can't be called with `self.`Akira Matsuda2017-03-041-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | So calling `filename_with_extensions` omitting the second argument like this https://github.com/slim-template/slim-rails/blob/8dbc1fbf859ebfa95b0884a0196a6ad9f0ca9cd5/lib/generators/slim/scaffold/scaffold_generator.rb#L10 causes NoMethodError. fixes #28275
* | | | Merge pull request #28265 from 0oneo/association_guideRyuta Kamizono2017-03-041-1/+1
|\ \ \ \ | | | | | | | | | | passing unique parameter to belongs_to wrongly
| * | | | passing unique parameter to belongs_to wrongly0oneo2017-03-031-1/+1
| | | | | | | | | | | | | | | passing `unique` parameter to belongs_to not right,
* | | | | Merge pull request #28276 from rails/pkwipAaron Patterson2017-03-033-46/+78
|\ \ \ \ \ | |_|/ / / |/| | | | Various refactoring to association scopes and joins
| * | | | remove unused parametersAaron Patterson2017-03-031-6/+6
| | | | |
| * | | | `join_keys` no longer needs a class passed to itAaron Patterson2017-03-033-30/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reflections only use their own information to create a `join_keys` object. This means that we can call `join_keys` on a reflection object and have it be context-free.
| * | | | refactor so there is only one JoinKeys factory methodAaron Patterson2017-03-031-4/+15
| | | | |
| * | | | ask reflection for klass join reflectionAaron Patterson2017-03-032-13/+16
| | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-05 14:35:44 +0000