Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into asset-path-helper | Joshua Peek | 2012-10-15 | 1 | -2/+4 |
|\ | | | | | | | | | Conflicts: railties/test/application/configuration_test.rb | ||||
| * | remove 'then' from conditional statement | Nihad Abbasov | 2012-10-14 | 1 | -2/+4 |
| | | |||||
* | | :fire: Rails asset id support | Joshua Peek | 2012-10-15 | 1 | -1/+1 |
|/ | |||||
* | Fixed indendation | Ayrton De Craene | 2012-08-29 | 1 | -3/+3 |
| | |||||
* | add lazy look up in abstract controller's translate method | Sergey Pchelincev | 2012-07-18 | 1 | -1/+7 |
| | |||||
* | Prevent conflict between mime types and Object methods | Mircea Pricop | 2012-07-06 | 1 | -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 Sutterer | 2012-06-29 | 1 | -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 message | Aaron Patterson | 2012-06-14 | 1 | -1/+1 |
| | |||||
* | Wrap up missing helper exceptions | Aaron Patterson | 2012-06-14 | 1 | -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.0 | Aaron Patterson | 2012-06-13 | 1 | -1/+6 |
| | |||||
* | Symbol responds_to :upcase & :downcase in Ruby >= 1.9 | Akira Matsuda | 2012-06-06 | 1 | -3/+3 |
| | |||||
* | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2012-05-23 | 1 | -4/+12 |
|\ | |||||
| * | Revert "Remove blank trailing comments" | Vijay Dev | 2012-05-23 | 1 | -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 Dev | 2012-05-23 | 1 | -1/+1 |
| | | |||||
| * | 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 |
| | | |||||
* | | Add instance_accessor option to class_attribute | Alexey Vakhov | 2012-05-22 | 1 | -2/+1 |
|/ | |||||
* | 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 |
| |