| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | we raise a subclass of LoadError, so rescue that | Aaron Patterson | 2012-06-14 | 1 | -1/+6 |
| | | |||||
| * | Add a test case for layout nil. | José Valim | 2012-03-28 | 1 | -1/+15 |
| | | |||||
| * | use consistent explicit module inclusion | Luke Gruber | 2012-03-16 | 3 | -6/+6 |
| | | | | | aid ease of understanding and readability for tests | ||||
| * | allow zero-arity proc for AbstrController::layout | Luke Gruber | 2012-03-15 | 1 | -0/+33 |
| | | | | | | proc without parameters can now be given to AbstractController::layout | ||||
| * | Add missing require | Santiago Pastorino | 2012-03-10 | 1 | -0/+1 |
| | | |||||
| * | AbstractController.action_methods should return a Set | Santiago Pastorino | 2012-03-10 | 1 | -1/+1 |
| | | |||||
| * | Fix layout lookup for anonymous controller | Alexey Vakhov | 2012-02-28 | 1 | -0/+12 |
| | | |||||
| * | AP tests should inherit from AS::TestCase | Aaron Patterson | 2012-01-05 | 1 | -2/+2 |
| | | |||||
| * | Remove deprecated layout lookup. | José Valim | 2011-12-20 | 1 | -12/+3 |
| | | |||||
| * | Deprecate implicit layout lookup in favor of inheriting the _layout config. | José Valim | 2011-12-09 | 1 | -2/+2 |
| | | |||||
| * | Allow layout fallback when using `layout` method | Prem Sichanugrist | 2011-12-06 | 1 | -1/+49 |
| | | | | | | | | | | | | | 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. | ||||
| * | Deprecate passing the template handler in the template name. | José Valim | 2011-09-22 | 1 | -3/+3 |
| | | | | | | | For example, calling hello.erb is now deprecated. Since Rails 3.0 passing the handler had no effect whatsover. This commit simply deprecates such cases so we can clean up the code in later releases. | ||||
| * | Merge pull request #1644 from smartinez87/warns | Santiago Pastorino | 2011-06-10 | 1 | -1/+1 |
| |\ | | | | | Remove unused variable causing warning in 1.9.3 | ||||
| | * | Remove unused variable causing warning in 1.9.3 | Sebastian Martinez | 2011-06-10 | 1 | -1/+1 |
| | | | |||||
| * | | class WithSymbolReturningString is not used anywhere in the test. | Neeraj Singh | 2011-06-08 | 1 | -12/+0 |
| |/ | | | | | | | | | | | Secondly it seemed from the method that the intent was to test a case where layout was declared in a symbol and the method named mention in layout returns nil. That case is already covered with class class WithSymbolReturningNil . Also the case of SymbolReturningString is covered with the class WithSymbol. | ||||
| * | Make test meaningful | Neeraj Singh | 2011-06-08 | 1 | -1/+1 |
| | | | | | | | | | | | If before_filter list was being called mistakenly then the test should fail. However test will not fail because second filter is assigning new values to @list. To truly test that first before_filter is not called when it should not be called then @list should not assigned value unconditionally. This patch will make the test fail if first filter is called. | ||||
| * | Merge pull request #1549 from neerajdotname/rename_to_method_for_action | José Valim | 2011-06-08 | 1 | -2/+2 |
| |\ | | | | | test name should reflect the name of the method | ||||
| | * | test name should reflect the name of the method | Neeraj Singh | 2011-06-08 | 1 | -2/+2 |
| | | | | | | | | | that is actually being called | ||||
| * | | remove unused class from test | Neeraj Singh | 2011-06-08 | 1 | -6/+0 |
| |/ | |||||
| * | removing usesless variable assignments | Aaron Patterson | 2011-01-18 | 1 | -14/+14 |
| | | |||||
| * | process_action accepts multiple args, even with Callbacks. | Nick Sutterer | 2010-12-29 | 1 | -0/+21 |
| | | |||||
| * | #948 template_inheritance | artemave | 2010-12-26 | 2 | -9/+9 |
| | | |||||
| * | Avoid (@_var ||= nil) pattern by using initialize methods and ensuring ↵ | José Valim | 2010-09-29 | 1 | -1/+1 |
| | | | | | everyone calls super as expected. | ||||
| * | Fix more warnings by defining variables and using instance_variable_defined? ↵ | Emilio Tagua | 2010-09-28 | 1 | -2/+4 |
| | | | | | instead instance_variable_get. | ||||
| * | Add clear_helpers as a way to clean up all helpers added to this controller, ↵ | José Valim | 2010-08-26 | 1 | -2/+19 |
| | | | | | maintaing just the helper with the same name as the controller. | ||||
| * | Deletes trailing whitespaces (over text files only find * -type f -exec sed ↵ | Santiago Pastorino | 2010-08-14 | 3 | -54/+54 |
| | | | | | 's/[ \t]*$//' -i {} \;) | ||||
| * | Reload action_methods in AbstractController after defining new method. | Piotr Sarnacki | 2010-08-04 | 1 | -0/+14 |
| | | | | | Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
| * | Fix setting helpers_path to a string or pathname | Jeremy Kemper | 2010-07-07 | 1 | -1/+1 |
| | | |||||
| * | Ensure overwritten callbacks conditions in controllers work [#4761 ↵ | José Valim | 2010-06-22 | 1 | -2/+12 |
| | | | | | state:resolved] [#3913 state:resolved] | ||||
| * | Use assert_respond_to because it has better error messaging | Neeraj Singh | 2010-05-18 | 1 | -4/+4 |
| | | | | | | | [#4628 state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
| * | Whitespace | wycats | 2010-04-04 | 1 | -34/+33 |
| | | |||||
| * | render_to_string should have the identical signature as render | wycats | 2010-04-04 | 1 | -0/+10 |
| | | |||||
| * | Allow anything that responds to render to be given as :template and use ↵ | José Valim | 2010-03-12 | 1 | -104/+52 |
| | | | | | find_template instead of find in views. | ||||
| * | Move details to lookup_context and make resolvers use the cache key. | José Valim | 2010-03-08 | 1 | -41/+1 |
| | | |||||
| * | More refactoring on the views side of rendering. | José Valim | 2010-03-08 | 2 | -51/+84 |
| | | |||||
| * | Finally moved the find template logic to the views. | José Valim | 2010-03-08 | 1 | -2/+2 |
| | | |||||
| * | Move layout lookup to views. | José Valim | 2010-03-08 | 1 | -1/+1 |
| | | |||||
| * | Added template lookup responsible to hold all information used in template ↵ | José Valim | 2010-03-07 | 1 | -57/+0 |
| | | | | | lookup. | ||||
| * | Renamed LocalizedCache to DetailsCache. | José Valim | 2010-02-24 | 1 | -1/+1 |
| | | |||||
| * | deOMGifying Railties, Active Support, and Action Pack | Mikel Lindsaar | 2010-01-31 | 1 | -9/+9 |
| | | |||||
| * | Added :format and :locale options to render. | José Valim | 2010-01-29 | 1 | -1/+40 |
| | | |||||
| * | Fix rendering of layouts. | José Valim | 2010-01-29 | 1 | -3/+3 |
| | | |||||
| * | ActionMailer should depend just on AbstractController. | José Valim | 2010-01-29 | 1 | -272/+0 |
| | | |||||
| * | Merge remote branch 'fxn/master' | Jeremy Kemper | 2010-01-26 | 1 | -1/+0 |
| |\ | |||||
| | * | deletes no void files removal.rb and class_test.rb | Xavier Noria | 2010-01-26 | 1 | -1/+0 |
| | | | |||||
| * | | Bring layouts with proc back alive. | José Valim | 2010-01-26 | 1 | -1/+15 |
| | | | |||||
| * | | Merge branch 'master' of git://github.com/rails/rails | José Valim and Mikel Lindsaar | 2010-01-25 | 1 | -1/+1 |
| |\| | | | | | | | | | | | Conflicts: actionmailer/lib/action_mailer/mail_helper.rb railties/lib/rails/configuration.rb | ||||
| | * | Fix failing tests after merge. | José Valim | 2010-01-24 | 1 | -1/+1 |
| | | | |||||
| * | | Added AbstractController::Collector. | José Valim and Mikel Lindsaar | 2010-01-23 | 1 | -0/+57 |
| |/ | |||||
| * | Ensure strings given to render with slash are rendered relative to the ↵ | José Valim | 2010-01-22 | 1 | -5/+30 |
| | | | | | configured _prefix. | ||||
 |
index : rails.git | |
| Mirror of official rails repo with custom fixes. | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |