Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | Refactor mail_to to not generate intermediate hashes when adding href | Carlos Antonio da Silva | 2013-04-04 | 1 | -5/+6 | |
| | | | | | | | | | | | | | | | | | | | | | | | | There's no need to use Hash#merge with a new hash just for setting the href option to pass it through. Since we're always dealing with a new html_options hash, we're free to just set the value instead. | |||||
* | | | | Ensure mail_to helper does not modify the given html options hash | Carlos Antonio da Silva | 2013-04-04 | 2 | -4/+10 | |
| | | | | ||||||
* | | | | Merge pull request #10065 from spohlenz/mail_to_block | Carlos Antonio da Silva | 2013-04-04 | 3 | -5/+30 | |
|\ \ \ \ | | | | | | | | | | | Add block support for the mail_to helper | |||||
| * | | | | Add block support for the helper | Sam Pohlenz | 2013-04-03 | 3 | -5/+30 | |
| | | | | | ||||||
* | | | | | Fix typo in view name | Carlos Antonio da Silva | 2013-04-03 | 2 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | Introduced in 2c22376fe04b89e8f34620139720b85a85ce3428 | |||||
* | | | | | Merge pull request #10074 from ↵ | Rafael Mendonça França | 2013-04-03 | 4 | -4/+0 | |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | trevorturk/remove-fixme-comments-about-legacy-key-generator Remove comments about removing LegacyKeyGenerator in 4.1 | |||||
| * | | | | | Remove comments about removing LegacyKeyGenerator in 4.1 | Trevor Turk | 2013-04-03 | 4 | -4/+0 | |
| | | | | | | ||||||
* | | | | | | Merge pull request #9932 from senny/9913_routing_problem | Andrew White | 2013-04-03 | 2 | -8/+41 | |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | routing bugfixes when matching multiple paths | |||||
| * | | | | | | routing shorthand syntax works with multiple paths | Yves Senn | 2013-03-26 | 2 | -5/+20 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #9913. We need to expand the match shorthand syntax for every path. | |||||
| * | | | | | | bugfix, when matching multiple paths with `get`, `post`, ... | Yves Senn | 2013-03-26 | 2 | -3/+21 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This problem was introduced with: https://github.com/rails/rails/commit/d03aa104e069be4e301efa8cefb90a2a785a7bff | |||||
* | | | | | | | fix regression in Mapper when `format:` was used in a `scope`. | Yves Senn | 2013-04-03 | 2 | -1/+23 | |
| |_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #10071 `#normalize_path!` depends on the options so we need to call `#normalize_options!` first to make sure everything is set correctly. | |||||
* | | | | | | Fix grammatical error on JS helper warning message | thenickcox | 2013-04-02 | 1 | -2/+2 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add changelog entry Delete changelog | |||||
* | | | | | | Getting rid of a few other vestiges of rails.png. | Steve Klabnik | 2013-04-02 | 1 | -0/+0 | |
| |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We don't actually need a rails.png in the AP fixtures, the tests that use it don't actually try to load the file. We also don't need to get rid of it with the dummy reset either. Finally, it's not needed in the sample application that's included with the Rails Guides. | |||||
* | | | | | Merge pull request #10061 from trevorturk/dummy-key-generator-rename | Santiago Pastorino | 2013-04-02 | 5 | -13/+13 | |
|\ \ \ \ \ | | | | | | | | | | | | | Rename DummyKeyGenerator -> LegacyKeyGenerator | |||||
| * | | | | | Rename DummyKeyGenerator -> LegacyKeyGenerator | Trevor Turk | 2013-04-02 | 5 | -13/+13 | |
| | | | | | | ||||||
* | | | | | | :scissors: spacing after private | Trevor Turk | 2013-04-02 | 1 | -3/+0 | |
| | | | | | | ||||||
* | | | | | | Be consistent when talking about cookies, key -> name | Trevor Turk | 2013-04-02 | 1 | -25/+25 | |
| | | | | | | ||||||
* | | | | | | Fix permanent cookie jar accessor typo | Trevor Turk | 2013-04-02 | 2 | -2/+7 | |
|/ / / / / | ||||||
* | | | | | Merge pull request #10054 from rubys/use_find_by_in_rdoc | Santiago Pastorino | 2013-04-02 | 3 | -4/+4 | |
|\ \ \ \ \ | | | | | | | | | | | | | Prefer find_by over dynamic finders in rdoc | |||||
| * | | | | | Prefer find_by over dynamic finders in rdoc | Sam Ruby | 2013-04-02 | 3 | -4/+4 | |
| | | | | | | ||||||
* | | | | | | each_with_index => each as we dont use index | Vipul A M | 2013-04-03 | 1 | -1/+1 | |
|/ / / / / | ||||||
* | | | | | Fixed typo on AP dispatch Mime::Type test | KalabiYau | 2013-04-01 | 1 | -1/+1 | |
| | | | | | ||||||
* | | | | | Improve documentation around the cookie store auto-upgrade to encryption | Trevor Turk | 2013-04-01 | 1 | -22/+37 | |
| | | | | | ||||||
* | | | | | Merge pull request #9978 from trevorturk/cookie-store-auto-upgrade | Santiago Pastorino | 2013-04-01 | 5 | -78/+162 | |
|\ \ \ \ \ | | | | | | | | | | | | | Cookie-base session store auto-upgrade | |||||
| * | | | | | Allow transparent upgrading of legacy signed cookies to encrypted cookies; ↵ | Trevor Turk | 2013-03-28 | 5 | -78/+162 | |
| | | | | | | | | | | | | | | | | | | | | | | | | Automatically configure cookie-based sessions to use the best cookie jar given the app's config | |||||
* | | | | | | typo recomend -> recommend | ogawaso | 2013-04-01 | 1 | -2/+2 | |
| | | | | | | ||||||
* | | | | | | Merge pull request #9680 from bdmac/time-zone-options-revert-grep-to-select | Carlos Antonio da Silva | 2013-03-31 | 2 | -4/+23 | |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Revert grep to select since they are not the same | |||||
| * | | | | | | Add regression test for TZ grep | Brian McManus | 2013-03-27 | 1 | -0/+20 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added a regression test that will fail if anyone tries to change time_zone_select to use grep again thinking it will work when it does not. | |||||
| * | | | | | | Revert grep to select since they are not the same | Brian McManus | 2013-03-27 | 2 | -4/+3 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A previous commit swapped out a call to select for a call to grep in time_zone_options_for_select. This behavior actually causes the regexp priority option to stop working. ActiveSupport::TimeZone overrides the =~ operator which is what the select block was using previously. Enumerable#grep checks pattern === element and in this case that would be /US/ === ActiveSupport::TimeZone which does not work because ActiveSupport::TimeZone does not supply an implicit converting to_str method, only an explicit to_s method. It would be impossible to provide a to_str method that behaves identically to the =~ method provided on ActiveSupport::TimeZone so the only option is to revert back to using select with =~. | |||||
* | | | | | | | Merge pull request #10013 from vipulnsward/fix_request_method_test | Santiago Pastorino | 2013-03-31 | 1 | -6/+2 | |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | fix request methods test | |||||
| * | | | | | | | fix request methods test | Vipul A M | 2013-03-31 | 1 | -6/+2 | |
| | | | | | | | | ||||||
* | | | | | | | | Merge pull request #10015 from vipulnsward/remove_unused_variable_in_get | Steve Klabnik | 2013-03-31 | 2 | -2/+2 | |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | remove unused variable and assignment | |||||
| * | | | | | | | | remove unused variable and assignment | Vipul A M | 2013-03-31 | 2 | -2/+2 | |
| |/ / / / / / / | ||||||
* | | | | | | | | Merge pull request #10014 from vipulnsward/remove_unused_match_var | Steve Klabnik | 2013-03-31 | 1 | -8/+8 | |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | remove unused match variables in selector | |||||
| * | | | | | | | | remove unused match variables in selector | Vipul A M | 2013-03-31 | 1 | -8/+8 | |
| |/ / / / / / / | ||||||
* / / / / / / / | fix wrong argument error message | Vipul A M | 2013-03-31 | 1 | -1/+1 | |
|/ / / / / / / | ||||||
* | | | | | | | Improve AP changelog entry about layout method with nil return | Carlos Antonio da Silva | 2013-03-30 | 1 | -4/+4 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a note about getting the "no layout" behavior by returning "false" to make it easier for people that might need to change their code. Related to #8458. [ci skip] | |||||
* | | | | | | | Fix typos in AP: "overriden" => "overridden" | Carlos Antonio da Silva | 2013-03-30 | 5 | -36/+36 | |
| |_|_|_|_|/ |/| | | | | | ||||||
* | | | | | | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2013-03-30 | 6 | -84/+32 | |
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb activerecord/test/cases/adapter_test.rb guides/source/testing.md [ci skip] | |||||
| * | | | | | Fix typo | Carson McDonald | 2013-03-26 | 1 | -1/+1 | |
| | | | | | | ||||||
| * | | | | | Reverted code change introduced in d45145acdc576e46a1f1719d69bec96b5bf07b0a | Prathamesh Sonpatki | 2013-03-24 | 2 | -2/+2 | |
| | | | | | | ||||||
| * | | | | | Changed 'args' to 'arguments' when used in places other than code with ↵ | Prathamesh Sonpatki | 2013-03-24 | 2 | -2/+2 | |
| | | | | | | | | | | | | | | | | | | | | | | | | fixing few more typos | |||||
| * | | | | | Remove duplicated accepts_nested_attributes description | ma2gedev | 2013-03-22 | 1 | -16/+0 | |
| | | | | | | | | | | | | | | | | | | | | | | | | there are just the same description about accepts_nested_attributes [ci skip] | |||||
| * | | | | | Undo bad change in cf0931166be13dbbe660 | Steve Klabnik | 2013-03-19 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | I didn't know that this was about RDoc! | |||||
| * | | | | | Fixed small typos | Prathamesh Sonpatki | 2013-03-19 | 2 | -2/+2 | |
| | | | | | | ||||||
| * | | | | | The HTTP method helpers are preferred over match and should be explained ↵ | Trevor Turk | 2013-03-18 | 1 | -28/+16 | |
| | | | | | | | | | | | | | | | | | | | | | | | | before named routes | |||||
| * | | | | | The default route has been removed | Trevor Turk | 2013-03-18 | 1 | -24/+0 | |
| | | | | | | ||||||
| * | | | | | Using match without via is deprecated | Trevor Turk | 2013-03-18 | 1 | -12/+12 | |
| | | | | | | ||||||
| * | | | | | Capitalize the first letter of sentence | Tatsuro Baba | 2013-03-18 | 1 | -1/+1 | |
| | | | | | | ||||||
| * | | | | | Remove :all from *args options in AbstractController.helper | Bryan Ricker | 2013-03-16 | 1 | -1/+1 | |
| | | | | | |