Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | Fix date_select option overwriting html classes | Izumi Wong-Horiuchi | 2014-03-24 | 3 | -1/+21 | |
| | | | | | with_css_classes: true option overwrites other html classes. Concatenate day month and year classes rather than overwriting. | |||||
* | Digestor should just rely on the finder to know about the format and the ↵ | David Heinemeier Hansson | 2014-03-21 | 3 | -83/+39 | |
| | | | | variant -- trying to pass it back in makes a mess of things (oh, and doesnt work) | |||||
* | Log the full path, including variant, that the digestor is trying to find | David Heinemeier Hansson | 2014-03-21 | 1 | -3/+4 | |
| | ||||||
* | Fix for digestor to consider variants for partials -- this still needs more ↵ | David Heinemeier Hansson | 2014-03-21 | 1 | -2/+2 | |
| | | | | testing!! | |||||
* | Warning removed (...) interpreted as grouped expression | Arun Agrawal | 2014-03-20 | 1 | -1/+1 | |
| | ||||||
* | Reorder conditional logic | David Pedersen | 2014-03-18 | 1 | -10/+10 | |
| | | | | | | According to the best practice that "unless not" and "unless else" is hard to follow logically the link_to_unless and link_to_if were reversed. | |||||
* | fix `number_to_percentage` with `Float::NAN`, `Float::INFINITY`. | Yves Senn | 2014-03-17 | 2 | -0/+10 | |
| | | | | | | | Closes #14405. This is a follow-up to 9e997e9039435617b6a844158f5437e97f6bc107 to restore the documented behavior. | |||||
* | Merge pull request #12662 from nashby/include-hidden-collection | Rafael Mendonça França | 2014-03-15 | 3 | -3/+18 | |
|\ | | | | | | | | | | | | | | | add include_hidden option to collection_check_boxes helper Conflicts: actionview/CHANGELOG.md actionview/test/template/form_collections_helper_test.rb | |||||
| * | add include_hidden option to collection_check_boxes helper | Vasiliy Ermolovich | 2013-10-27 | 3 | -4/+19 | |
| | | ||||||
* | | Clarify AV::Digestor.digest method signature docs and deprecation warning | Jeremy Kemper | 2014-03-15 | 2 | -24/+23 | |
| | | ||||||
* | | Fix the resolver cache and stop mutating the lookup_context | Rafael Mendonça França | 2014-03-14 | 4 | -32/+10 | |
| | | | | | | | | | | Before we had a bug in the resolver cache so the disable_cache were not working when passing options to find | |||||
* | | Merge pull request #14329 from pch/digestor-lookup-fix | Rafael Mendonça França | 2014-03-14 | 10 | -33/+106 | |
|\ \ | | | | | | | | | | Ensure LookupContext in Digestor selects correct variant | |||||
| * | | Introduce #with_formats_and_variants to prevent problems with mutating ↵ | Łukasz Strzałkowski | 2014-03-14 | 4 | -5/+31 | |
| | | | | | | | | | | | | finder object | |||||
| * | | Add mocked disable_cache for FixtureFinder | Łukasz Strzałkowski | 2014-03-14 | 1 | -0/+4 | |
| | | | ||||||
| * | | Set format in finder | Łukasz Strzałkowski | 2014-03-14 | 1 | -3/+8 | |
| | | | ||||||
| * | | Rename _setup_options to _options_for_digest | Łukasz Strzałkowski | 2014-03-14 | 1 | -3/+3 | |
| | | | ||||||
| * | | Disable LookupContext's cache when looking for template | Łukasz Strzałkowski | 2014-03-14 | 1 | -2/+6 | |
| | | | ||||||
| * | | Don't pass hash as keys to #find method | Łukasz Strzałkowski | 2014-03-14 | 1 | -1/+1 | |
| | | | ||||||
| * | | Add variants to Template class | Łukasz Strzałkowski | 2014-03-14 | 3 | -12/+20 | |
| | | | ||||||
| * | | Don't create addition vars, use options[] directly | Łukasz Strzałkowski | 2014-03-13 | 1 | -7/+2 | |
| | | | ||||||
| * | | Ensure LookupContext in Digestor selects correct variant | Piotr Chmolowski | 2014-03-09 | 6 | -8/+39 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Related to: #14242 #14243 14293 Variants passed to LookupContext#find() seem to be ignored, so I've used the setter instead: `finder.variants = [ variant ]`. I've also added some more test cases for variants. Hopefully this time passing tests will mean it actually works. | |||||
* | | | Fix 'fields_for' doc typo. | Cakey | Buddy Magsipoc | 2014-03-10 | 1 | -2/+2 | |
| | | | ||||||
* | | | Enhance readability of ActionView DateHelper#distance_of_time_in_words | Kenny Meyer | 2014-03-09 | 1 | -4/+8 | |
|/ / | | | | | | | | | | | | | Refactor numerical constants to module constants which give the numbers a contextual meaning. This commit aims to provide quicker understanding for part of the implementation of the DateHelper#distance_of_time_in_words method. | |||||
* | | Merge branch 'master' of github.com:rails/docrails | Vijay Dev | 2014-03-07 | 1 | -2/+8 | |
|\ \ | | | | | | | | | | | | | Conflicts: guides/source/4_1_release_notes.md | |||||
| * | | Update doc for TagHelper. | Hendy Tanata | 2014-03-05 | 1 | -2/+8 | |
| | | | ||||||
* | | | Merge pull request #14285 from ↵ | Aaron Patterson | 2014-03-06 | 2 | -7/+3 | |
|\ \ \ | | | | | | | | | | | | | | | | | sikachu/master-revert-render-body-remove-content-type Do note remove `Content-Type` when `render :body` | |||||
| * | | | Do note remove `Content-Type` when `render :body` | Prem Sichanugrist | 2014-03-05 | 2 | -7/+3 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `render :body` should just not set the `Content-Type` header. By removing the header, it breaks the compatibility with other parts. After this commit, `render :body` will returns `text/html` content type, sets by default from `ActionDispatch::Response`, and it will preserve the overridden content type if you override it. Fixes #14197, #14238 This partially reverts commit 3047376870d4a7adc7ff15c3cb4852e073c8f1da. | |||||
* | | | | Introduce `Rails.gem_version` | Prem Sichanugrist | 2014-03-05 | 2 | -7/+19 | |
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This method return `Gem::Version.new(Rails.version)`, suggesting a more reliable way to perform version comparison. Example: Rails.version #=> "4.1.2" Rails.gem_version #=> #<Gem::Version "4.1.2"> Rails.version > "4.1.10" #=> false Rails.gem_version > Gem::Version.new("4.1.10") #=> true Gem::Requirement.new("~> 4.1.2") =~ Rails.gem_version #=> true This was originally introduced as `.version` by @charliesome in #8501 but got reverted in #10002 since it was not backward compatible. Also, updating template for `rake update_versions`. | |||||
* | | | Variants in ActionView::Digestor | Piotr Chmolowski | 2014-03-04 | 5 | -22/+103 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Take variants into account when calculating template digests in ActionView::Digest. Digestor#digest now takes a hash as an argument to support variants and allow more flexibility in the future. Old-style arguments have been deprecated. Fixes #14242 | |||||
* | | | Use 1.9 style hash on docs [ci skip] | Carlos Antonio da Silva | 2014-03-04 | 1 | -1/+1 | |
| | | | ||||||
* | | | Simplify handling of defaults/options in button_tag | Carlos Antonio da Silva | 2014-03-04 | 1 | -4/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | There's no need to rely on Active Support's Hash#reverse_merge for simple cases with default values, since we can just merge from the default rather than reverse merge from the options. This also avoids the creation of one extra hash object by moving to a Hash#merge! call. | |||||
* | | | Added missing changlog entry for #14255 | Godfrey Chan | 2014-03-04 | 1 | -0/+7 | |
| | | | ||||||
* | | | remove private method and rewrite into more precise notation | Sergey Prikhodko | 2014-03-04 | 1 | -12/+12 | |
| | | | ||||||
* | | | rollback to private method | Sergey Prikhodko | 2014-03-03 | 1 | -5/+9 | |
| | | | ||||||
* | | | cleanup and move extracted method right into the helper | Sergey Prikhodko | 2014-03-03 | 1 | -9/+5 | |
| | | | ||||||
* | | | fix content_or_options to be replaced by options and set to nil | Sergey Prikhodko | 2014-03-03 | 1 | -1/+6 | |
| | | | ||||||
* | | | fix indentations | Sergey Prikhodko | 2014-03-03 | 1 | -4/+3 | |
| | | | ||||||
* | | | fix form button | Sergey Prikhodko | 2014-03-03 | 1 | -5/+2 | |
| | | | ||||||
* | | | fix button tag without options | Sergey Prikhodko | 2014-03-03 | 1 | -2/+2 | |
| | | | ||||||
* | | | fix accept nil options | Sergey Prikhodko | 2014-03-03 | 1 | -3/+5 | |
| | | | ||||||
* | | | fixes default attributes for button_tag | Sergey Prikhodko | 2014-03-03 | 2 | -7/+18 | |
| | | | ||||||
* | | | Point master changelogs to 4-1-stable branch | Carlos Antonio da Silva | 2014-02-25 | 1 | -331/+1 | |
| | | | | | | | | | | | | Remove 4-1 related entries from master [ci skip] | |||||
* | | | [skip ci] Fix typo in link_to :method option description | Matt Campbell | 2014-02-24 | 1 | -1/+1 | |
| | | | ||||||
* | | | refactor, with_locale is not needed because I18n is mocked. | Yves Senn | 2014-02-24 | 1 | -7/+5 | |
| | | | | | | | | | | | | | | | This is a follow up to #14170. While backporting I recognized that this call is not needed at all. | |||||
* | | | Fix ActionView label translation for more than 10 nested elements | Vladimir Krylov | 2014-02-24 | 3 | -2/+20 | |
| | | | ||||||
* | | | refactor, extract `with_locale` helper. | Yves Senn | 2014-02-24 | 1 | -87/+79 | |
| | | | ||||||
* | | | update version to 4.2.0.alpha | Yves Senn | 2014-02-23 | 1 | -1/+1 | |
|/ / | ||||||
* | | Use the reference for the mime type to get the format | Rafael Mendonça França | 2014-02-18 | 4 | -2/+36 | |
| | | | | | | | | | | | | | | | | Before we were calling to_sym in the mime type, even when it is unknown what can cause denial of service since symbols are not removed by the garbage collector. Fixes: CVE-2014-0082 | |||||
* | | Merge branch '4-1-0-beta2' | Rafael Mendonça França | 2014-02-18 | 4 | -6/+58 | |
|\ \ | | | | | | | | | | | | | | | | Conflicts: actionview/CHANGELOG.md activerecord/CHANGELOG.md | |||||
| * | | Preparing for 4.1.0.beta2 release | Rafael Mendonça França | 2014-02-18 | 2 | -1/+5 | |
| | | |