aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/abstract_controller
Commit message (Expand)AuthorAgeFilesLines
* 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
| * 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
|/
* Refactor helpers code in Action Pack a bitCarlos Antonio da Silva2012-12-131-1/+1
* 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
|\
| * Hash Syntax to 1.9 converisonAvnerCohen2012-11-071-3/+3
* | Removing duplication in callback normalization.Steve Klabnik2012-11-091-7/+8
|/
* 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
|\
| * 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
* remove AV.prepare and move all helper-related logic into the controller. this...Nick Sutterer2012-06-291-3/+13
* i suck, fixing error messageAaron Patterson2012-06-141-1/+1
* Wrap up missing helper exceptionsAaron Patterson2012-06-141-2/+10
* 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
| * copy edit[ci skip]Vijay Dev2012-05-231-1/+1
| * Remove blank trailing commentsHenrik Hodne2012-05-201-1/+0
| * 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 call...Edward Tsech2012-05-081-10/+10
* 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
* Merge pull request #5365 from avakhov/ac-layouts-excpetion-msgsPiotr Sarnacki2012-03-161-2/+2
|\
| * Fix exceptions messages in AC layoutsAlexey Vakhov2012-03-101-2/+2
* | allow zero-arity proc for AbstrController::layoutLuke Gruber2012-03-151-4/+11
* | Merge pull request #5421 from parndt/masterVijay Dev2012-03-141-0/+1
|\ \
| * | Added missing end to examplePhilip Arndt2012-03-141-0/+1
* | | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-03-131-4/+3
|\ \ \
| * | | Fix layout method doc formattingAlexey Vakhov2012-03-101-2/+1
| * | | Fix comment about layout folders lookupAlexey Vakhov2012-03-091-2/+2
| | |/ | |/|
* / | AbstractController.action_methods should return a SetSantiago Pastorino2012-03-101-2/+3
|/ /
* / Clean up module docs [ci skip]Vijay Dev2012-03-071-6/+6
|/
* Fix layout lookup for anonymous controllerAlexey Vakhov2012-02-281-0/+4
* Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-02-251-1/+1
|\