aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #8371 from freegenie/5396-conditional-fragment-cachingRafael Mendonça França2012-12-051-1/+13
|\ | | | | | | | | Allow fragment cache to accept :if and :unless options. Closes #5396
| * Allow fragment cache to accept :if and :unless optionsFabrizio Regini2012-12-051-1/+13
| | | | | | | | [Stephen Ausman + Fabrizio Regini]
* | Merge pull request #8412 from ↵Rafael Mendonça França2012-12-051-18/+14
|\ \ | |/ |/| | | | | JoeyButler/action_dispatch_routing_mapper_refactoring Extract method refactoring.
| * Extract method refactoring in ActionDispatch::Routing::SingletonResource.Joey Butler2012-12-051-18/+14
| |
* | Merge pull request #8404 from freegenie/filter_redirectsAndrew White2012-12-054-1/+40
|\ \
| * | Adding filter capability to ActionController logsFabrizio Regini2012-12-054-1/+40
| | |
* | | Replace comments' non-breaking spaces with spacesclaudiob2012-12-042-3/+3
|/ / | | | | | | | | | | | | | | | | | | Sometimes, on Mac OS X, programmers accidentally press Option+Space rather than just Space and don’t see the difference. The problem is that Option+Space writes a non-breaking space (0XA0) rather than a normal space (0x20). This commit removes all the non-breaking spaces inadvertently introduced in the comments of the code.
* | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-12-0422-283/+232
|\ \ | | | | | | | | | | | | Conflicts: guides/source/migrations.md
| * | copy edits [ci skip]Vijay Dev2012-12-044-27/+18
| | |
| * | Fix a typo in ActionController::CachingJean Boussier2012-12-031-2/+1
| | |
| * | Remove nodoc from FlashHash #[]= [ci skip]Pablo Torres2012-12-011-1/+1
| | |
| * | Cleans and removes 'Examples' tag [ci skip]Alvaro Pereyra2012-12-012-4/+0
| | |
| * | Cleans and removes useless 'Examples' tag [ci skip]Alvaro Pereyra2012-12-016-62/+44
| | |
| * | Add documentation to AssetTagHelper#image_alt [ci skip]Florent Guilleux2012-12-011-0/+3
| | |
| * | Fixes wrong typo on FormHelper [ci skip]Alvaro Pereyra2012-12-011-1/+1
| | |
| * | Cleans documentation from Helpers [ci skip]Alvaro Pereyra2012-12-015-121/+98
| | |
| * | Revert "Remove trailing whitespaces"Florent Guilleux2012-12-012-2/+2
| | | | | | | | | | | | This reverts commit 90c887fa7d0c454b7533e208daefc342dea4d5f3.
| * | Remove trailing whitespacesFlorent Guilleux2012-12-012-2/+2
| | |
| * | Improves documentation of Capture helper [ci skip]Alvaro Pereyra2012-12-012-14/+13
| | |
| * | Removes :nodoc: tag on AtomFeedHelper [ci skip]Alvaro Pereyra2012-12-011-3/+3
| | |
| * | Removes unneeded 'Example' tags and whitespaces [ci skip]Alvaro Pereyra2012-12-011-45/+42
| | |
| * | nodoc AD & AV railties classesCarlos Duclos2012-12-012-2/+2
| | |
| * | Remove :nodoc from SanitizeHelper module [ci skip]HPNeo2012-12-011-1/+1
| | |
| * | Removes :nodoc: label [ci skip]Alvaro Pereyra2012-12-011-1/+1
| | |
| * | Improves documentation on favicon_link_tagAlvaro Pereyra2012-12-011-14/+16
| | |
| * | Update documentation for javascript_include_tag [ci skip]HPNeo2012-12-011-10/+13
| | |
* | | Fixed issue where routes with globs caused constraints on that glob toMaura Fitzgerald2012-12-041-1/+1
| |/ |/| | | | | | | | | be ignored. A regular expression constraint gets overwritten when the routes.rb file is processed. Changed the overwriting to an ||= instead of an = assignment.
* | Override <%== to always behave as literal text rather than toggling based on ↵Jeremy Kemper2012-12-031-0/+11
| | | | | | | | whether escaping is enabled. Fixes that existing plaintext email templates using <%== unexpectedly flipped to *escaping* HTML when #8235 was merged.
* | More descriptive error when rendering a partial with `:layout => true`Yves Senn2012-12-021-1/+1
|/
* hash filters should be accessed with symbols or stringsFrancesco Rodriguez2012-11-301-3/+5
|
* added examples when options is stringTakehiro Adachi2012-11-291-3/+9
|
* Remove observers and sweepersRafael Mendonça França2012-11-282-121/+2
| | | | | | | | They was extracted from a plugin. See https://github.com/rails/rails-observers [Rafael Mendonça França + Steve Klabnik]
* Merge pull request #8318 from Empact/fixture-fileRafael Mendonça França2012-11-271-5/+7
|\ | | | | Use File.join to better integrate fixture_path in fixture_file_upload.
| * Use File.join to better integrate fixture_path in fixture_file_upload.Ben Woosley2012-11-261-5/+7
| |
* | Cleanup CacheHelper changes allowing opt-out of cache digestsDrew Ulmer2012-11-271-2/+2
| | | | | | | | | | | | | | | | | | | | Instead of deleting the skip_digest option flag, this changes the method to merely check the key. This change is because of a discussion in this thread: https://github.com/rails/rails/pull/8317 This commit also makes #fragment_name_with_digest private due to its functionality being subsumed by #cache_fragment_name.
* | No sort Hash options in #grouped_options_for_selectSergey Kojin2012-11-271-6/+4
| |
* | Fix Strong Parameters docs.Uģis Ozols2012-11-271-2/+1
| | | | | | | | | | It's only possible to inherit from ActiveRecord::Base and not include it.
* | unshift html-scanner into $LOAD_PATH rather than appendAkira Matsuda2012-11-271-1/+1
| |
* | Remove warning of circular requireRafael Mendonça França2012-11-271-1/+1
| | | | | | | | | | | | | | | | | | This file was using mime_types before load the Mime::Type class. When trying to register first Mime::Type it load mime_type that loads mime_types in the end. Requiring mime_type ensure that we have the class definition and the mime types
* | Accept symbols as #send_data :disposition valueElia Schito2012-11-271-0/+1
| |
* | Merge pull request #8316 from roberto/assert_template_validate_optionsCarlos Antonio da Silva2012-11-261-0/+2
|\ \ | | | | | | | | | | | | | | | | | | | | | assert_template: validating option keys It only handles the keys locals, partial, layout and count. assert_template(foo: "bar") # raises ArgumentError assert_template(leiaute: "test") # raises ArgumentError
| * | assert_template: validating option keysRoberto Soares2012-11-251-0/+2
| | |
* | | Merge pull request #8317 from latortuga/cache-digest-opt-outDavid Heinemeier Hansson2012-11-261-1/+23
|\ \ \ | |/ / |/| | Add explicit opt-out for fragment cache digesting
| * | Add explicit opt-out for fragment cache digestingDrew Ulmer2012-11-251-1/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | This add support for sending an explicit opt-out of the "Russian-doll" cache digest feature on a case-by-case basis. This is useful when cache- expiration needs to be performed manually and it would be otherwise difficult to know the exact name of a digested cache key. More information: https://github.com/rails/cache_digests/pull/16
* | | Merge pull request #8302 from roberto/assert_template_empty_stringCarlos Antonio da Silva2012-11-251-1/+1
|\ \ \ | |/ / |/| | assert_template("") will now fail no matter whether a template has been rendered or not.
| * | `assert_template` fails with empty string.Roberto Soares2012-11-231-8/+4
| | |
| * | `assert_template` fails with empty string when a template has been renderedRoberto Soares2012-11-231-4/+8
| | | | | | | | | | | | | | | | | | | | | | | | For instance, it prevents false positive in this case: file = nil get :index assert_template("#{file}")
* | | Merge pull request #8306 from senny/documentation_for_hidden_field_idCarlos Antonio da Silva2012-11-241-0/+5
|\ \ \ | |_|/ |/| | Document :hidden_field_id option for fields_for [ci skip]
| * | document :hidden_field_id option for fields_forYves Senn2012-11-241-0/+5
| | |
* | | Refector a bit to remove extra slice iteration and splat callCarlos Antonio da Silva2012-11-241-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | This yields a small bit of performance improvement when building the defaults from constraints, specially considering that it's rather common for constraints to be empty. Also, there's a bit of duplicated code in here that I have to check before extracting.