aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/abstract_controller
Commit message (Collapse)AuthorAgeFilesLines
* 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
| |
* | allow zero-arity proc for AbstrController::layoutLuke Gruber2012-03-151-4/+11
| | | | | | | | | | proc without parameters can now be given to AbstractController::layout
* | Merge pull request #5421 from parndt/masterVijay Dev2012-03-141-0/+1
|\ \ | | | | | | Added missing 'end' to documentation example
| * | 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
|/ | | | Removed some useless docstrings and no-doc'ed some.
* Fix layout lookup for anonymous controllerAlexey Vakhov2012-02-281-0/+4
|
* Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-02-251-1/+1
|\ | | | | | | | | Conflicts: actionmailer/CHANGELOG.md
| * Fix AbstractController#controller_path docAlexey Vakhov2012-02-191-1/+1
| |
* | Remove skip_filter block paramAlexey Vakhov2012-02-231-7/+7
| |
* | Refactored two methods to use delete with a blockRuben Fonseca2012-02-211-1/+1
|/
* Fix AbstractController::Base#hidden_actions commentAlexey Vakhov2012-02-181-2/+2
|
* Merge pull request #4866 from bogdan/terminate_after_callbacksJosé Valim2012-02-041-3/+1
|\ | | | | AS::Callbacks#define_callbacks: add :terminate_after_callbacks option
| * AS::Callbacks: :skip_after_callbacks_if_terminated optionBogdan Gusiev2012-02-031-3/+1
| |
* | AC::Callbacks: remove usage of :per_key option from filtersBogdan Gusiev2012-02-031-6/+4
|/
* Symbol#[] method presents in Ruby 1.9Sergey Nartimov2012-01-071-1/+1
|
* get rid of using instance_variable_names method from ASSergey Nartimov2012-01-071-6/+5
| | | | | - instance_variables return symbols in 1.9 - there is instance_variable_defined? method
* Use Kernel#Array instead of Array.wrap in view_pathsRafael Mendonça França2012-01-051-1/+1
|
* Array.wrap is no longer needed in AbstractController::CallbacksRafael Mendonça França2012-01-051-2/+2
|
* Remove unecessary config_accessors.José Valim2011-12-241-7/+1
|
* Remove deprecated layout lookup.José Valim2011-12-201-48/+24
|
* * BufferedLogger is deprecated. Use ActiveSupport::Logger, or the loggerAaron Patterson2011-12-191-1/+0
| | | | from Ruby stdlib.
* Default relative_url_root to ENV["RAILS_RELATIVE_URL_ROOT"]. Fixes #3365Piotrek Okoński2011-12-121-1/+1
|