aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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.
* | | | Merge pull request #28482 from ↵Richard Schneeman2017-03-191-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | y-yagi/fix_changelog_entry_about_transaction_error_classes Fix changelog entry about transaction error classes [ci skip]
| * | | | Fix changelog entry about transaction error classes [ci skip]yuuji.yaginuma2017-03-201-1/+1
| | |/ / | |/| | | | | | | | | | | | | | `ActiveRecord::TransactionSerializationError` was introduces in #25093. However, refactored in #25107, `TransactionSerializationError` is gone.
* | | | Merge pull request #28475 from y-yagi/correctly_check_whether_key_is_definedMatthew Draper2017-03-203-4/+16
|\ \ \ \ | | | | | | | | | | Correctly check whether key is defined in configuration
| * | | | Correctly check whether key is defined in configurationyuuji.yaginuma2017-03-193-4/+16
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It can not check correctly with `defined?` ```ruby irb(main):001:0> Rails.application.config.active_record => {:maintain_test_schema=>true, :belongs_to_required_by_default=>true} irb(main):002:0> defined?(Rails.application.config.active_record) => nil ``` Follow up to #28469
* | | | Merge pull request #28477 from spdawson/patch-3Jon Moss2017-03-191-1/+1
|\ \ \ \ | | | | | | | | | | Remove stray back-end from ActiveJob Basics guide
| * | | | Remove stray back-end from ActiveJob Basics guideSimon Dawson2017-03-191-1/+1
| |/ / / | | | | | | | | The hyphenated form "back-end" only appears once in this guide; elsewhere, the un-hyphenated form "backend" is used consistently.
* | | | Merge pull request #28476 from spdawson/patch-2Jon Moss2017-03-191-13/+15
|\ \ \ \ | |/ / / |/| | | Minor grammar fixes for Rails 5.1 release notes
| * | | Minor grammar fixes for Rails 5.1 release notesSimon Dawson2017-03-191-13/+15
|/ / /
* | | Update some jquery-ujs references to rails-ujsJon Moss2017-03-183-10/+10
| | | | | | | | | | | | [ci skip]
* | | Add link to rails-ujs/dropping jQuery PRJon Moss2017-03-181-0/+2
| | | | | | | | | | | | [ci skip]
* | | Add link to Webpack/Webpacker PRJon Moss2017-03-181-0/+2
| | | | | | | | | | | | [ci skip]
* | | Second pass on 5.1 release notesJon Moss2017-03-181-5/+5
| | | | | | | | | | | | [ci skip]
* | | First pass on 5.1 release notesJon Moss2017-03-181-14/+18
| | | | | | | | | | | | | | | | | | Fixing tons of grammar, etc. [ci skip]
* | | Merge pull request #28446 from y-yagi/move_new_changelog_entry_to_the_topJon Moss2017-03-181-7/+7
|\ \ \ | | | | | | | | Move new CHANGELOG entry to the top [ci skip]
| * | | Move new CHANGELOG entry to the top [ci skip]yuuji.yaginuma2017-03-161-7/+7
| | | |
* | | | Merge pull request #28467 from baerjam/improve-caching-guidesJon Moss2017-03-181-1/+15
|\ \ \ \ | | | | | | | | | | Improve Caching with Rails Guides [ci skip]
| * | | | Improve Caching with Rails Guides [ci skip]James Baer2017-03-171-1/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds the "Caching in Development" section to demonstrate usage of the dev:cache task in development mode. Also, makes a small grammatical correction in section 2.4.
* | | | | Merge pull request #28469 from matthewd/new-new-defaultsMatthew Draper2017-03-197-59/+60
|\ \ \ \ \ | |_|_|/ / |/| | | | Track the version-compatible config settings inside railties
| * | | | Track the version-compatible config settings inside railtiesMatthew Draper2017-03-187-59/+60
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead of forcing new applications to carry an initializer that just switches things to what their default "should" be, we can handle it internally. The initializer is then only used by upgraders: it shows what the new default would be (commented out), while their upgraded application continues to operate as it did before. Under this model, a multiply-upgraded application could accumulate several new_framework_defaults_*.rb files, for each release series it has traversed. A given release series only needs to generate the latest, though, because we don't support `rails app:upgrade` while skipping releases.
* | | | | Always use original url_for when generating direct routesAndrew White2017-03-173-1/+55
| |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | Action View overrides `url_for` in the view context to render paths by default when using `url_for` and this means that direct route helpers don't get the full url when called with the url suffix. To fix this always call the original `url_for`.
* | | | Merge pull request #28191 from eugeneius/string_assoc_orderRafael França2017-03-172-2/+30
|\ \ \ \ | | | | | | | | | | Allow order to be given expressions as hash keys
| * | | | Allow order to be given expressions as hash keysEugene Kenny2017-02-272-2/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When `order` is given a hash, the keys are currently assumed to be attribute names and are quoted as such in the query, which makes it impossible to pass an expression instead: Post.order("LENGTH(title)" => :asc).last # SELECT `posts`.* FROM `posts` ORDER BY `posts`.`LENGTH(title)` DESC LIMIT 1 If the key is an `Arel::Nodes::SqlLiteral`, we now use it directly in the query. This provides a way to build a relation with a complex order clause that can still be reversed with `reverse_order` or `last`.
* | | | | Merge pull request #28154 from aripollak/remove-comments-from-structure-sqlRafael Mendonça França2017-03-173-3/+43
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | Drop comments from structure.sql in postgresql
| * | | | | Only remove comments before the first statementAri Pollak2017-02-242-7/+12
| | | | | |
| * | | | | Drop comments from structure.sql in postgresqlAri Pollak2017-02-243-3/+38
| | | | | | | | | | | | | | | | | | | | | | | | Fixes #28153.
* | | | | | Fix resolve usage in the release notesRafael Mendonça França2017-03-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | Merge pull request #28096 from prathamesh-sonpatki/5-1-release-notes-first-draftRafael França2017-03-171-0/+267
|\ \ \ \ \ \ | | | | | | | | | | | | | | Add first draft of release notes for Rails 5.1 :tada:
| * | | | | | Add blurbs about each new feature [ci skip]Prathamesh Sonpatki2017-03-131-0/+158
| | | | | | |
| * | | | | | Add PR links for major features [ci skip]Prathamesh Sonpatki2017-03-031-0/+11
| | | | | | |
| * | | | | | Add first draft of release notes for Rails 5.1 :tada:Prathamesh Sonpatki2017-03-031-0/+98
| | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | | uniq was deprecated and removed alreadyRafael Mendonça França2017-03-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was causing an infinity loop since it was delegating to `all` and all delegating back to this module.
* | | | | | | Add support for calling nested direct routes (#28462)Andrew White2017-03-174-32/+48
| |_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Not all requirements can be expressed in terms of polymorphic url options so add a `route_for` method that allows calling another direct route (or regular named route) which a set of arguments, e.g: resources :buckets direct :recordable do |recording| route_for(:bucket, recording.bucket) end direct :threadable do |threadable| route_for(:recordable, threadable.parent) end This maintains the context of the original caller, e.g. threadable_path(threadable) # => /buckets/1 threadable_url(threadable) # => http://example.com/buckets/1
* | | | | | Merge pull request #28341 from mtsmfm/pass-options-to-driven-byRafael França2017-03-173-4/+6
|\ \ \ \ \ \ | | | | | | | | | | | | | | Pass options to `driven_by`
| * | | | | | Pass options to `driven_by`Fumiaki MATSUSHIMA2017-03-133-4/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Capybara drivers can handle some options such like `url`. ### before ``` # test/test_helper.rb Capybara.register_driver :remote_chrome do |app| Capybara::Selenium::Driver.new(app, browser: :chrome, url: "http://example.com/wd/hub") end # test/application_system_test_case.rb class ApplicationSystemTestCase < ActionDispatch::SystemTestCase driven_by :remote_chrome end ``` ### after ``` # test/application_system_test_case.rb class ApplicationSystemTestCase < ActionDispatch::SystemTestCase driven_by :selenium, using: :chrome, screen_size: [1400, 1400], options: {url: "http://chrome:4444/wd/hub"} end ```
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-02 22:37:30 +0000