| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Assert the nature of the original exception | Matthew Draper | 2014-07-12 | 1 | -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-error | Guillermo Iguaran | 2014-07-11 | 1 | -1/+1 |
| |\ | | | | | Use NameError#name to assert raised error. | ||||
| | * | Use NameError#name to assert raised error. | Federico Ravasio | 2013-11-24 | 1 | -1/+1 |
| | | | | | | | | | | | This makes the test compatible with other Ruby implementations, which may implement error messages differently. | ||||
| * | | Fixed borken tests in AV caused by 013c74d | Godfrey Chan | 2014-07-10 | 1 | -2/+2 |
| | | | |||||
| * | | 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 | 1 | -1/+1 |
| | | | |||||
| * | | 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 String support for min/max attributes on DatetimeField | Todd Bealmear | 2014-06-30 | 1 | -0/+64 |
| | | | |||||
| * | | Deal with regex match groups in excerpt | Gareth Rees | 2014-06-24 | 1 | -5/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 #15450 from aditya-kapoor/remove-nbsp-debug | Rafael Mendonça França | 2014-06-19 | 1 | -1/+1 |
| |\ \ | | | | | | | remove unnecessary gsub for space in ActionView::Helpers#debug | ||||
| | * | | remove unnecessary substitution for space in ActionView::Helpers#debug | Aditya Kapoor | 2014-06-14 | 1 | -1/+1 |
| | | | | |||||
| * | | | 'TextHelper#highlight' now accepts a block to highlight the matched words. | Lucas Mazza | 2014-06-19 | 1 | -0/+7 |
| | | | | | | | | | | | | | | | | | | | | | | | | | 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 | 1 | -1/+9 |
| | | | | |||||
| * | | | excerpt() now accepts regular expression instances as phrases. | Jan Szumiec | 2014-06-19 | 1 | -0/+2 |
| | | | | |||||
| * | | | 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 |
| | | | | | |||||
| * | | | | 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 #15654 from pdg137/master | Matthew Draper | 2014-06-13 | 2 | -1/+32 |
| |\ \ | | | | | | | | | | 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 | 2 | -1/+32 |
| | | | | | | | | | | | | | similar to Array.join by first calling flatten. | ||||
| * | | | Merge pull request #15590 from ↵ | Yves Senn | 2014-06-12 | 3 | -14/+47 |
| |\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | | 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 | 4 | -14/+47 |
| |/ / | |||||
| * | | Removed CaptureHelper#flush_output_buffer as it is only used in tests. | Ryan Davis | 2014-06-04 | 2 | -82/+0 |
| | | | | | | | | | reviewed: @tenderlove | ||||
| * | | Fix AS::NumberHelper results with rationals | Juanjo Bazán | 2014-05-31 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | | | | | :precision was incorrectly being applied to Rationals before: ActiveSupport::NumberHelper.number_to_rounded Rational(10, 3), precision: 2 => "3.3" after: ActiveSupport::NumberHelper.number_to_rounded Rational(10, 3), precision: 2 => "3.33" | ||||
| * | | Merge pull request #15061 from tgxworld/remove_unnecessary_include | Matthew Draper | 2014-05-29 | 1 | -1/+0 |
| |\ \ | | | | | | | Remove unnecessary include for integration tests. | ||||
| | * | | Remove unnecessary include for integration tests. | Guo Xiang Tan | 2014-05-11 | 1 | -1/+0 |
| | | | | |||||
| * | | | Merge pull request #15021 from hubertlepicki/allow_custom_host_in_asset_url | Rafael Mendonça França | 2014-05-16 | 1 | -0/+15 |
| |\ \ \ | | | | | | | | | | | | | Allow custom asset host to be passed in asset_url | ||||
| | * | | | Allow custom asset host to be passed in asset_url | Hubert Łępicki | 2014-05-08 | 1 | -0/+15 |
| | | | | | |||||
| * | | | | Following documentation guideline | Rafael Mendonça França | 2014-05-14 | 1 | -4/+3 |
| | | | | | |||||
| * | | | | Merge remote-tracking branch 'apotonick/simplify-prefixes' | Rafael Mendonça França | 2014-05-14 | 1 | -0/+49 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | This is the rebased version of #15026 Closes #15026 | ||||
| | * | | | | deprecate AbC:Base::parent_prefixes. | Nick Sutterer | 2014-05-13 | 1 | -0/+49 |
| | | |/ / | |/| | | | | | | | | | | | | | | | | | | rename ::_local_prefixes to ::local_prefixes to state the public attribute. document the latter. make ::local_prefixes private, test overriding it and remove documentation for overriding ::_parent_prefixes. | ||||
| * | | | | minor: point to the right test suite location | azul | 2014-05-14 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Fix assertion order and :scissors: extra spaces | Carlos Antonio da Silva | 2014-05-13 | 1 | -2/+2 |
| | | | | | |||||
| * | | | | Merge pull request #15068 from josepjaume/patch-1 | Aaron Patterson | 2014-05-13 | 1 | -0/+6 |
| |\ \ \ \ | | | | | | | | | | | Dup options hash to prevent modifications | ||||
| | * | | | | Dup options hash to prevent modifications | Josep Jaume Rey | 2014-05-13 | 1 | -0/+6 |
| | |/ / / | | | | | | | | | | | | | `options[:default]` and `options[:raise]` can be mistakenly added to the `options` hash. This can be a problem if you're reusing the same object. | ||||
| * | | | | fix bad merge | Aaron Patterson | 2014-05-12 | 1 | -15/+0 |
| | | | | | |||||
| * | | | | add a test for the parameters sent to the url helper for new records | Aaron Patterson | 2014-05-12 | 1 | -0/+15 |
| | | | | | |||||
| * | | | | simplified route method name generation | Coraline Ada Ehmke + Aaron Patterson | 2014-05-12 | 1 | -0/+2 |
| | | | | | |||||
| * | | | | add a test with three objects | Aaron Patterson | 2014-05-12 | 1 | -2/+13 |
| | | | | | |||||
| * | | | | add a test for passing two models to the polymorphic_url method | Aaron Patterson | 2014-05-12 | 1 | -0/+8 |
| |/ / / | |||||
| * | | | add tests for path based url_for calls | Aaron Patterson | 2014-05-08 | 1 | -2/+19 |
| | | | | |||||
| * | | | don't manipulate the testclass, just add helpers to the instance | Aaron Patterson | 2014-05-08 | 1 | -10/+11 |
| | | | | |||||
| * | | | add a test for classes with options | Aaron Patterson | 2014-05-08 | 1 | -0/+7 |
| | | | | |||||
| * | | | add tests for the polymorphic_path method | Aaron Patterson | 2014-05-08 | 1 | -0/+3 |
| | | | | |||||
| * | | | add more tests around the polymorphic url api | Aaron Patterson | 2014-05-08 | 1 | -0/+12 |
| |/ / | |||||
| * | | test for inconsistency between String and Symbol url_for handling | Aaron Patterson | 2014-05-07 | 1 | -0/+4 |
| | | | |||||
 |
index : rails.git | |
| Mirror of official rails repo with custom fixes. | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |