Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| | * | 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 | |||||
| * | | Merge branch 'master' of git://github.com/rails/rails | David Heinemeier Hansson | 2008-04-12 | 10 | -27/+107 | |
| |\ \ | ||||||
| * \ \ | Merge branch 'master' of git://github.com/rails/rails | David Heinemeier Hansson | 2008-04-11 | 4 | -45/+19 | |
| |\ \ \ | ||||||
| * | | | | Testing commits | David Heinemeier Hansson | 2008-04-10 | 1 | -2/+1 | |
| | | | | | ||||||
* | | | | | Incompatible Symbol#to_proc was reverted upstream | Jeremy Kemper | 2008-04-20 | 1 | -7/+0 | |
| | | | | | ||||||
* | | | | | Override incompatible 1.8.7p1 String#chars | Jeremy Kemper | 2008-04-19 | 1 | -0/+6 | |
| | | | | | ||||||
* | | | | | Feature check :force_encoding instead of RUBY_VERSION | Jeremy Kemper | 2008-04-19 | 2 | -2/+2 | |
| | | | | | ||||||
* | | | | | Override Ruby 1.8.7's incompatible Symbol#to_proc. | Jeremy Kemper | 2008-04-18 | 1 | -1/+8 | |
| |_|_|/ |/| | | | ||||||
* | | | | 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' 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 | 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 | |||||
* | 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 | |||||
* | Ensure that respond_to? considers dynamic finder methods. Closes #11538. ↵ | Pratik Naik | 2008-04-06 | 4 | -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 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 | |||||
* | Split associations_test.rb into multiple files based on association type. ↵ | Pratik Naik | 2008-04-06 | 7 | -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 Naik | 2008-04-06 | 3 | -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 Naik | 2008-04-06 | 6 | -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 Naik | 2008-04-06 | 10 | -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 Naik | 2008-04-05 | 5 | -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 Koziarski | 2008-04-05 | 1 | -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 changelog | Pratik Naik | 2008-04-05 | 4 | -4/+4 | |
| | | | | git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@9227 5ecf4fe2-1ee6-0310-87b1-e25e094e27de | |||||
* | Improve documentation. | Pratik Naik | 2008-04-05 | 30 | -115/+177 | |
| | | | | 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 | 4 | -32/+23 | |
| | | | | | | 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 | |||||
* | Make HABTM#create behave the same as << with after_add callbacks. Closes ↵ | Michael Koziarski | 2008-04-04 | 2 | -4/+18 | |
| | | | | | | #11374 [freels] git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@9224 5ecf4fe2-1ee6-0310-87b1-e25e094e27de |