Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 |
| | |||||
* | Add example for default_url_options[:host] to generated mailers. | Mislav Marohnić | 2008-04-18 | 2 | -2/+9 |
| | | | | Signed-off-by: Joshua Peek <josh@joshpeek.com> | ||||
* | Merge branch 'master' of git@github.com:josh/rails | Joshua Peek | 2008-04-18 | 1 | -6/+5 |
|\ | |||||
| * | Slight optimization to CallbackChain#union and delete. | Joshua Peek | 2008-04-18 | 1 | -6/+5 |
| | | |||||
* | | Changed mailer generator to not use instance variables. | Mislav Marohnić | 2008-04-18 | 2 | -12/+12 |
| | | | | | | | | Signed-off-by: Joshua Peek <josh@joshpeek.com> | ||||
* | | Cleanup generator tests by extracting repeated code into ↵ | Mislav Marohnić | 2008-04-18 | 6 | -364/+227 |
|/ | | | | | | generator_test_helper. Add test for mailer generator. Signed-off-by: Joshua Peek <josh@joshpeek.com> | ||||
* | Refactor Dispatcher callbacks to remove unnecessary Dependencies checks in ↵ | Pratik Naik | 2008-04-18 | 5 | -89/+73 |
| | | | | production environment. | ||||
* | Tidy up ActiveSupport::Callbacks::CallbackChain instance API. | Joshua Peek | 2008-04-17 | 6 | -16/+54 |
| | |||||
* | Fix migrations when migrating to a specified version number with a fresh ↵ | Ian White | 2008-04-17 | 2 | -3/+12 |
| | | | | | | database [#1 state:resolved] Signed-off-by: Joshua Peek <josh@joshpeek.com> | ||||
* | Support options passed to ActiveSupport::Cache :mem_cache_store [#14 ↵ | jweiss | 2008-04-17 | 2 | -1/+15 |
| | | | | | | state:resolved] Signed-off-by: Joshua Peek <josh@joshpeek.com> | ||||
* | Ignore debug logs and ensure ActiveResource's log is cleaned up. | Joshua Peek | 2008-04-16 | 2 | -1/+1 |
| | |||||
* | 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 | 7 | -9/+35 |
| | | | | | | | | loaded from (defaults to Rails.root + "/public") #11581 [nicksieger] | ||||
* | | Merge branch 'master' of git://github.com/rails/rails | David Heinemeier Hansson | 2008-04-13 | 9 | -18/+107 |
|\ \ | |||||
| * | | Time#since behaves correctly when passed a Duration. Closes #11527 [kemiller] | gbuesing | 2008-04-12 | 3 | -7/+63 |
| |/ | |||||
| * | Add #getutc alias for DateTime#utc | gbuesing | 2008-04-12 | 3 | -0/+4 |
| | | |||||
| * | Refactor TimeWithZone: don't send #since, #ago, #+, #-, #advance through ↵ | gbuesing | 2008-04-12 | 2 | -9/+20 |
| | | | | | | | | method_missing | ||||
| * | TimeWithZone respects config.active_support.use_standard_json_time_format | gbuesing | 2008-04-12 | 3 | -1/+14 |
| | | |||||
| * | rake time:zones:local finds correct base utc offset for zones in the ↵ | Geoffrey Buesing | 2008-04-12 | 2 | -1/+6 |
| | | | | | | | | Southern Hemisphere | ||||
* | | Merge branch 'master' of git://github.com/rails/rails | David Heinemeier Hansson | 2008-04-12 | 10 | -27/+107 |
|\| | |||||
| * | Merge branch 'master' into custom_paths_for_resource_names | Michael Koziarski | 2008-04-12 | 3 | -13/+17 |
| |\ | |||||
| | * | Merge branch 'master' of git@github.com:rails/rails | 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 freezing to specific releases with rake rails:freeze:edge ↵ | Michael Koziarski | 2008-04-12 | 1 | -6/+9 |
| | |/ | | | | | | | | | | RELEASE=1.2.0 per-release zip files are generated automatically by git-archive on dev.rubyonrails.org. | ||||
| * / | 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] | ||||
| * | Now that we have gems:unpack and gems:build allowing for integration of | David Dollar | 2008-04-11 | 2 | -7/+43 |
| | | | | | | | | | | | | | | | | | | | | | | | | 100% of your gems into vendor/ it would be nice to have the ability to automatically unpack the full dependency tree of your specified gems. This patch adds the rake task gems:unpack:dependencies to do this. Usage: gems:unpack:dependencies # unpack all dependencies gems:unpack:dependencies GEM=foo # unpack all dependencies for gem foo | ||||
| * | 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) | ||||
* | | Merge branch 'master' of git://github.com/rails/rails | David Heinemeier Hansson | 2008-04-11 | 4 | -45/+19 |
|\| | |||||
| * | Merge branch 'master' of git@github.com:rails/rails | Jeremy Kemper | 2008-04-10 | 3 | -16/+0 |
| |\ | |||||
| | * | Revert "Ensure that save on child object fails for invalid belongs_to ↵ | Michael Koziarski | 2008-04-11 | 3 | -16/+0 |
| | | | | | | | | | | | | | | | | | | association. Closes #11555. [rubyruy]" This reverts commit c67e985994362290308073ed2793dd8e7f2a76db. | ||||
| * | | rake rails:freeze:edge using ↵ | Jeremy Kemper | 2008-04-10 | 1 | -29/+19 |
| |/ | | | | | | | http://dev.rubyonrails.org/archives/rails_edge.zip instead of Subversion | ||||
* / | Testing commits | David Heinemeier Hansson | 2008-04-10 | 1 | -2/+1 |
|/ | |||||
* | Change validates_uniqueness_of :case_sensitive option default back to true ↵ | Rick Olson | 2008-04-10 | 2 | -2/+4 |
| | | | | | | (from [9160]). Love your database columns, don't LOWER them. [rick] git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@9248 5ecf4fe2-1ee6-0310-87b1-e25e094e27de | ||||
* | Ensure that save on child object fails for invalid belongs_to association. ↵ | Pratik Naik | 2008-04-10 | 3 | -0/+16 |
| | | | | | | Closes #11555. [rubyruy] git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@9247 5ecf4fe2-1ee6-0310-87b1-e25e094e27de | ||||
* | Require rubygems if needed when initializing GemDependency instances | Rick Olson | 2008-04-09 | 1 | -0/+1 |
| | | | | git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@9245 5ecf4fe2-1ee6-0310-87b1-e25e094e27de | ||||
* | Add support for interleaving migrations by storing which migrations have run ↵ | Rick Olson | 2008-04-09 | 15 | -80/+204 |
| | | | | | | in the new schema_migrations table. Closes #11493 [jordi] git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@9244 5ecf4fe2-1ee6-0310-87b1-e25e094e27de | ||||
* | ActiveRecord::Base#sum defaults to 0 if no rows are returned. Closes #11550 ↵ | Rick Olson | 2008-04-08 | 3 | -1/+7 |
| | | | | | | [kamal] git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@9243 5ecf4fe2-1ee6-0310-87b1-e25e094e27de | ||||
* | 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 | ||||
* | Don't require rails/gem_builder during rails initialization, it's only ↵ | Rick Olson | 2008-04-08 | 5 | -7/+17 |
| | | | | | | needed for the gems:build task. [rick] git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@9240 5ecf4fe2-1ee6-0310-87b1-e25e094e27de | ||||
* | set ActiveSupport.escape_html_entities_in_json = false for new rails apps | Rick Olson | 2008-04-08 | 1 | -1/+5 |
| | | | | git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@9239 5ecf4fe2-1ee6-0310-87b1-e25e094e27de | ||||
* | Add config.active_support.escape_html_entities_in_json to allow disabling of ↵ | Rick Olson | 2008-04-08 | 5 | -4/+31 |
| | | | | | | html entity escaping. [rick] git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@9238 5ecf4fe2-1ee6-0310-87b1-e25e094e27de | ||||
* | Improve ActiveRecord::Base#table_name unit tests for nested classes. Closes ↵ | Josh Peek | 2008-04-07 | 2 | -0/+7 |
| | | | | | | #10289. [scott_willson] git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@9237 5ecf4fe2-1ee6-0310-87b1-e25e094e27de | ||||
* | script/performance/profiler compatibility with the ruby-prof >= 0.5.0. ↵ | Josh Peek | 2008-04-07 | 2 | -1/+3 |
| | | | | | | Closes #9176. [Catfish] git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@9236 5ecf4fe2-1ee6-0310-87b1-e25e094e27de |