| Commit message (Collapse) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| * | | | Merge pull request #8458 from ↵ | Rafael Mendonça França | 2013-03-27 | 1 | -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 cases | Chris Nicola | 2013-03-27 | 1 | -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 tr | robertomiranda | 2013-03-05 | 1 | -1/+1 | |
| | | | | ||||||
| * | | | Improve docs for AbsC::Rendering | José Valim | 2013-02-27 | 1 | -3/+11 | |
| |/ / | ||||||
| * | | Review #translate docs [ci skip] | Carlos Antonio da Silva | 2013-01-20 | 1 | -8/+7 | |
| | | | ||||||
| * | | Add documentation for abstract controller #translate and #localize method. | Jens Bissinger | 2013-01-20 | 1 | -0/+10 | |
| | | | ||||||
| * | | delegate to :class rather than 'self.class' | Gosha Arinich | 2013-01-06 | 1 | -1/+1 | |
| |/ | ||||||
| * | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2012-12-21 | 1 | -1/+1 | |
| |\ | ||||||
| | * | Revert "Fix incorrect adjustment 4c41e87e3ae548c44810b66437b2f0f6e73b2106" | Vijay Dev | 2012-12-21 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | This reverts commit e1f8ec59f2cc83f052b15233147aa2d6d8114a4d. Reason: seems bad styling [ci skip] | |||||
| | * | Fix incorrect adjustment 4c41e87e3ae548c44810b66437b2f0f6e73b2106 | kei | 2012-12-20 | 1 | -1/+1 | |
| | | | ||||||
| | * | Fix documentation style | kei | 2012-12-20 | 1 | -1/+1 | |
| | | | ||||||
| * | | Make conditional_layout? private and update documentation | Andrew White | 2012-12-17 | 1 | -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 bit | Carlos Antonio da Silva | 2012-12-13 | 1 | -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 Rodriguez | 2012-12-07 | 1 | -3/+3 | |
| | | ||||||
| * | Rename all action callbacks from *_filter to *_action | David Heinemeier Hansson | 2012-12-07 | 1 | -64/+86 | |
| | | ||||||
| * | Cleans and removes useless 'Examples' tag [ci skip] | Alvaro Pereyra | 2012-12-01 | 1 | -2/+1 | |
| | | ||||||
| * | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2012-11-17 | 1 | -3/+3 | |
| |\ | | | | | | | | | Conflicts: actionpack/lib/action_dispatch/routing/redirection.rb | |||||
| | * | Hash Syntax to 1.9 converison | AvnerCohen | 2012-11-07 | 1 | -3/+3 | |
| | | | ||||||
| * | | Removing duplication in callback normalization. | Steve Klabnik | 2012-11-09 | 1 | -7/+8 | |
| |/ | | | | These two things were 100% identical. | |||||
| * | cleanup, remove trailing whitespace within actionpack | Yves Senn | 2012-10-27 | 1 | -1/+1 | |
| | | ||||||
| * | fix uninitialized ivar warnings | Aaron Patterson | 2012-10-25 | 1 | -0/+10 | |
| | | ||||||
| * | 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 | |
| |\ \ \ | ||||||
 |
index : rails.git | |
| Mirror of official rails repo with custom fixes. | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |