aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | Merge pull request #27572 from matthewd/prerelease-specifierMatthew Draper2017-02-232-10/+9
|\ \ \ | | | | | | | | Simplify the version specifier generated by prereleases
| * | | Simplify the version specifier generated by prereleasesMatthew Draper2017-01-052-10/+9
| | | | | | | | | | | | | | | | | | | | "~> 1.2.3.pre4" will automatically allow "1.2.4" -- no need for an explicit range.
* | | | Add more missing requiresAndrew White2017-02-222-0/+2
| | | | | | | | | | | | | | | | Further missing requires for Timeout exposed due to Bundler 1.14.5
* | | | Bump removal of `/:controller/:action` to Rails 5.2Andrew White2017-02-221-2/+2
| | | |
* | | | Add missing requiresAndrew White2017-02-221-0/+4
| | | | | | | | | | | | | | | | | | | | Bundler 1.14.5 moved to lazily loading 'rubygems/spec_fetcher' which revealed some missing requires from the JSON encoding test file.
* | | | Add CHANGELOG entry for #28104Andrew White2017-02-221-0/+4
| | | |
* | | | Merge pull request #28104 from ↵Andrew White2017-02-222-1/+3
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | HashNotAdam/fix/preload_instance_variables_in_freeze Preload to_datetime before freezing a TimeWithZone instance
| * | | Preload to_datetime before freezing a TimeWithZone instanceAdam Rice2017-02-222-1/+3
| | | |
* | | | Merge pull request #28103 from y-yagi/remove_needless_extensionJon Moss2017-02-211-1/+1
|\ \ \ \ | | | | | | | | | | remove needless extension from system test example [ci skip]
| * | | | remove needless extension from system test example [ci skip]yuuji.yaginuma2017-02-221-1/+1
|/ / / /
* | | | Merge pull request #28100 from fernandes/patch-1Jon Moss2017-02-211-1/+1
|\ \ \ \ | |/ / / |/| | | [doc] Fix wrong class name in testing.md
| * | | [doc] Fix wrong class name in testing.mdCelso Fernandes2017-02-211-1/+1
|/ / / | | | | | | | | | As the specified command is `rails g system_test articles`, the generated class name is `ArticlesTest`, not `UsersTest`
* | | Merge pull request #28095 from matthewd/nested-database-configMatthew Draper2017-02-222-0/+69
|\ \ \ | | | | | | | | Allow 3-level DB configs to group connections by environment
| * | | Allow 3-level DB configs to group connections by environmentMatthew Draper2017-02-222-0/+69
| | | | | | | | | | | | | | | | [Arthur Nogueira Neves & Matthew Draper]
* | | | Merge pull request #28042 from kamipo/add_changelog_for_27384Rafael França2017-02-212-4/+8
|\ \ \ \ | | | | | | | | | | Add CHANGELOG entry for #27384 and #27762
| * | | | Add CHANGELOG entry for #27384 and #27762Ryuta Kamizono2017-02-172-4/+8
| | | | |
* | | | | [ci skip] Fix direct/resolve documentation.Kasper Timm Hansen2017-02-211-11/+11
| | | | | | | | | | | | | | | | | | | | Use double quoted strings, come down hard on some typos.
* | | | | [ci skip] Fix typos in direct/resolve changelog.Kasper Timm Hansen2017-02-211-2/+2
| | | | |
* | | | | Merge pull request #23138 from rails/custom-url-helpers-and-polymorphic-urlsAndrew White2017-02-218-16/+787
|\ \ \ \ \ | | | | | | | | | | | | Implement custom url helpers and polymorphic mapping
| * | | | | Fix schema leakage from dirty_test.rbAndrew White2017-02-211-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The column information for the testings table was being cached so clear the cache in the test teardown.
| * | | | | Split direct method into twoAndrew White2017-02-215-113/+159
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use a separate method called `resolve` for the custom polymorphic mapping to clarify the API.
| * | | | | Push option extract into call methodAndrew White2017-02-212-8/+7
| | | | | |
| * | | | | Fix typo in exception messageAndrew White2017-02-211-1/+1
| | | | | |
| * | | | | Removed `model_name` method to prevent warningAndrew White2017-02-211-0/+1
| | | | | |
| * | | | | Prefer remove_method over undef_methodAndrew White2017-02-213-4/+69
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Using `undef_method` means that when a route is removed any other implementations of that method in the ancestor chain are inaccessible so instead use `remove_method` which restores access to the ancestor.
| * | | | | Support mapping of non-model classesAndrew White2017-02-212-3/+33
| | | | | |
| * | | | | Raise an error if `direct` is inside a scope blockAndrew White2017-02-212-3/+26
| | | | | |
| * | | | | Add CHANGELOG entry for `direct` methodAndrew White2017-02-211-0/+39
| | | | | |
| * | | | | Add custom polymorphic mappingAndrew White2017-02-216-65/+314
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow the use of `direct` to specify custom mappings for polymorphic_url, e.g: resource :basket direct(class: "Basket") { [:basket] } This will then generate the following: >> link_to "Basket", @basket => <a href="/basket">Basket</a> More importantly it will generate the correct url when used with `form_for`. Fixes #1769.
| * | | | | Add test for calling a url helper in Mapper#directAndrew White2017-02-211-0/+7
| | | | | |
| * | | | | Don't allocate a hash unnecessarilyAndrew White2017-02-212-2/+6
| | | | | |
| * | | | | Only accept symbols and strings for Mapper#directAndrew White2017-02-212-1/+23
| | | | | |
| * | | | | Rename url_helper to directAndrew White2017-02-213-23/+23
| | | | | |
| * | | | | Add support for defining custom url helpers in routes.rbAndrew White2017-02-214-2/+270
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow the definition of custom url helpers that will be available automatically wherever standard url helpers are available. The current solution is to create helper methods in ApplicationHelper or some other helper module and this isn't a great solution since the url helper module can be called directly or included in another class which doesn't include the normal helper modules. Reference #22512.
| * | | | | Wrap routes.url_helpers.url_for via a proxyAndrew White2017-02-211-4/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The singleton url_for on Rails.application.routes.url_helpers isn't the same as the url_for you get when you include the module in your class as the latter has support for polymorphic style routes, etc. whereas the former accepts only a hash and is the underlying implementation defined on ActionDispatch::Routing::RouteSet. This commit changes the singleton method to call through a proxy instance so that it gets the full range of features specified in the documentation for url_for.
* | | | | | Add backticks around method namesJon Moss2017-02-211-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | Remove extra spacesJon Moss2017-02-211-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | Add backticks around commandJon Moss2017-02-211-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | Use released arelRafael Mendonça França2017-02-218-16/+2
| | | | | |
* | | | | | Add backticks around constantJon Moss2017-02-211-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | Revert back to the original of using package.json in the root of the project ↵David Heinemeier Hansson2017-02-217-13/+13
| | | | | | | | | | | | | | | | | | | | | | | | (#28093)
* | | | | | Only load SystemTestCase if Capybara is definedeileencodes2017-02-211-5/+10
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For applications that are upgrading or applications that are choosing to skip system testing Capbyara will not be available. SystemTestCase and friends shoud only be loaded if Capbyara is defined. Fixes #28094
* | / / / Tiny documentation edits [ci skip]Robin Dupret2017-02-212-17/+12
| |/ / / |/| | |
* | | | Merge pull request #28092 from ↵Guillermo Iguaran2017-02-212-1/+8
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | sikachu/fix-define_attribute_method-with-symbol-in-ar Fix `define_attribute_method` with Symbol in AR
| * | | | Fix `define_attribute_method` with Symbol in ARPrem Sichanugrist2017-02-212-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This issue is only appear when you try to call `define_attribute_method` and passing a symbol in Active Record. It does not appear in isolation in Active Model itself. Before this patch, when you run `User.define_attribute_method :foo`, you will get: NoMethodError: undefined method `unpack' for :foo:Symbol from activerecord/lib/active_record/attribute_methods/read.rb:28:in `define_method_attribute' from activerecord/lib/active_record/attribute_methods/primary_key.rb:61:in `define_method_attribute' from activemodel/lib/active_model/attribute_methods.rb:292:in `block in define_attribute_method' from activemodel/lib/active_model/attribute_methods.rb:285:in `each' from activemodel/lib/active_model/attribute_methods.rb:285:in `define_attribute_method' This patch contains both a fix in Active Model and a test in Active Record for this error.
* | | | | Merge pull request #28088 from y-yagi/do_not_generate_templates_to_api_docGuillermo Iguaran2017-02-211-1/+1
|\ \ \ \ \ | |/ / / / |/| | | | Do not display template files on API doc [ci skip]
| * | | | Do not display template files on API doc [ci skip]yuuji.yaginuma2017-02-211-1/+1
| | | | |
* | | | | Fix run_via[]= backwards compatibility.Kasper Timm Hansen2017-02-212-1/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ``` Minitest.run_via[:rails] = true ``` 👆 would break because a simple alias won't catch the second true argument there.
* | | | | Merge pull request #28055 from robertomiranda/patch-3Guillermo Iguaran2017-02-212-2/+2
|\ \ \ \ \ | | | | | | | | | | | | Use Puma 3.7
| * | | | | Use Puma 3.7.xRoberto Miranda2017-02-202-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | ref this commit seems that has not been merged into 3.7 https://github.com/puma/puma/commit/42bec4600c51ab8a1c1ee5a0e1b738a4ffd82bf2