Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Remove blank trailing comments | Henrik Hodne | 2012-05-20 | 1 | -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::Base | Henrik Hodne | 2012-05-20 | 1 | -3/+11 |
| | |||||
* | removing key argument from run_callbacks - fix build | Francesco Rodriguez | 2012-05-10 | 1 | -1/+1 |
| | |||||
* | Add annotaion for class_eval in AbstractController#helper_method [ci skip] | Edward Tsech | 2012-05-08 | 1 | -3/+3 |
| | |||||
* | Improve readability of metaprogramming annotations at AbstractController ↵ | Edward Tsech | 2012-05-08 | 1 | -10/+10 |
| | | | | callbacks. | ||||
* | avoid empty api pages | Vijay Dev | 2012-04-08 | 3 | -4/+7 |
| | |||||
* | Add a test case for layout nil. | José Valim | 2012-03-28 | 1 | -0/+1 |
| | |||||
* | Merge pull request #5480 from drogus/rendering-issues | José Valim | 2012-03-17 | 1 | -0/+1 |
| | | | | Fix for #5440 | ||||
* | Merge pull request #5365 from avakhov/ac-layouts-excpetion-msgs | Piotr Sarnacki | 2012-03-16 | 1 | -2/+2 |
|\ | | | | | Fix exceptions messages in AC layouts | ||||
| * | Fix exceptions messages in AC layouts | Alexey Vakhov | 2012-03-10 | 1 | -2/+2 |
| | | |||||
* | | allow zero-arity proc for AbstrController::layout | Luke Gruber | 2012-03-15 | 1 | -4/+11 |
| | | | | | | | | | | proc without parameters can now be given to AbstractController::layout | ||||
* | | Merge pull request #5421 from parndt/master | Vijay Dev | 2012-03-14 | 1 | -0/+1 |
|\ \ | | | | | | | Added missing 'end' to documentation example | ||||
| * | | Added missing end to example | Philip Arndt | 2012-03-14 | 1 | -0/+1 |
| | | | |||||
* | | | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2012-03-13 | 1 | -4/+3 |
|\ \ \ | |||||
| * | | | Fix layout method doc formatting | Alexey Vakhov | 2012-03-10 | 1 | -2/+1 |
| | | | | |||||
| * | | | Fix comment about layout folders lookup | Alexey Vakhov | 2012-03-09 | 1 | -2/+2 |
| | |/ | |/| | |||||
* / | | AbstractController.action_methods should return a Set | Santiago Pastorino | 2012-03-10 | 1 | -2/+3 |
|/ / | |||||
* / | Clean up module docs [ci skip] | Vijay Dev | 2012-03-07 | 1 | -6/+6 |
|/ | | | | Removed some useless docstrings and no-doc'ed some. | ||||
* | Fix layout lookup for anonymous controller | Alexey Vakhov | 2012-02-28 | 1 | -0/+4 |
| | |||||
* | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2012-02-25 | 1 | -1/+1 |
|\ | | | | | | | | | Conflicts: actionmailer/CHANGELOG.md | ||||
| * | Fix AbstractController#controller_path doc | Alexey Vakhov | 2012-02-19 | 1 | -1/+1 |
| | | |||||
* | | Remove skip_filter block param | Alexey Vakhov | 2012-02-23 | 1 | -7/+7 |
| | | |||||
* | | Refactored two methods to use delete with a block | Ruben Fonseca | 2012-02-21 | 1 | -1/+1 |
|/ | |||||
* | Fix AbstractController::Base#hidden_actions comment | Alexey Vakhov | 2012-02-18 | 1 | -2/+2 |
| | |||||
* | Merge pull request #4866 from bogdan/terminate_after_callbacks | José Valim | 2012-02-04 | 1 | -3/+1 |
|\ | | | | | AS::Callbacks#define_callbacks: add :terminate_after_callbacks option | ||||
| * | AS::Callbacks: :skip_after_callbacks_if_terminated option | Bogdan Gusiev | 2012-02-03 | 1 | -3/+1 |
| | | |||||
* | | AC::Callbacks: remove usage of :per_key option from filters | Bogdan Gusiev | 2012-02-03 | 1 | -6/+4 |
|/ | |||||
* | Symbol#[] method presents in Ruby 1.9 | Sergey Nartimov | 2012-01-07 | 1 | -1/+1 |
| | |||||
* | get rid of using instance_variable_names method from AS | Sergey Nartimov | 2012-01-07 | 1 | -6/+5 |
| | | | | | - instance_variables return symbols in 1.9 - there is instance_variable_defined? method | ||||
* | Use Kernel#Array instead of Array.wrap in view_paths | Rafael Mendonça França | 2012-01-05 | 1 | -1/+1 |
| | |||||
* | Array.wrap is no longer needed in AbstractController::Callbacks | Rafael Mendonça França | 2012-01-05 | 1 | -2/+2 |
| | |||||
* | Remove unecessary config_accessors. | José Valim | 2011-12-24 | 1 | -7/+1 |
| | |||||
* | Remove deprecated layout lookup. | José Valim | 2011-12-20 | 1 | -48/+24 |
| | |||||
* | * BufferedLogger is deprecated. Use ActiveSupport::Logger, or the logger | Aaron Patterson | 2011-12-19 | 1 | -1/+0 |
| | | | | from Ruby stdlib. | ||||
* | Default relative_url_root to ENV["RAILS_RELATIVE_URL_ROOT"]. Fixes #3365 | Piotrek Okoński | 2011-12-12 | 1 | -1/+1 |
| | |||||
* | Fix extend -> include. | José Valim | 2011-12-09 | 1 | -1/+1 |
| | |||||
* | Deprecate implicit layout lookup in favor of inheriting the _layout config. | José Valim | 2011-12-09 | 1 | -32/+86 |
| | |||||
* | Just use the proc if there is a chance of layout lookup. | José Valim | 2011-12-08 | 1 | -5/+6 |
| | |||||
* | Optimize layout lookup to avoid double calls. | José Valim | 2011-12-08 | 2 | -25/+27 |
| | |||||
* | Some small optimizations and improvements to benchmark code. | José Valim | 2011-12-08 | 1 | -6/+1 |
| | |||||
* | Allow layout fallback when using `layout` method | Prem Sichanugrist | 2011-12-06 | 1 | -25/+34 |
| | | | | | | | | | | | | Rails will now use your default layout (such as "layouts/application") when you specify a layout with `:only` and `:except` condition, and those conditions fail. For example, consider this snippet: class CarsController layout 'single_car', :only => :show end Rails will use 'layouts/single_car' when a request comes in `:show` action, and use 'layouts/application' (or 'layouts/cars', if exists) when a request comes in for any other actions. | ||||
* | Rely on a public contract between railties instead of accessing railtie ↵ | José Valim | 2011-11-23 | 1 | -2/+2 |
| | | | | methods directly. | ||||
* | Fixed stale doc in AbstractController::Layouts | Dalibor Nasevic | 2011-11-06 | 1 | -12/+5 |
| | |||||
* | Fix comment in AbstractController callbacks | Alexey Vakhov | 2011-10-06 | 1 | -2/+2 |
| | |||||
* | Ensure default_asset_host_protocol is respected, closes #2980. | José Valim | 2011-10-05 | 1 | -1/+2 |
| | |||||
* | TestCase should respect the view_assigns API instead of pulling variables on ↵ | José Valim | 2011-10-02 | 1 | -2/+2 |
| | | | | its own. | ||||
* | Merge branch 'master' of github.com:lifo/docrails | Xavier Noria | 2011-08-13 | 1 | -18/+102 |
|\ | | | | | | | | | | | | | | | | | | | | | Conflicts: RELEASING_RAILS.rdoc actionpack/lib/sprockets/railtie.rb actionpack/test/template/sprockets_helper_test.rb activerecord/test/cases/calculations_test.rb railties/guides/source/3_1_release_notes.textile railties/guides/source/active_resource_basics.textile railties/guides/source/command_line.textile | ||||
| * | update abstract_controller callbacks to document meta-programmed filters | geemus | 2011-08-13 | 1 | -18/+102 |
| | | |||||
| * | Remove unused use_sprockets config | Santiago Pastorino | 2011-08-13 | 1 | -1/+1 |
| | | |||||
* | | adding missing require to fist railties tests | Aaron Patterson | 2011-08-09 | 1 | -0/+2 |
| | |