aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/abstract_controller
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' of github.com:lifo/docrailsVijay Dev2013-03-302-2/+2
|\ | | | | | | | | | | | | | | | | Conflicts: activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb activerecord/test/cases/adapter_test.rb guides/source/testing.md [ci skip]
| * Capitalize the first letter of sentenceTatsuro Baba2013-03-181-1/+1
| |
| * Remove :all from *args options in AbstractController.helperBryan Ricker2013-03-161-1/+1
| |
* | Fixed grammarAnupam Choudhury2013-03-281-1/+1
| |
* | Merge pull request #8458 from ↵Rafael Mendonça França2013-03-271-5/+9
|\ \ | |/ |/| | | | | | | | | | | | | lucisferre/improve-layout-override-fallback-behavior Provides standard layout lookup behavior for method and proc cases Conflicts: actionpack/CHANGELOG.md
| * Provides standard layout lookup behavior for method and proc casesChris Nicola2013-03-271-5/+9
| | | | | | | | | | | | | | When setting the layout either by referencing a method or supplying a Proc there is no way to fall back to the default lookup behavior if desired. This patch allows fallback to the layout lookup behavior when returning nil from the proc or method.
* | change useless gsub to trrobertomiranda2013-03-051-1/+1
| |
* | Improve docs for AbsC::RenderingJosé Valim2013-02-271-3/+11
|/
* Review #translate docs [ci skip]Carlos Antonio da Silva2013-01-201-8/+7
|
* Add documentation for abstract controller #translate and #localize method.Jens Bissinger2013-01-201-0/+10
|
* delegate to :class rather than 'self.class'Gosha Arinich2013-01-061-1/+1
|
* Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-12-211-1/+1
|\
| * Revert "Fix incorrect adjustment 4c41e87e3ae548c44810b66437b2f0f6e73b2106"Vijay Dev2012-12-211-1/+1
| | | | | | | | | | | | | | | | This reverts commit e1f8ec59f2cc83f052b15233147aa2d6d8114a4d. Reason: seems bad styling [ci skip]
| * Fix incorrect adjustment 4c41e87e3ae548c44810b66437b2f0f6e73b2106kei2012-12-201-1/+1
| |
| * Fix documentation stylekei2012-12-201-1/+1
| |
* | Make conditional_layout? private and update documentationAndrew White2012-12-171-15/+23
|/ | | | | | | | | | | | | | | The conditional_layout? method is not for public use and doesn't actually do what the documentation suggested it does. It's actually used to determine whether or not to use the explicit layout definition defined in a controller or use the implicit layout definition. Also documentation was added for the action_has_layout? method which acts as a master switch for disabling the layout for the current action. This method was added so that action caching didn't depend on accessing layout internals but is also used by third-parties, most notably the [Hobo][1] application. [1]: https://github.com/hobo/hobo
* Refactor helpers code in Action Pack a bitCarlos Antonio da Silva2012-12-131-1/+1
| | | | | | | | * Avoid calling class_eval when not needed * Remove helpers_path attr accessor, it's defined as a class attribute a few lines later * Avoid creating extra arrays when finding helpers, use flat_map and sort! * Remove not required refer variable when redirecting :back
* fix prepend_before_filter documentation [ci skip]Francesco Rodriguez2012-12-071-3/+3
|
* Rename all action callbacks from *_filter to *_actionDavid Heinemeier Hansson2012-12-071-64/+86
|
* Cleans and removes useless 'Examples' tag [ci skip]Alvaro Pereyra2012-12-011-2/+1
|
* Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-11-171-3/+3
|\ | | | | | | | | Conflicts: actionpack/lib/action_dispatch/routing/redirection.rb
| * Hash Syntax to 1.9 converisonAvnerCohen2012-11-071-3/+3
| |
* | Removing duplication in callback normalization.Steve Klabnik2012-11-091-7/+8
|/ | | | These two things were 100% identical.
* cleanup, remove trailing whitespace within actionpackYves Senn2012-10-271-1/+1
|
* fix uninitialized ivar warningsAaron Patterson2012-10-251-0/+10
|
* Merge branch 'master' into asset-path-helperJoshua Peek2012-10-151-2/+4
|\ | | | | | | | | Conflicts: railties/test/application/configuration_test.rb
| * remove 'then' from conditional statementNihad Abbasov2012-10-141-2/+4
| |
* | :fire: Rails asset id supportJoshua Peek2012-10-151-1/+1
|/
* Fixed indendationAyrton De Craene2012-08-291-3/+3
|
* add lazy look up in abstract controller's translate methodSergey Pchelincev2012-07-181-1/+7
|
* Prevent conflict between mime types and Object methodsMircea Pricop2012-07-061-0/+4
| | | | | | | | | | | | | | | | | | | | | | | Assuming the type ":touch", Collector.new was calling send(:touch), which instead of triggering method_missing and generating a new collector method, actually invoked the private method `touch` inherited from Object. By generating the method for each mime type as it is registered, the private methods on Object can never be reached by `send`, because the `Collector` will have them before `send` is called on it. To do this, a callback mechanism was added to Mime::Type This allows someone to add a callback for whenever a new mime type is registered. The callback then gets called with the new mime as a parameter. This is then used in AbstractController::Collector to generate new collector methods after each mime is registered.
* remove AV.prepare and move all helper-related logic into the controller. ↵Nick Sutterer2012-06-291-3/+13
| | | | | | this decouples the view since it no longer knows about routes internals. this is a result of an ongoing discussion at https://github.com/rails/rails/pull/6826.
* i suck, fixing error messageAaron Patterson2012-06-141-1/+1
|
* Wrap up missing helper exceptionsAaron Patterson2012-06-141-2/+10
| | | | | | | The `path` method on missing helper errors is inconsistent with the implementation on LoadError in Ruby 2.0. Wrap up the missing helper exceptions so that the inconsistent behavior is mirrored in Ruby 2.0 (until we can figure out *why* it's inconsistent).
* using hax to fix tests on Ruby 2.0Aaron Patterson2012-06-131-1/+6
|
* Symbol responds_to :upcase & :downcase in Ruby >= 1.9Akira Matsuda2012-06-061-3/+3
|
* Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-05-231-4/+12
|\
| * Revert "Remove blank trailing comments"Vijay Dev2012-05-231-0/+1
| | | | | | | | | | | | | | | | | | | | 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
| |
| * Remove blank trailing commentsHenrik Hodne2012-05-201-1/+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 instance_accessor option to class_attributeAlexey Vakhov2012-05-221-2/+1
|/
* removing key argument from run_callbacks - fix buildFrancesco Rodriguez2012-05-101-1/+1
|
* Add annotaion for class_eval in AbstractController#helper_method [ci skip]Edward Tsech2012-05-081-3/+3
|
* Improve readability of metaprogramming annotations at AbstractController ↵Edward Tsech2012-05-081-10/+10
| | | | callbacks.
* avoid empty api pagesVijay Dev2012-04-083-4/+7
|
* Add a test case for layout nil.José Valim2012-03-281-0/+1
|
* Merge pull request #5480 from drogus/rendering-issuesJosé Valim2012-03-171-0/+1
| | | | Fix for #5440
* Merge pull request #5365 from avakhov/ac-layouts-excpetion-msgsPiotr Sarnacki2012-03-161-2/+2
|\ | | | | Fix exceptions messages in AC layouts
| * Fix exceptions messages in AC layoutsAlexey Vakhov2012-03-101-2/+2
| |