aboutsummaryrefslogtreecommitdiffstats
path: root/actionview
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #13414 from britto/jb-fix-dependency-matchingRafael Mendonça França2014-01-163-29/+184
|\ | | | | Improve ERB dependency detection
| * Update changelogJoão Britto2014-01-091-0/+7
| |
| * Avoid scanning multiple render calls as a single match.João Britto2014-01-092-21/+45
| | | | | | | | Each chunk of text coming after `render` is now handled individually as a possible list of arguments.
| * Improve ERB dependency detection.João Britto2014-01-092-21/+145
| | | | | | | | | | | | | | | | | | | | | | The current implementation can't handle some special cases of oddly-formatted Ruby. Now we are able to detect them: * Multi-line arguments on the `render` call * Strings containing quotes, e.g. `"something's wrong"` * Multiple kinds of identifiers - instance variables, class variables and globals * Method chains as arguments for the `render` call Also, this fix reduces the rate of "false positives" which showed up when we had calls/access to identifiers containing `render`, like `surrender` and `rendering`.
* | "serie" => "series"Waynn Lue2014-01-131-2/+2
| |
* | standardize on jruby_skip & rbx_skipGaurish Sharma2014-01-131-0/+8
|/ | | | | | This Adds helpers(jruby_skip & rbx_skip). In Future, Plan is to use these helpers instead of calls directly to RUBY_ENGINE/RbConfig/JRUBY_VERSION
* Fix typo in image_tag documentationAdrien2014-01-071-1/+1
| | | image_tag only supports :alt and :size as additional keys, not three.
* Require actionview/versionWashington Luiz2014-01-061-0/+1
| | | | just like all the other modules do require their version file
* Switched to use `display:none` in extra_tags_for_form method.Gaelian Ditchburn2014-01-056-8/+14
| | | | | | | | | | | | | The use of `display:inline` with the content_tag call in the extra_tags_for_form method potentially causes display issues with some browsers, namely Internet Explorer. IE's behaviour of not collapsing the line height on divs with ostensibly no content means that the automatically added div containing the hidden authenticity_token, utf8 and _method form input tags may interfere with other visible form elements in certain circumstances. The use of `display:none` rather than `display:inline` fixes this problem. Fixes #6403
* provide correct example of `datetime_select` helper [ci skip]Kuldeep Aggarwal2014-01-041-1/+1
|
* Fixed documentation. [ci skip]Konstantin Wlasow2014-01-041-0/+3
|
* Change all "can not"s to the correct "cannot".T.J. Schuck2014-01-031-2/+2
|
* No need to use fixed size font [ci skip]Rafael Mendonça França2014-01-031-2/+2
|
* Fix documentation for end_year option of date_helper [ci skip]Prathamesh Sonpatki2014-01-031-2/+6
| | | | | | | | | | - While editing an existing record, end_year is equal to current selected year plus 5 by default. - While editing an existing record, start_year is equal to current selected year value minus 5 by default. - Fixes #13552 Acked-by: Prathamesh Sonpatki <csonpatki@gmail.com> Acked-by: Prathamesh Sonpatki <csonpatki@gmail.com>
* provide correct information [ci skip]Kuldeep Aggarwal2014-01-021-2/+2
|
* update copyright notices to 2014. [ci skip]Vipul A M2014-01-012-2/+2
|
* Unused class in AV testAkira Matsuda2013-12-251-2/+0
|
* Unused classes in AV testsAkira Matsuda2013-12-243-18/+0
|
* Add a changelog entry for #13363 [ci skip]Robin Dupret2013-12-211-0/+8
|
* Merge branch 'master' of github.com:lifo/docrailsVijay Dev2013-12-203-4/+4
|\
| * Typos. return -> returns. [ci skip]Lauro Caetano2013-12-033-4/+4
| |
* | Prefer assert_raise instead of flunk + rescue to test for exceptionsCarlos Antonio da Silva2013-12-192-6/+6
| | | | | | | | | | | | Change most tests to make use of assert_raise returning the raised exception rather than relying on a combination of flunk + rescue to check for exception types/messages.
* | duplication removed(DRY)abhishek2013-12-181-16/+10
| |
* | Merge pull request #13363 from kuldeepaggarwal/f-video-optionsGuillermo Iguaran2013-12-172-5/+11
|\ \ | | | | | | allow video_tag to accept `size` as `Number` for square shaped videos
| * | allow video_tag to accept `size` as `Number` for square shaped videosKuldeep Aggarwal2013-12-182-5/+11
| | |
* | | Get ready to release 4.1.0.beta1David Heinemeier Hansson2013-12-171-1/+1
| | |
* | | Fix integration test to pass same-origin verificationJeremy Kemper2013-12-171-1/+1
|/ /
* | Disable available locales checks to avoid warnings running the testsCarlos Antonio da Silva2013-12-171-0/+3
| |
* | Merge pull request #13255 from strzalek/bump-builderRafael Mendonça França2013-12-121-1/+1
|\ \ | | | | | | Bump up builder
| * | More liberal builder dependencyŁukasz Strzałkowski2013-12-121-1/+1
| | | | | | | | | | | | Allowing us to get 3.2.x versions if needed.
* | | Merge pull request #13284 from aayushkhandelwal11/typos_correctedGodfrey Chan2013-12-111-1/+1
|\ \ \ | | | | | | | | s/everytime/every time/
| * | | typos rectified [ci skip]Aayush khandelwal2013-12-121-1/+1
| | | |
* | | | test description uses "disable" when it should be "disabled"Waynn Lue2013-12-111-1/+1
| | | |
* | | | value is "disabled" not "disable"Waynn Lue2013-12-111-1/+1
|/ / /
* / / Fix typo in docs, missing colon in Symbol literal [ci skip]Semyon Perepelitsa2013-12-111-1/+1
|/ /
* | Merge pull request #13059 from imkmf/cycle-accepts-arrayRafael Mendonça França2013-12-063-1/+26
|\ \ | | | | | | | | | | | | | | | | | | Cycle object should accept an array Conflicts: actionview/CHANGELOG.md
| * | A Cycle object should accept an array and cycle through it as it wouldKristian Freeman2013-12-063-1/+24
| | | | | | | | | | | | with a set of comma-separated objects.
* | | Label only accepts `:index` and `:namespace` attributes from the inputAndriel Nuernberg2013-12-055-2/+98
| | |
* | | Remove the explicit order set for the initializerRafael Mendonça França2013-12-051-1/+1
| | | | | | | | | | | | | | | | | | | | | This will fix the regression added on b068e20b35797aa6deaa377a48c990759734f515. See tests added at ff08d31 to a better understanding about the problem
* | | Merge pull request #13189 from strzalek/retain-ap-av-depJeremy Kemper2013-12-052-9/+0
|\ \ \ | | | | | | | | Retain ActionPack dependency on ActionView. Fixes #12979.
| * | | Include AV::Layouts directly in AM::BaseŁukasz Strzałkowski2013-12-051-6/+0
| | | | | | | | | | | | | | | | No need to do this in railtie as AM depends on AV either way
| * | | Retain ActionPack dependency on ActionViewŁukasz Strzałkowski2013-12-052-3/+0
| | | |
* | | | Escalate missing error when :raise is trueShota Fukumori (sora_h)2013-12-052-1/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Before ec16ba75a5493b9da972eea08bae630eba35b62f, ActionView::Helpers::TranslationHelper#translate has raised errors with specifying options[:raise] to true. This should work by this fix: begin t(:"translations.missing", raise: true) rescue I18n::MissingTranslationData p :hello! end
* | | | Added \u2028 \u2029 to json_escapeGodfrey Chan2013-12-042-1/+5
| | | |
* | | | Use lower case letters in unicodes sequences to match the new encoder's outputGodfrey Chan2013-12-041-3/+3
| | | |
* | | | Fixed a long-standing bug in `json_escape` that strips quotation marksGodfrey Chan2013-12-041-0/+4
| | | |
* | | | Added failing test for json_escape striping quotation marksGodfrey Chan2013-12-041-0/+45
| | | | | | | | | | | | | | | | Expanded test coverage for html_escape and json_escape
* | | | Fix issue where TextHelper#simple_format was calling missing 'raw' methodMario Visic2013-12-052-0/+7
| | | |
* | | | Fix documentation of number_to_currency helperRafael Mendonça França2013-12-041-4/+4
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | Now users have to explicit mark the unit as safe if they trust it. Closes #13161 Conflicts: actionpack/lib/action_view/helpers/number_helper.rb actionpack/test/template/number_helper_i18n_test.rb
* | | Action Pack VariantsŁukasz Strzałkowski2013-12-046-12/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | By default, variants in the templates will be picked up if a variant is set and there's a match. The format will be: app/views/projects/show.html.erb app/views/projects/show.html+tablet.erb app/views/projects/show.html+phone.erb If request.variant = :tablet is set, we'll automatically be rendering the html+tablet template. In the controller, we can also tailer to the variants with this syntax: class ProjectsController < ActionController::Base def show respond_to do |format| format.html do |html| @stars = @project.stars html.tablet { @notifications = @project.notifications } html.phone { @chat_heads = @project.chat_heads } end format.js format.atom end end end The variant itself is nil by default, but can be set in before filters, like so: class ApplicationController < ActionController::Base before_action do if request.user_agent =~ /iPad/ request.variant = :tablet end end end This is modeled loosely on custom mime types, but it's specifically not intended to be used together. If you're going to make a custom mime type, you don't need a variant. Variants are for variations on a single mime types.