aboutsummaryrefslogtreecommitdiffstats
path: root/actionview
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #16175 from skorks/log_digestor_as_debugRafael Mendonça França2014-07-151-1/+1
|\ | | | | Log digest as :debug instead of :info
| * Log digest as :debug instead of :infoAlan Skorkin2014-07-151-1/+1
| |
* | Merge pull request #16161 from jpawlyn/masterAndrew White2014-07-153-1/+14
|\ \ | |/ |/| Fix empty host for an asset url when asset_host proc returns nil
| * Return an absolute instead of relative path from an asset url in the case of ↵Jolyon Pawlyn2014-07-153-1/+14
| | | | | | | | the `asset_host` proc returning nil
* | Fix typos like `a html` to `an html` and 'an mail' to 'an email'. [ci skip]Santosh Wadghule2014-07-141-1/+1
|/
* Assert the nature of the original exceptionMatthew Draper2014-07-121-0/+1
| | | | | | Just so it's clearer what's going on in the following assertion. /cc #11993 @robin850
* Merge pull request #11993 from razielgn/actionview-use-name-to-inspect-errorGuillermo Iguaran2014-07-111-1/+1
|\ | | | | Use NameError#name to assert raised error.
| * Use NameError#name to assert raised error.Federico Ravasio2013-11-241-1/+1
| | | | | | | | | | This makes the test compatible with other Ruby implementations, which may implement error messages differently.
* | Synced 4.2 release notes with the latest commits.Godfrey Chan2014-07-111-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 013c74dGodfrey Chan2014-07-101-2/+2
| |
* | Include missing module in tag_helperCarlos Antonio da Silva2014-07-091-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 theZachary Scott2014-07-061-1/+1
| | | | | | | | adapter, fixed from #16057 [ci skip]
* | [ci skip] /sqlite/i --> SQLiteAkshay Vishnoi2014-07-062-3/+3
| |
* | [ci skip] /javascript/ -> JavaScript - cover whole appAkshay Vishnoi2014-07-041-2/+2
| |
* | Add CHANGELOG for c803b90Godfrey Chan2014-07-021-0/+4
| |
* | Fix escape_once double-escaping hex-encoded entitiesJohn F. Douthat2014-07-022-0/+2
| | | | | | | | (This is a manual merge of #9102)
* | Add CHANGELOG entry for #15214Rafael Mendonça França2014-06-301-0/+4
| | | | | | | | Closes #15214
* | Use if/elseRafael Mendonça França2014-06-301-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 DatetimeFieldTodd Bealmear2014-06-303-2/+119
| |
* | Tiny documentation fixes [ci skip]Robin Dupret2014-06-291-1/+1
| |
* | Rename options param of #time_ago_in_words to match API changeMax Kramer2014-06-281-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 excerptGareth Rees2014-06-242-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-ouputRafael Mendonça França2014-06-232-15/+15
|\ \ | | | | | | [ci skip] correct output for asset_helper methods
| * | [ci skip] correct output for asset_helper methodsKuldeep Aggarwal2014-06-162-15/+15
| | | | | | | | | | | | see cc255d3
* | | Merge pull request #15450 from aditya-kapoor/remove-nbsp-debugRafael Mendonça França2014-06-192-7/+7
|\ \ \ | | | | | | | | remove unnecessary gsub for space in ActionView::Helpers#debug
| * | | remove unnecessary substitution for space in ActionView::Helpers#debugAditya Kapoor2014-06-142-7/+7
| | | |
* | | | 'TextHelper#highlight' now accepts a block to highlight the matched words.Lucas Mazza2014-06-193-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 Szumiec2014-06-192-5/+15
| | | |
* | | | excerpt() now accepts regular expression instances as phrases.Jan Szumiec2014-06-192-3/+9
| | | |
* | | | Merge pull request #15709 from zuhao/refactor_actionview_compiled_templates_testYves Senn2014-06-181-8/+1
|\ \ \ \ | | | | | | | | | | Move cleanup into teardown, delete obsolete code.
| * | | | Move cleanup into teardown, delete obsolete code.Zuhao Wan2014-06-141-8/+1
| | | | |
* | | | | [ci skip] /javascript/ ~> JavaScriptAditya Kapoor2014-06-171-1/+1
| | | | |
* | | | | reload I18n as we are defining `:ts` localeKuldeep Aggarwal2014-06-151-0/+2
| |_|/ / |/| | | | | | | | | | | fix build- see https://travis-ci.org/rails/rails/jobs/27578159#L2913.
* | | | Merge pull request #15715 from ↵Yves Senn2014-06-143-4/+11
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | | | | | zuhao/refactor_actionview_cleanup_I18n_translations Clean up I18n stored translations after test.
| * | | Clean up I18n stored translations after test.Zuhao Wan2014-06-143-4/+12
| | | |
* | | | Merge pull request #15712 from zuhao/refactor_actionview_javascript_helper_testYves Senn2014-06-141-3/+3
|\ \ \ \ | |/ / / |/| | | Avoid hard-coded value in test setup and teardown.
| * | | Avoid hard-coded value in test setup and teardown.Zuhao Wan2014-06-141-3/+3
| |/ /
* / / Make sure restoration always happen.Zuhao Wan2014-06-141-0/+1
|/ /
* | Merge pull request #15693 from pdg137/enforce_utf8Matthew Draper2014-06-143-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 Grayson2014-06-133-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 Scott2014-06-131-0/+3
| | | | | | | | This was also removed from #15542
* | Merge pull request #15654 from pdg137/masterMatthew Draper2014-06-135-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 Grayson2014-06-124-8/+51
| | | | | | | | | | | | similar to Array.join by first calling flatten.
* | | Merge pull request #15590 from ↵Yves Senn2014-06-125-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 Wan2014-06-126-14/+62
| | |
* | | [ci skip] Fix doc for javascript_helperAditya Kapoor2014-06-111-1/+7
| | |
* | | [ci skip] Add Docs for strip_insignificant_zeros option in number helpersAkshay Vishnoi2014-06-101-10/+8
| | |
* | | [ci skip] Correct output and use valid options of number helpersAkshay Vishnoi2014-06-101-2/+2
| | |
* | | Fix cache_digest rake tasksJiri Pospisil2014-06-102-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_linkArthur Nogueira Neves2014-06-061-2/+0
|\ \ | | | | | | remove rubyforge.org that was shut down [ci skip]
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-06 03:55:27 +0000