| Commit message (Collapse) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| * | | Merge branch 'master' into sprockets | Joshua Peek | 2011-03-30 | 2 | -16/+19 | |
| |\| | | | | | | | | | Conflicts: railties/lib/rails/application/configuration.rb | |||||
| | * | Make action_method? public and change implicit rendering to override it instead. | José Valim | 2011-03-30 | 1 | -15/+18 | |
| | | | ||||||
| | * | Pass the proper method_name instead of hardcoding to action_name. | José Valim | 2011-03-29 | 1 | -1/+1 | |
| | | | | | | | | | | | | | Conflicts: actionpack/lib/action_controller/metal/implicit_render.rb | |||||
| * | | Merge branch 'master' into sprockets | Joshua Peek | 2011-03-30 | 1 | -1/+1 | |
| |\| | ||||||
| | * | Fix filter :only and :except with implicit actions | Andrew White | 2011-03-23 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | The method_name argument is "default_render" for implicit actions so use the action_name attribute to determine which callbacks to run. [#5673 state:resolved] | |||||
| * | | Copy use_sprockets config | Joshua Peek | 2011-03-29 | 1 | -2/+2 | |
| |/ | ||||||
| * | Change ActionView::ViewPathSet to ActionView::PathSet | Manuel Meurer | 2011-03-13 | 1 | -4/+4 | |
| | | ||||||
| * | render_to_string must ensure that response_body | Neeraj Singh | 2011-01-25 | 1 | -1/+1 | |
| | | | | | | | | | is nil [ #5875 state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com> | |||||
| * | Solve SystemStackError when changing locale inside ActionMailer [#5329 ↵ | José Valim | 2011-01-19 | 1 | -4/+5 | |
| | | | | | state:resolved] | |||||
| * | process_action accepts multiple args, even with Callbacks. | Nick Sutterer | 2010-12-29 | 1 | -1/+1 | |
| | | ||||||
| * | Speed up template inheritance and remove template inheritance option | wycats | 2010-12-26 | 1 | -16/+17 | |
| | | ||||||
| * | #948 make template inheritance optional | artemave | 2010-12-26 | 1 | -4/+12 | |
| | | ||||||
| * | #948 template_inheritance | artemave | 2010-12-26 | 2 | -6/+14 | |
| | | ||||||
| * | Rewording existing comment | Neeraj Singh | 2010-11-30 | 1 | -4/+3 | |
| | | ||||||
| * | Rewording existing comment | Neeraj Singh | 2010-11-29 | 1 | -6/+3 | |
| | | ||||||
| * | Avoid range object creation | Santiago Pastorino | 2010-11-20 | 1 | -1/+1 | |
| | | ||||||
| * | Fix indentation | Santiago Pastorino | 2010-11-19 | 1 | -1/+1 | |
| | | ||||||
| * | Don't merge just directly add to the action to the :partial key | Santiago Pastorino | 2010-11-19 | 1 | -1/+1 | |
| | | ||||||
| * | Useless assignation | Santiago Pastorino | 2010-11-19 | 1 | -1/+1 | |
| | | ||||||
| * | Remove inline comment. | José Valim | 2010-11-11 | 1 | -17/+17 | |
| | | ||||||
| * | Make after_filter halt when before_filter renders or redirects [#5648 ↵ | Marcelo Giorgi | 2010-11-11 | 1 | -0/+2 | |
| | | | | | | | state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com> | |||||
| * | Allow generated url helpers to be overriden [#5243 state:resolved] | Andrew White | 2010-10-26 | 1 | -5/+5 | |
| | | ||||||
| * | Add support to render :once. | José Valim | 2010-10-10 | 1 | -1/+1 | |
| | | | | | This will be used internally by sprockets to ensure requires are executed just once. | |||||
| * | Fix a few bugs when trying to use Head standalone | wycats | 2010-10-10 | 1 | -0/+1 | |
| | | ||||||
| * | render :template => 'foo/bar.json' now works as it should. | José Valim | 2010-10-07 | 1 | -1/+0 | |
| | | ||||||
| * | Make collection rendering faster. | José Valim | 2010-10-07 | 1 | -1/+1 | |
| | | ||||||
| * | oops, missed a uniq | Aaron Patterson | 2010-09-29 | 1 | -1/+1 | |
| | | ||||||
| * | dry up action_methods | Aaron Patterson | 2010-09-29 | 1 | -4/+4 | |
| | | ||||||
| * | no need to call e.class | Aaron Patterson | 2010-09-29 | 1 | -1/+1 | |
| | | ||||||
| * | Fix a small typo (ht: masterkain) | José Valim | 2010-09-29 | 1 | -1/+1 | |
| | | ||||||
| * | Avoid (@_var ||= nil) pattern by using initialize methods and ensuring ↵ | José Valim | 2010-09-29 | 3 | -5/+2 | |
| | | | | | everyone calls super as expected. | |||||
| * | Define @_layout if it is not defined. | Emilio Tagua | 2010-09-28 | 1 | -0/+1 | |
| | | ||||||
| * | Avoid more uninitialized variable warnings. | Emilio Tagua | 2010-09-28 | 1 | -1/+1 | |
| | | ||||||
| * | Refactor ActionMailer to not use hide_actions | Piotr Sarnacki | 2010-09-03 | 1 | -0/+28 | |
| | | ||||||
| * | Move ActionController::Railties::RoutesHelpers and ↵ | Piotr Sarnacki | 2010-09-03 | 1 | -0/+18 | |
| | | | | | ActionMailer::Railties::RoutesHelper to AbstractController::Railties::RoutesHelpers | |||||
| * | Add mounted_helpers to routes | Piotr Sarnacki | 2010-09-03 | 1 | -0/+1 | |
| | | | | | | | | | | | | | | | | | mounted_helpers are a bit similar to url_helpers. They're automatically included in controllers for Rails.application and each of mounted Engines. Mounted helper allows to call url_for and named helpers for given application. Given Blog::Engine mounted as blog_engine, there are 2 helpers defined: app and blog_engine. You can call routes for app and engine using those helpers: app.root_url app.url_for(:controller => "foo") blog_engine.posts_path blog_engine.url_for(@post) | |||||
| * | Ensure that inherited helper_methods are available after calling ↵ | Jesse Storimer | 2010-08-28 | 1 | -1/+11 | |
| | | | | | | | clear_helpers [#5348 state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com> | |||||
| * | Add clear_helpers as a way to clean up all helpers added to this controller, ↵ | José Valim | 2010-08-26 | 1 | -0/+7 | |
| | | | | | maintaing just the helper with the same name as the controller. | |||||
| * | fixed capitalization | Joost Baaij | 2010-08-25 | 1 | -8/+8 | |
| | | ||||||
| * | change rdoc to conform to api guidelines | Joost Baaij | 2010-08-25 | 5 | -57/+60 | |
| | | ||||||
| * | Deletes trailing whitespaces (over text files only find * -type f -exec sed ↵ | Santiago Pastorino | 2010-08-14 | 1 | -1/+1 | |
| | | | | | 's/[ \t]*$//' -i {} \;) | |||||
| * | Reload action_methods in AbstractController after defining new method. | Piotr Sarnacki | 2010-08-04 | 1 | -0/+12 | |
| | | | | | Signed-off-by: José Valim <jose.valim@gmail.com> | |||||
| * | Also move asset_path to AbstractController. | José Valim | 2010-07-24 | 1 | -1/+1 | |
| | | ||||||
| * | Move config_accessor :asset_host from ActionController::Base to ↵ | Jeroen van Dijk and Josh Kalderimis | 2010-07-24 | 1 | -1/+1 | |
| | | | | | | | | | AbstractController which fixes issues with asset_host in ActionMailer Including: - Moved mailer objects in separate directory - Added two tests for asset_host configuration option | |||||
| * | Unify routes naming by renaming router to routes | Piotr Sarnacki | 2010-07-02 | 1 | -2/+2 | |
| | | | | | Signed-off-by: José Valim <jose.valim@gmail.com> | |||||
| * | ActiveRecord and ActionPack now use the new descendants implementation. | José Valim | 2010-06-19 | 1 | -11/+2 | |
| | | ||||||
| * | Missing method error doesn't specify which controller it is missing from ↵ | Alan Harper | 2010-06-10 | 1 | -1/+1 | |
| | | | | | | | | | | [#4436 state:resolved] The error page shown when the method you are requesting on a controller doesn't specify which controller the method is missing from Signed-off-by: José Valim <jose.valim@gmail.com> | |||||
| * | class_attribute is not a direct replacement of class_inheritable_*. | José Valim | 2010-06-10 | 1 | -1/+2 | |
| | | | | | | | If you are setting a hash or an array in class_attribute or you need to freeze it, to ensure people won't modify it in place or you need to dup it on inheritance. | |||||
| * | Missed the extraction | David Heinemeier Hansson | 2010-06-03 | 1 | -0/+9 | |
| | | ||||||
| * | Changes made while working on upgrading cells to Rails 3 | wycats | 2010-06-03 | 2 | -0/+2 | |
| | | ||||||
 |
index : rails.git | |
| Mirror of official rails repo with custom fixes. | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |