aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Revert "Revert "Add encrypted secrets""Kasper Timm Hansen2017-02-2317-27/+482
|
* Merge pull request #28125 from y-yagi/do_not_take_screenshots_when_test_skippedEileen M. Uchitelle2017-02-232-2/+16
|\ | | | | Do not take screenshot when test skipped
| * Do not take screenshot when test skippedyuuji.yaginuma2017-02-232-2/+16
| |
* | Revert "Add encrypted secrets" (#28127)David Heinemeier Hansson2017-02-2317-482/+27
| |
* | Add encrypted secrets (#28038)Kasper Timm Hansen2017-02-2317-27/+482
|/
* [ci skip] Fix more quotes in direct/resolve docsAndrew White2017-02-231-3/+3
| | | | Also correct use of `direct class:` to `resolve` in example.
* Merge pull request #23553 from ↵Rafael França2017-02-2210-5/+80
|\ | | | | | | | | kamipo/correctly_dump_native_timestamp_types_for_mysql Correctly dump native timestamp types for MySQL
| * Correctly dump native timestamp types for MySQLRyuta Kamizono2017-02-2310-5/+80
|/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The native timestamp type in MySQL is different from datetime type. Internal representation of the timestamp type is UNIX time, This means that timestamp columns are affected by time zone. ``` > SET time_zone = '+00:00'; Query OK, 0 rows affected (0.00 sec) > INSERT INTO time_with_zone(ts,dt) VALUES (NOW(),NOW()); Query OK, 1 row affected (0.02 sec) > SELECT * FROM time_with_zone; +---------------------+---------------------+ | ts | dt | +---------------------+---------------------+ | 2016-02-07 22:11:44 | 2016-02-07 22:11:44 | +---------------------+---------------------+ 1 row in set (0.00 sec) > SET time_zone = '-08:00'; Query OK, 0 rows affected (0.00 sec) > SELECT * FROM time_with_zone; +---------------------+---------------------+ | ts | dt | +---------------------+---------------------+ | 2016-02-07 14:11:44 | 2016-02-07 22:11:44 | +---------------------+---------------------+ 1 row in set (0.00 sec) ```
* Merge pull request #28114 from matthewd/deprecated-evented-redisMatthew Draper2017-02-232-1/+9
|\ | | | | Deprecate the EventedRedis subscription adapter
| * Deprecate the EventedRedis subscription adapterMatthew Draper2017-02-232-1/+9
|/ | | | | Unlike Faye support, it seems a bit too documented to remove without warning. So, here's a warning.
* Clarify use of params in `direct`Andrew White2017-02-222-0/+23
| | | | | | | | | Since a `direct` url helper block is evaluated using `instance_exec` then methods that are available in the instance context can be accessed, e.g. the params object in a controller action or view. This wasn't clear from the example so expand on that point and add a test case for this situation.
* Merge pull request #28098 from rails/rails-ujs-intergrationRafael França2017-02-2213-70/+407
|\ | | | | Better integrate rails-ujs in our repository
| * Test rails-ujs in our travis matrixRafael Mendonça França2017-02-2211-70/+338
| |
| * Move rails-ujs README and LICENCE to actionviewRafael Mendonça França2017-02-222-0/+69
|/ | | | We are going to make rails/rails the official repository
* 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]
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-07 20:15:44 +0000