Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #10122 from wangjohn/adding_documentation_to_form_builder | Rafael Mendonça França | 2013-04-08 | 1 | -2/+55 |
|\ | | | | | | | | | Added documentation to the FormBuilder class Closes #10115 | ||||
| * | Added documentation to the FormBuilder class, should help | wangjohn | 2013-04-06 | 1 | -2/+55 |
| | | | | | | | | | | clarify issue #10115. Also made the field_helpers an explicit list of methods. | ||||
* | | Merge pull request #10130 from Agis-/patch-2 | Carlos Antonio da Silva | 2013-04-08 | 1 | -3/+3 |
|\ \ | | | | | | | Mark unused block parameters. | ||||
| * | | Remove unused block parameters | Agis Anastasopoulos | 2013-04-07 | 1 | -3/+3 |
| |/ | |||||
* / | Remove unecessary variable call, `#sort!` always returns an array | Agis Anastasopoulos | 2013-04-07 | 1 | -1/+0 |
|/ | |||||
* | Merge pull request #10101 from wangjohn/refactoring_routing_mapper | Andrew White | 2013-04-06 | 1 | -12/+13 |
|\ | | | | | Refactoring some reused code into a method (inside of the routes mapper) | ||||
| * | Refactoring some reused code into a method (inside of the routes | wangjohn | 2013-04-05 | 1 | -12/+13 |
| | | | | | | | | mapper) and adding a constant for all the possible scopes. | ||||
* | | change some more merge to merge! on new hashes | Vipul A M | 2013-04-06 | 1 | -3/+3 |
| | | |||||
* | | Remove extra whitespace | Agis Anastasopoulos | 2013-04-06 | 1 | -4/+4 |
| | | |||||
* | | Merge pull request #9555 from tmm1/optimize-erb | Rafael Mendonça França | 2013-04-05 | 2 | -3/+35 |
|\ \ | | | | | | | Optimize generated ERB to reduce method calls | ||||
| * | | avoid extra method calls for appending newlines | Aman Gupta | 2013-03-04 | 1 | -1/+27 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | before: ');@output_buffer.append= ( content_icon row[:content] );@output_buffer.safe_concat(' ');@output_buffer.safe_concat(' ');@output_buffer.append= ( spinner_img );@output_buffer.safe_concat(' ');@output_buffer.safe_concat(' </td> <td class="content"> ');@output_buffer.append= ( content_link row[:content] );@output_buffer.safe_concat(' ');@output_buffer.safe_concat(' </td> <td class="message"> '); after: ';@output_buffer.append=( content_icon row[:content] );@output_buffer.safe_append=' ';@output_buffer.append=( spinner_img );@output_buffer.safe_append=' </td> <td class="content"> ';@output_buffer.append=( content_link row[:content] );@output_buffer.safe_append=' </td> <td class="message"> '; | ||||
| * | | Use ActionView::OutputBuffer#safe_append= from templates | Aman Gupta | 2013-03-04 | 2 | -3/+9 |
| | | | |||||
* | | | Fix explicit names on multiple file fields | Ryan McGeary | 2013-04-05 | 1 | -8/+7 |
| |/ |/| | | | | | | | | | | | | | If a file field tag is passed the multiple option, it is turned into an array field (appending "[]"), but if the file field is passed an explicit name as an option, leave the name alone (do not append "[]"). Fixes #9830 | ||||
* | | 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 | 1 | -3/+3 |
| | | |||||
* | | Merge pull request #10065 from spohlenz/mail_to_block | Carlos Antonio da Silva | 2013-04-04 | 1 | -5/+16 |
|\ \ | | | | | | | Add block support for the mail_to helper | ||||
| * | | Add block support for the helper | Sam Pohlenz | 2013-04-03 | 1 | -5/+16 |
| | | | |||||
* | | | Merge pull request #9932 from senny/9913_routing_problem | Andrew White | 2013-04-03 | 1 | -8/+12 |
|\ \ \ | | | | | | | | | routing bugfixes when matching multiple paths | ||||
| * | | | routing shorthand syntax works with multiple paths | Yves Senn | 2013-03-26 | 1 | -5/+6 |
| | | | | | | | | | | | | | | | | | | | | | | | | 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 | 1 | -3/+6 |
| | | | | | | | | | | | | | | | | | | | | | | | | 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 | 1 | -1/+1 |
| |/ / |/| | | | | | | | | | | | | | | | | | 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 | ||||
* | | | Merge pull request #10061 from trevorturk/dummy-key-generator-rename | Santiago Pastorino | 2013-04-02 | 1 | -1/+1 |
|\ \ \ | | | | | | | | | Rename DummyKeyGenerator -> LegacyKeyGenerator | ||||
| * | | | Rename DummyKeyGenerator -> LegacyKeyGenerator | Trevor Turk | 2013-04-02 | 1 | -1/+1 |
| | | | | |||||
* | | | | :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 | 1 | -1/+1 |
|/ / / | |||||
* | | | Prefer find_by over dynamic finders in rdoc | Sam Ruby | 2013-04-02 | 3 | -4/+4 |
| | | | |||||
* | | | 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 | 3 | -76/+78 |
|\ \ \ | | | | | | | | | Cookie-base session store auto-upgrade | ||||
| * | | | Allow transparent upgrading of legacy signed cookies to encrypted cookies; ↵ | Trevor Turk | 2013-03-28 | 3 | -76/+78 |
| | | | | | | | | | | | | | | | | 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 | 1 | -1/+1 |
|\ \ \ \ | | | | | | | | | | | Revert grep to select since they are not the same | ||||
| * | | | | Revert grep to select since they are not the same | Brian McManus | 2013-03-27 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 #10015 from vipulnsward/remove_unused_variable_in_get | Steve Klabnik | 2013-03-31 | 1 | -1/+1 |
|\ \ \ \ \ | | | | | | | | | | | | | remove unused variable and assignment | ||||
| * | | | | | remove unused variable and assignment | Vipul A M | 2013-03-31 | 1 | -1/+1 |
| | | | | | | |||||
* | | | | | | 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 |
|/ / / / / | |||||
* | | | | | Fix typos in AP: "overriden" => "overridden" | Carlos Antonio da Silva | 2013-03-30 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | 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 |
| | | | | | |||||
| * | | | | 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 |
| | | | | |