Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Synced 4.2 release notes with the latest commits. | Godfrey Chan | 2014-07-11 | 1 | -1/+1 |
| | | | | | Also reordered some of the items to put newer ones on top (same order as CHANGELOGs), which makes it easier to diff while we are still working on it. | ||||
* | Fixed borken tests in AV caused by 013c74d | Godfrey Chan | 2014-07-10 | 1 | -2/+2 |
| | |||||
* | Include missing module in tag_helper | Carlos Antonio da Silva | 2014-07-09 | 1 | -0/+1 |
| | | | | | | | | | Since 6857415187810f1289068a448268264d0cf0844f we are using #safe_join to join the content when an Array is given, so we must include the dependent module here to make sure it's available when this module is used alone. This was making Simple Form tests to fail with current master due to the missing dependency. | ||||
* | Change back occurrences of SQLite(3) to sqlite3 when referring to the | Zachary Scott | 2014-07-06 | 1 | -1/+1 |
| | | | | adapter, fixed from #16057 [ci skip] | ||||
* | [ci skip] /sqlite/i --> SQLite | Akshay Vishnoi | 2014-07-06 | 2 | -3/+3 |
| | |||||
* | [ci skip] /javascript/ -> JavaScript - cover whole app | Akshay Vishnoi | 2014-07-04 | 1 | -2/+2 |
| | |||||
* | Add CHANGELOG for c803b90 | Godfrey Chan | 2014-07-02 | 1 | -0/+4 |
| | |||||
* | Fix escape_once double-escaping hex-encoded entities | John F. Douthat | 2014-07-02 | 2 | -0/+2 |
| | | | | (This is a manual merge of #9102) | ||||
* | Add CHANGELOG entry for #15214 | Rafael Mendonça França | 2014-06-30 | 1 | -0/+4 |
| | | | | Closes #15214 | ||||
* | Use if/else | Rafael Mendonça França | 2014-06-30 | 1 | -2/+5 |
| | | | | | Since we are using both branches of the code is preferable to use if/else over the early return. | ||||
* | Add String support for min/max attributes on DatetimeField | Todd Bealmear | 2014-06-30 | 3 | -2/+119 |
| | |||||
* | Tiny documentation fixes [ci skip] | Robin Dupret | 2014-06-29 | 1 | -1/+1 |
| | |||||
* | Rename options param of #time_ago_in_words to match API change | Max Kramer | 2014-06-28 | 1 | -2/+2 |
| | | | Rename `include_seconds_or_options` to `options` to match 6b9356a (which removed the deprecation introduced by #6077). This has no functional impact because the parameter is passed directly through, but makes it clearer that the parameter no longer supports a boolean as input. | ||||
* | Deal with regex match groups in excerpt | Gareth Rees | 2014-06-24 | 2 | -6/+6 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Original implementation has bugs if the regex contains a match group. Example: excerpt('This is a beautiful? morning', /\b(beau\w*)\b/i, :radius => 5) Expected: "...is a beautiful? mor..." Actual: "...is a beautifulbeaut..." The original phrase was being converted to a regex and returning the text either side of the phrase as expected: 'This is a beautiful? morning'.split(/beautiful/i, 2) # => ["This is a ", "? morning"] When we have a match with groups the match is returned in the array. Quoting the ruby docs: "If pattern is a Regexp, str is divided where the pattern matches. [...] If pattern contains groups, the respective matches will be returned in the array as well." 'This is a beautiful? morning'.split(/\b(beau\w*)\b/iu, 2) # => ["This is a ", "beautiful", "? morning"] If we assume we want to split on the first match – this fix makes that assumption – we can pass the already assigned `phrase` variable as the place to split (because we already know that a match exists from line 168). Originally spotted by Louise Crow (@crowbot) at https://github.com/mysociety/alaveteli/pull/1557 | ||||
* | Merge pull request #15732 from kuldeepaggarwal/correct-assets-ouput | Rafael Mendonça França | 2014-06-23 | 2 | -15/+15 |
|\ | | | | | [ci skip] correct output for asset_helper methods | ||||
| * | [ci skip] correct output for asset_helper methods | Kuldeep Aggarwal | 2014-06-16 | 2 | -15/+15 |
| | | | | | | | | see cc255d3 | ||||
* | | Merge pull request #15450 from aditya-kapoor/remove-nbsp-debug | Rafael Mendonça França | 2014-06-19 | 2 | -7/+7 |
|\ \ | | | | | | | remove unnecessary gsub for space in ActionView::Helpers#debug | ||||
| * | | remove unnecessary substitution for space in ActionView::Helpers#debug | Aditya Kapoor | 2014-06-14 | 2 | -7/+7 |
| | | | |||||
* | | | 'TextHelper#highlight' now accepts a block to highlight the matched words. | Lucas Mazza | 2014-06-19 | 3 | -3/+30 |
| | | | | | | | | | | | | | | | | | | | | | | | | The helper will yield each matched word, and you can use this instead of the ':highlighter' option for more complex replacing logic: highlight('My email is me@work.com', EMAIL_REGEXP) { |m| mail_to(m) } # => 'My email is <a href="mailto:me@work.com">me@work.com</a>' | ||||
* | | | highlight() now accepts regular expressions as well. | Jan Szumiec | 2014-06-19 | 2 | -5/+15 |
| | | | |||||
* | | | excerpt() now accepts regular expression instances as phrases. | Jan Szumiec | 2014-06-19 | 2 | -3/+9 |
| | | | |||||
* | | | Merge pull request #15709 from zuhao/refactor_actionview_compiled_templates_test | Yves Senn | 2014-06-18 | 1 | -8/+1 |
|\ \ \ | | | | | | | | | Move cleanup into teardown, delete obsolete code. | ||||
| * | | | Move cleanup into teardown, delete obsolete code. | Zuhao Wan | 2014-06-14 | 1 | -8/+1 |
| | | | | |||||
* | | | | [ci skip] /javascript/ ~> JavaScript | Aditya Kapoor | 2014-06-17 | 1 | -1/+1 |
| | | | | |||||
* | | | | reload I18n as we are defining `:ts` locale | Kuldeep Aggarwal | 2014-06-15 | 1 | -0/+2 |
| |_|/ |/| | | | | | | | | fix build- see https://travis-ci.org/rails/rails/jobs/27578159#L2913. | ||||
* | | | Merge pull request #15715 from ↵ | Yves Senn | 2014-06-14 | 3 | -4/+11 |
|\ \ \ | |_|/ |/| | | | | | | | | | | | zuhao/refactor_actionview_cleanup_I18n_translations Clean up I18n stored translations after test. | ||||
| * | | Clean up I18n stored translations after test. | Zuhao Wan | 2014-06-14 | 3 | -4/+12 |
| | | | |||||
* | | | Merge pull request #15712 from zuhao/refactor_actionview_javascript_helper_test | Yves Senn | 2014-06-14 | 1 | -3/+3 |
|\ \ \ | |/ / |/| | | Avoid hard-coded value in test setup and teardown. | ||||
| * | | Avoid hard-coded value in test setup and teardown. | Zuhao Wan | 2014-06-14 | 1 | -3/+3 |
| |/ | |||||
* / | Make sure restoration always happen. | Zuhao Wan | 2014-06-14 | 1 | -0/+1 |
|/ | |||||
* | Merge pull request #15693 from pdg137/enforce_utf8 | Matthew Draper | 2014-06-14 | 3 | -7/+7 |
|\ | | | | | | | In actionview, eliminate calls to tag that use html_safe parameter values. | ||||
| * | In actionview, eliminate calls to tag that use html_safe parameter values. ↵ | Paul Grayson | 2014-06-13 | 3 | -8/+7 |
|/ | | | | This is generally unnecessary, since tag handles string quoting, except in one case (utf8_enforcer_tag) where we want to specify the encoding ourselves. | ||||
* | Builder source code is still available on github [ci skip] | Zachary Scott | 2014-06-13 | 1 | -0/+3 |
| | | | | This was also removed from #15542 | ||||
* | Merge pull request #15654 from pdg137/master | Matthew Draper | 2014-06-13 | 5 | -7/+51 |
|\ | | | | | | | In tag helper, honor html_safe on arrays; also make safe_join more similar to Array.join | ||||
| * | In tag helper, honor html_safe on array parameters; also make safe_join more ↵ | Paul Grayson | 2014-06-12 | 4 | -8/+51 |
| | | | | | | | | similar to Array.join by first calling flatten. | ||||
* | | Merge pull request #15590 from ↵ | Yves Senn | 2014-06-12 | 5 | -14/+62 |
|\ \ | |/ |/| | | | | | | | | | | | | | zuhao/refactor_actionview_register_template_handler Add unregister_template_handler to prevent leaks. Conflicts: actionview/CHANGELOG.md | ||||
| * | Add unregister_template_handler to prevent leaks. | Zuhao Wan | 2014-06-12 | 6 | -14/+62 |
| | | |||||
* | | [ci skip] Fix doc for javascript_helper | Aditya Kapoor | 2014-06-11 | 1 | -1/+7 |
| | | |||||
* | | [ci skip] Add Docs for strip_insignificant_zeros option in number helpers | Akshay Vishnoi | 2014-06-10 | 1 | -10/+8 |
| | | |||||
* | | [ci skip] Correct output and use valid options of number helpers | Akshay Vishnoi | 2014-06-10 | 1 | -2/+2 |
| | | |||||
* | | Fix cache_digest rake tasks | Jiri Pospisil | 2014-06-10 | 2 | -6/+14 |
|/ | | | | | Bring cache_digests:* rake tasks up-to-date with the API changes introduced in 637bb726cac60aaa1f7e482836458aa73e17fbb7 | ||||
* | Merge pull request #15542 from Gaurav2728/gaurav-remove_shutdown_link | Arthur Nogueira Neves | 2014-06-06 | 1 | -2/+0 |
|\ | | | | | remove rubyforge.org that was shut down [ci skip] | ||||
| * | remove rubyforge.org that was shut down [ci skip] | Gaurav Sharma | 2014-06-06 | 1 | -2/+0 |
| | | |||||
* | | Unwrap another html_escape | Matthew Draper | 2014-06-07 | 1 | -2/+2 |
| | | | | | | | | /cc @tenderlove | ||||
* | | eliminate more wasteful allocations | Aaron Patterson | 2014-06-06 | 1 | -2/+2 |
|/ | |||||
* | Merge pull request #15513 from zenspider/remove_flush_output_buffer | Aaron Patterson | 2014-06-05 | 3 | -91/+0 |
|\ | | | | | Removed CaptureHelper#flush_output_buffer as it is only used in tests. | ||||
| * | Removed CaptureHelper#flush_output_buffer as it is only used in tests. | Ryan Davis | 2014-06-04 | 3 | -91/+0 |
| | | | | | | | | reviewed: @tenderlove | ||||
* | | document include_blank's usage with a string [ci skip] | Greg Molnar | 2014-06-05 | 1 | -1/+4 |
| | | |||||
* | | Revert "Correct Documentation for asset_tag_helpers" | Rafael Mendonça França | 2014-06-04 | 1 | -17/+16 |
|/ | | | | | | | | | | This reverts commit c22a253d1a72602331db1eba3e91bc945eff2346. Reason: Our documentation assumes the assets are in the proper place and we are using the default Rails stack. With the default Rails stack and the assets being in the correct place the assets helpers uses the `/assets` prefix. | ||||
* | call `capture` fewer times from `form_for` | Aaron Patterson | 2014-06-02 | 2 | -4/+4 |
| |