aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
Commit message (Collapse)AuthorAgeFilesLines
* Symbol responds_to :upcase & :downcase in Ruby >= 1.9Akira Matsuda2012-06-062-4/+4
|
* stop `to_s`ing method namesAkira Matsuda2012-06-061-16/+16
| | | | Module#methods are Symbols in Ruby >= 1.9
* fix meaningless test caseAkira Matsuda2012-06-061-1/+1
| | | | | Module#instance_methods returns an Array of Symbols in Ruby >= 1.9 So this was not actually testing anything
* One-liner code for logger in ActionView::Helpers::ControllerHelperDmitry Vorotilin2012-06-051-5/+1
|
* Merge pull request #6631 from yuki24/use_block_in_button_helperJosé Valim2012-06-052-3/+18
|\ | | | | Accept a block in FormHelper#button
| * accept a block in button helper.Yuki Nishijima2012-06-052-3/+18
| |
* | Metal controller doesn't have logger method, check it and then delegateDmitry Vorotilin2012-06-051-2/+8
|/
* Allow to use mounted helpers in ActionView::TestCasePiotr Sarnacki2012-06-014-1/+24
| | | | | Similarly to 6525002, this allows to use routes helpers for mounted helpers, but this time in ActionView::TestCase
* Merge pull request #6588 from nbibler/polymorphic_to_modelJosé Valim2012-06-012-2/+34
| | | | Correct the use of to_model in polymorphic routing
* Sync CHANGLOG with the 3-2-stable branchRafael Mendonça França2012-06-011-0/+32
|
* Include routes.mounted_helpers into integration testsPiotr Sarnacki2012-06-014-3/+27
| | | | | | | | | | | | | | | In integration tests, you might want to use helpers from engines that you mounted in your application. It's not hard to add it by yourself, but it's unneeded boilerplate. mounted_helpers are now included by default. That means that given engine mounted like: mount Foo::Engine => "/foo", :as => "foo" you will be able to use paths from this engine in tests this way: foo.root_path #=> "/foo" (closes #6573)
* Merge branch 'master-sec'Aaron Patterson2012-05-312-1/+28
|\ | | | | | | | | | | * master-sec: Strip [nil] from parameters hash. Thanks to Ben Murphy for reporting this! predicate builder should not recurse for determining where columns. Thanks to Ben Murphy for reporting this
| * Strip [nil] from parameters hash.Aaron Patterson2012-05-302-1/+28
| | | | | | | | | | | | Thanks to Ben Murphy for reporting this! CVE-2012-2660
| * Fix the buildSantiago Pastorino2012-05-221-1/+0
| |
| * require active_support/lazy_load_hooks where is neededSantiago Pastorino2012-05-221-0/+1
| |
* | Extracted redirect logic from ActionController::Force::ClassMethods.force_sslJeremy Friesen2012-05-313-7/+50
| | | | | | | | | | | | | | | | | | | | | | | | | | Prior to this patch the existing .force_ssl method handles both defining the filter and handling the logic for performing the redirect. With this patch the logic for redirecting to the HTTPS protocol is separated from the filter logic that determines if a redirect should occur. By separating the two levels of behavior, an instance method for ActionController (i.e. #force_ssl_redirect) is exposed and available for more granular SSL enforcement. Cleaned up indentation.
* | Simplify link_to using content_tagCarlos Antonio da Silva2012-05-312-12/+26
| | | | | | | | Add some tests for link_to with blocks and escaping content.
* | Make link_to arguments explicitCarlos Antonio da Silva2012-05-311-8/+4
| |
* | Make button_to arguments explicit and refactor a bitCarlos Antonio da Silva2012-05-311-10/+6
| | | | | | | | Prefer Hash#[]= over Hash#merge when setting a value.
* | Simplify logic to initialize valid conditions in RouteSetCarlos Antonio da Silva2012-05-311-7/+3
| | | | | | | | | | | | Remove :to_sym call from public_instance_methods iteration, as such methods in Ruby 1.9 already return symbols. Initialize valid conditions with controller/action instead of setting them afterwards.
* | accept a block in button_to helperSergey Nartimov2012-05-303-3/+51
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make possible to use a block in button_to helper if button text is hard to fit into the name parameter, e.g.: <%= button_to [:make_happy, @user] do %> Make happy <strong><%= @user.name %></strong> <% end %> # => "<form method="post" action="/users/1/make_happy" class="button_to"> # <div> # <button type="submit"> # Make happy <strong>Name</strong> # </button> # </div> # </form>"
* | no need to pass an empty block to button_to helperSergey Nartimov2012-05-301-2/+2
| |
* | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-05-301-1/+1
|\ \
| * | fix typo in render_template [ci skip]Brent Vatne2012-05-291-1/+1
| | |
* | | Review requires from number helperCarlos Antonio da Silva2012-05-281-4/+1
| | | | | | | | | | | | | | | | | | | | | | | | Some of these requires are now only necessary in ActiveSupport::NumberHelper. Add hash/keys require due to symbolize_keys usage in number helpers. Also remove some whitespaces. Closes #6414
* | | Parse float value only once in number helpersCarlos Antonio da Silva2012-05-281-11/+11
| | | | | | | | | | | | | | | Refactor number helpers output with safety handling to call float parsing only once. Also remove 'erb' require.
* | | Merge pull request #6315 from ↵José Valim2012-05-283-285/+49
|\ \ \ | | | | | | | | | | | | | | | | appfolio/moving_number_helper_methods_to_active_support Moving number helper from ActionView to Active Support
| * | | Moving NumberHelpers from ActionView to ActiveSupportAndrew Mutz2012-05-273-285/+49
| |/ /
* / / Fix sorting of helpers from different pathsPiotr Sarnacki2012-05-285-2/+53
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When more than one directory for helpers is provided to a controller, it should preserver the order of directories. Given 2 paths: MyController.helpers_paths = ["dir1/helpers", "dir2/helpers"] helpers from dir1 should be loaded first. Before this commit, all helpers were mixed and then sorted alphabetically, which essentially would require to rename helpers to get desired order. This is a problem especially for engines, where you would like to be able to predict accurately which engine helpers will load first. (closes #6496)
* | Add `:escape` option for `truncate`Rafael Mendonça França2012-05-263-2/+29
| | | | | | | | This options can be used to not escape the result by default.
* | Update the documentation and add CHANGELOG entryRafael Mendonça França2012-05-262-3/+5
| |
* | Test that the block used in truncate is escaped if it is not HTML safeRafael Mendonça França2012-05-262-25/+23
| | | | | | | | Refactoring the truncate method to not do a sort-circuit return
* | Truncate now has the ability to receive a html option that allows it to call ↵Li Ellis Gallardo2012-05-262-10/+41
| | | | | | | | | | | | | | | | | | | | | | | | rails helpers. This way if my text is long I don't have to do something like this: .text = truncate(@text, :length => 27) if @text.size >= 27 = link_to "continue", notes_path, ....."")
* | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-05-261-4/+3
|\ \
| * | references to the old behavior removedMikhail Vaysman2012-05-251-4/+3
| | |
* | | Remove implicit dependency on pathnameJosé Valim2012-05-252-4/+4
|/ /
* | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-05-232-5/+13
|\ \
| * | Revert "Remove blank trailing comments"Vijay Dev2012-05-2329-0/+67
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit fa6d921e11363e9b8c4bc10f7aed0b9faffdc33a. Reason: Not a fan of such massive changes. We usually close such changes if made to Rails master as a pull request. Following the same principle here and reverting. [ci skip]
| * | copy edit[ci skip]Vijay Dev2012-05-231-1/+1
| | |
| * | Fix incorrect example for fields_for - without the '=' it will not output ↵David Morton2012-05-221-1/+1
| | | | | | | | | | | | anything.
| * | Remove blank trailing commentsHenrik Hodne2012-05-2029-67/+0
| | | | | | | | | | | | | | | | | | | | | For future reference, this is the regex I used: ^\s*#\s*\n(?!\s*#). Replace with the first match, and voilà! Note that the regex matches a little bit too much, so you probably want to `git add -i .` and go through every single diff to check if it actually should be changed.
| * | Update documentation for AbstractController::BaseHenrik Hodne2012-05-201-3/+11
| | |
* | | Add license field to gemspecs, by Matt GriffinMatt Griffin2012-05-231-0/+1
| | |
* | | Merge pull request #6453 from parndt/session_keysJosé Valim2012-05-222-0/+24
|\ \ \ | | | | | | | | Added session.keys and session.values back to ActionDispatch::Request::Session
| * | | Added ActionDispatch::Request::Session#keys and ↵Philip Arndt2012-05-232-0/+24
| | | | | | | | | | | | | | | | ActionDispatch::Request::Session#values
* | | | Add tests for time_field and date_field helpersCarlos Galdino2012-05-221-0/+18
| | | | | | | | | | | | | | | | These tests check the values of 'min' and 'max' input attrs
* | | | Refactor date related helpersCarlos Galdino2012-05-226-50/+26
|/ / /
* | | Merge pull request #6359 from carlosgaldino/add-html5-inputsJeremy Kemper2012-05-2212-0/+434
|\ \ \ | | | | | | | | Add HTML5 color and date/time inputs
| * | | Add several HTML5 input helpersCarlos Galdino2012-05-2110-0/+368
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The input types added are: - input[type="month"] - input[type="week"] - input[type="datetime"] - input[type="datetime-local"]
| * | | Add HTML5 input[type="color"] helperCarlos Galdino2012-05-218-0/+66
| | | |