aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | Stub out Dispatcher#log_failsafe_exception method to please the test gods.Joshua Peek2008-04-151-3/+6
| | | |
| * | | Merge branch 'master' of git://github.com/stephencelis/railsJoshua Peek2008-04-144-11/+13
| |\ \ \ | | |/ / | |/| / | | |/
| | * Scripts and styles with multiple dots in the filename should cacheStephen Celis2008-04-124-11/+13
| | |
| * | Added Rails.public_path to control where HTML and assets are expected to be ↵David Heinemeier Hansson2008-04-137-9/+35
| | | | | | | | | | | | loaded from (defaults to Rails.root + "/public") #11581 [nicksieger]
| * | Merge branch 'master' of git://github.com/rails/railsDavid Heinemeier Hansson2008-04-139-18/+107
| |\ \
| | * | Time#since behaves correctly when passed a Duration. Closes #11527 [kemiller]gbuesing2008-04-123-7/+63
| | |/
| | * Add #getutc alias for DateTime#utcgbuesing2008-04-123-0/+4
| | |
| | * Refactor TimeWithZone: don't send #since, #ago, #+, #-, #advance through ↵gbuesing2008-04-122-9/+20
| | | | | | | | | | | | method_missing
| * | Merge branch 'master' of git://github.com/rails/railsDavid Heinemeier Hansson2008-04-1210-27/+107
| |\ \
| * \ \ Merge branch 'master' of git://github.com/rails/railsDavid Heinemeier Hansson2008-04-114-45/+19
| |\ \ \
| * | | | Testing commitsDavid Heinemeier Hansson2008-04-101-2/+1
| | | | |
* | | | | Incompatible Symbol#to_proc was reverted upstreamJeremy Kemper2008-04-201-7/+0
| | | | |
* | | | | Override incompatible 1.8.7p1 String#charsJeremy Kemper2008-04-191-0/+6
| | | | |
* | | | | Feature check :force_encoding instead of RUBY_VERSIONJeremy Kemper2008-04-192-2/+2
| | | | |
* | | | | Override Ruby 1.8.7's incompatible Symbol#to_proc.Jeremy Kemper2008-04-181-1/+8
| |_|_|/ |/| | |
* | | | TimeWithZone respects config.active_support.use_standard_json_time_formatgbuesing2008-04-123-1/+14
| | | |
* | | | rake time:zones:local finds correct base utc offset for zones in the ↵Geoffrey Buesing2008-04-122-1/+6
| |_|/ |/| | | | | | | | Southern Hemisphere
* | | Merge branch 'master' into custom_paths_for_resource_namesMichael Koziarski2008-04-123-13/+17
|\ \ \
| * \ \ Merge branch 'master' of git@github.com:rails/railsMichael Koziarski2008-04-122-7/+8
| |\ \ \
| | * | | stub the instance method, there is no class methodJeremy Kemper2008-04-111-1/+1
| | | | |
| | * | | Ruby 1.9 compat: workaround module_eval issueJeremy Kemper2008-04-111-6/+7
| | | | |
| * | | | Allow freezing to specific releases with rake rails:freeze:edge ↵Michael Koziarski2008-04-121-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 Koziarski2008-04-123-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 ofDavid Dollar2008-04-112-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 Hansson2008-04-112-4/+19
| |/ |/| | | | | part of a single hash or as the option hash (references #8741)
* | Merge branch 'master' of git@github.com:rails/railsJeremy Kemper2008-04-103-16/+0
|\ \
| * | Revert "Ensure that save on child object fails for invalid belongs_to ↵Michael Koziarski2008-04-113-16/+0
| |/ | | | | | | | | | | association. Closes #11555. [rubyruy]" This reverts commit c67e985994362290308073ed2793dd8e7f2a76db.
* / rake rails:freeze:edge using ↵Jeremy Kemper2008-04-101-29/+19
|/ | | | http://dev.rubyonrails.org/archives/rails_edge.zip instead of Subversion
* Change validates_uniqueness_of :case_sensitive option default back to true ↵Rick Olson2008-04-102-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 Naik2008-04-103-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 instancesRick Olson2008-04-091-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 Olson2008-04-0915-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 Olson2008-04-083-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 Olson2008-04-085-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 Olson2008-04-083-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 Olson2008-04-085-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 appsRick Olson2008-04-081-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 Olson2008-04-085-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 Peek2008-04-072-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 Peek2008-04-072-1/+3
| | | | | | Closes #9176. [Catfish] git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@9236 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
* Ensure that respond_to? considers dynamic finder methods. Closes #11538. ↵Pratik Naik2008-04-064-13/+106
| | | | | | [floehopper] git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@9235 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
* Provide a helper proxy to access helper methods from outside views. Closes ↵Josh Peek2008-04-063-0/+28
| | | | | | #10839 [Josh Peek] git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@9234 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
* Split associations_test.rb into multiple files based on association type. ↵Pratik Naik2008-04-067-2382/+2445
| | | | | | [Pratik] git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@9233 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
* Ensure that save on parent object fails for invalid has_one association. ↵Pratik Naik2008-04-063-0/+27
| | | | | | Closes #10518. [Pratik] git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@9232 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
* Remove duplicate code from associations. [Pratik]Pratik Naik2008-04-066-164/+72
| | | | git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@9231 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
* Refactor HasManyThroughAssociation to inherit from HasManyAssociation. ↵Pratik Naik2008-04-0610-95/+301
| | | | | | Association callbacks and <association>_ids= now work with hm:t. Closes #11516 [rubyruy] git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@9230 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
* Ensure HABTM#create and HABTM#build do not load entire association. [Pratik]Pratik Naik2008-04-055-34/+48
| | | | git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@9229 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
* Avoid modifying the sendmail_settings hash when using the return path. ↵Michael Koziarski2008-04-051-2/+3
| | | | | | Closes #7572 [billkirtley] git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@9228 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
* Fix more typos and changelogPratik Naik2008-04-054-4/+4
| | | | git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@9227 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
* Improve documentation.Pratik Naik2008-04-0530-115/+177
| | | | git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@9226 5ecf4fe2-1ee6-0310-87b1-e25e094e27de