Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | Fixed tests (and the weird assumption that no logger would mean that the ↵ | David Heinemeier Hansson | 2008-04-30 | 2 | -20/+8 | |
| | | | | code wasnt run) | |||||
* | Added test for has_one partial rendering (keeran) [#43 state:resolved] | David Heinemeier Hansson | 2008-04-30 | 3 | -1/+20 | |
| | ||||||
* | Fixed render :partial => @collection.named_scope (nkallen) [#61 state:resolved] | David Heinemeier Hansson | 2008-04-30 | 3 | -11/+9 | |
| | ||||||
* | Implement increment/decrement on cache storage engines, using read/write by ↵ | Tobias Lütke | 2008-04-29 | 1 | -3/+2 | |
| | | | | default and using atomic command on memcache | |||||
* | Clarify confusing ActionController::Base.allow_concurrency flag. | Jeremy Kemper | 2008-04-28 | 1 | -3/+4 | |
| | ||||||
* | Ruby 1.9 compat: force assert_select text encoding to the encoding of the ↵ | Jeremy Kemper | 2008-04-28 | 2 | -5/+15 | |
| | | | | regexp it's matching against. | |||||
* | Fixed that BenchmarkHelper should use controller.logger instead of @logger ↵ | David Heinemeier Hansson | 2008-04-27 | 1 | -3/+5 | |
| | | | | (which now apparently is gone) | |||||
* | Added ActionController::TestCase#rescue_action_in_public! to control whether ↵ | David Heinemeier Hansson | 2008-04-27 | 2 | -2/+23 | |
| | | | | the action under test should use the regular rescue_action path instead of simply raising the exception inline (great for error testing) [DHH] | |||||
* | Changing "and" to && whereever I catch it | David Heinemeier Hansson | 2008-04-27 | 1 | -1/+1 | |
| | ||||||
* | Pass template object to Handler#compile | Pratik Naik | 2008-04-24 | 4 | -4/+4 | |
| | ||||||
* | Make sure member names aren't mistakenly set to nil when providing :path_names | Eugene Pimenov | 2008-04-23 | 2 | -8/+39 | |
| | | | | | | [#19 state:resolved] Signed-off-by: Michael Koziarski <michael@koziarski.com> | |||||
* | Delegate ivars to controller instead of copying | Pratik Naik | 2008-04-21 | 4 | -10/+23 | |
| | | | | | Reduce number of instance variables being copied from controller to view. Instead, delegate them to controller instance. | |||||
* | select_datetime and select_time default to Time.zone.now when ↵ | gbuesing | 2008-04-21 | 3 | -2/+22 | |
| | | | | config.time_zone is set | |||||
* | datetime_select defaults to Time.zone.now when config.time_zone is set | gbuesing | 2008-04-21 | 3 | -1/+39 | |
| | ||||||
* | Remove ActionController::Base#view_controller_internals | Pratik Naik | 2008-04-21 | 4 | -45/+8 | |
| | | | | | | Get rid of ActionController::Base#view_controller_internals flag and use @@protected_view_variables for storing the list of controller specific instance variables which should be inaccessible inside views. | |||||
* | Remove ActionController::Base#add_class_variables_to_assigns | Pratik Naik | 2008-04-21 | 1 | -7/+0 | |
| | ||||||
* | Add conditional options to caches_page method [#25 state:resolved] | Paul Horsfall | 2008-04-19 | 3 | -3/+20 | |
| | | | | Signed-off-by: Joshua Peek <josh@joshpeek.com> | |||||
* | Remove unused ignore_missing_templates option | Pratik Naik | 2008-04-19 | 2 | -5/+1 | |
| | ||||||
* | Introduce ActionView::TestCase for testing view helpers. | Joshua Peek | 2008-04-19 | 21 | -131/+190 | |
| | ||||||
* | Move missing template logic to ActionView | Pratik Naik | 2008-04-19 | 13 | -31/+25 | |
| | ||||||
* | Introduce ActionView::InlineTemplate class | Pratik Naik | 2008-04-19 | 7 | -18/+37 | |
| | ||||||
* | Refactor Dispatcher callbacks to remove unnecessary Dependencies checks in ↵ | Pratik Naik | 2008-04-18 | 2 | -78/+50 | |
| | | | | production environment. | |||||
* | Tidy up ActiveSupport::Callbacks::CallbackChain instance API. | Joshua Peek | 2008-04-17 | 2 | -4/+4 | |
| | ||||||
* | Stub out Dispatcher#log_failsafe_exception method to please the test gods. | Joshua Peek | 2008-04-15 | 1 | -3/+6 | |
| | ||||||
* | Merge branch 'master' of git://github.com/stephencelis/rails | Joshua Peek | 2008-04-14 | 4 | -11/+13 | |
|\ | ||||||
| * | Scripts and styles with multiple dots in the filename should cache | Stephen Celis | 2008-04-12 | 4 | -11/+13 | |
| | | ||||||
* | | Added Rails.public_path to control where HTML and assets are expected to be ↵ | David Heinemeier Hansson | 2008-04-13 | 5 | -9/+25 | |
|/ | | | | loaded from (defaults to Rails.root + "/public") #11581 [nicksieger] | |||||
* | Merge branch 'master' into custom_paths_for_resource_names | Michael Koziarski | 2008-04-12 | 2 | -7/+8 | |
|\ | ||||||
| * | stub the instance method, there is no class method | Jeremy Kemper | 2008-04-11 | 1 | -1/+1 | |
| | | ||||||
| * | Ruby 1.9 compat: workaround module_eval issue | Jeremy Kemper | 2008-04-11 | 1 | -6/+7 | |
| | | ||||||
* | | Allow alternative values for the 'new' and 'edit' actions in resourceful routes. | Michael Koziarski | 2008-04-12 | 3 | -3/+28 | |
|/ | | | | | | map.resource :schools, :as => 'escuelas', :path_names => { :new => 'nueva' } Closes #11181. [ivanvr] | |||||
* | Fixed that formatted_polymorphic_route should be able to take the :format as ↵ | David Heinemeier Hansson | 2008-04-11 | 2 | -4/+19 | |
| | | | | part of a single hash or as the option hash (references #8741) | |||||
* | Automatically parse posted JSON content for Mime::JSON requests. [rick] | Rick Olson | 2008-04-08 | 5 | -8/+47 | |
| | | | | git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@9242 5ecf4fe2-1ee6-0310-87b1-e25e094e27de | |||||
* | add json_escape ERB util to escape html entities in json strings that are ↵ | Rick Olson | 2008-04-08 | 3 | -14/+30 | |
| | | | | | | output in HTML pages. [rick] git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@9241 5ecf4fe2-1ee6-0310-87b1-e25e094e27de | |||||
* | Provide a helper proxy to access helper methods from outside views. Closes ↵ | Josh Peek | 2008-04-06 | 3 | -0/+28 | |
| | | | | | | #10839 [Josh Peek] git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@9234 5ecf4fe2-1ee6-0310-87b1-e25e094e27de | |||||
* | Improve documentation. | Pratik Naik | 2008-04-05 | 4 | -7/+9 | |
| | | | | git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@9226 5ecf4fe2-1ee6-0310-87b1-e25e094e27de | |||||
* | Replaced callback method evaluation in AssociationCollection class to use ↵ | Josh Peek | 2008-04-04 | 1 | -2/+8 | |
| | | | | | | ActiveSupport::Callbacks. Modified ActiveSupport::Callbacks::Callback#call to accept multiple arguments. git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@9225 5ecf4fe2-1ee6-0310-87b1-e25e094e27de | |||||
* | Ensure RJS redirect_to doesn't html-escapes string argument. Closes #8546 | Pratik Naik | 2008-04-02 | 4 | -1/+26 | |
| | | | | git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@9212 5ecf4fe2-1ee6-0310-87b1-e25e094e27de | |||||
* | Ruby 1.9 compat: toplevel AS reference within BasicObject | Jeremy Kemper | 2008-04-01 | 1 | -1/+1 | |
| | | | | git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@9195 5ecf4fe2-1ee6-0310-87b1-e25e094e27de | |||||
* | Ruby 1.9 compat: encoding and multibyte test fixes | Jeremy Kemper | 2008-04-01 | 3 | -28/+28 | |
| | | | | git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@9194 5ecf4fe2-1ee6-0310-87b1-e25e094e27de | |||||
* | Ruby 1.9 compat: proc arity | Jeremy Kemper | 2008-04-01 | 1 | -4/+4 | |
| | | | | git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@9190 5ecf4fe2-1ee6-0310-87b1-e25e094e27de | |||||
* | style & whitespace | Jeremy Kemper | 2008-04-01 | 1 | -8/+4 | |
| | | | | git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@9189 5ecf4fe2-1ee6-0310-87b1-e25e094e27de | |||||
* | Ruby 1.9 compat: don't confuse with headers method call | Jeremy Kemper | 2008-04-01 | 1 | -3/+3 | |
| | | | | git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@9188 5ecf4fe2-1ee6-0310-87b1-e25e094e27de | |||||
* | Ruby 1.9: no args is 0 arity, not -1 as in 1.8 | Jeremy Kemper | 2008-04-01 | 1 | -2/+2 | |
| | | | | git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@9187 5ecf4fe2-1ee6-0310-87b1-e25e094e27de | |||||
* | Remove unnecessary arguments. References #11491. | Pratik Naik | 2008-04-01 | 1 | -4/+4 | |
| | | | | git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@9179 5ecf4fe2-1ee6-0310-87b1-e25e094e27de | |||||
* | Missed adds. References #11491. | Jeremy Kemper | 2008-04-01 | 2 | -0/+2 | |
| | | | | git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@9178 5ecf4fe2-1ee6-0310-87b1-e25e094e27de | |||||
* | Support render :partial => collection of heterogeneous elements. Closes #11491. | Jeremy Kemper | 2008-04-01 | 5 | -10/+63 | |
| | | | | git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@9177 5ecf4fe2-1ee6-0310-87b1-e25e094e27de | |||||
* | Removed the default .htaccess configuration as there are so many good ↵ | David Heinemeier Hansson | 2008-03-29 | 1 | -1/+1 | |
| | | | | | | deployment options now (kept it as an example in README) [DHH] git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@9134 5ecf4fe2-1ee6-0310-87b1-e25e094e27de | |||||
* | Revert spurious commit from [9126] | Jeremy Kemper | 2008-03-29 | 1 | -6/+4 | |
| | | | | git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@9128 5ecf4fe2-1ee6-0310-87b1-e25e094e27de | |||||
* | Fix new migration versions | David Heinemeier Hansson | 2008-03-28 | 1 | -4/+6 | |
| | | | | git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@9126 5ecf4fe2-1ee6-0310-87b1-e25e094e27de |