Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Fix copying migrations to empty directory | Piotr Sarnacki | 2010-09-03 | 3 | -1/+15 |
| | |||||
* | rake db:copy_migrations task, which copies railties migrations into ↵ | Piotr Sarnacki | 2010-09-03 | 1 | -0/+22 |
| | | | | application's db/migrate directory | ||||
* | Implemented ActiveRecord::Migrations#copy based on James Adam's idea | Piotr Sarnacki | 2010-09-03 | 11 | -25/+265 |
| | | | | | | | | | | | | | | | ActiveRecord::Migration#copy allows to copy migrations from one place to another, changing migrations versions and adding scope to filename. For example: ActiveRecord::Migration.copy("db/migrate", :blog_engine => "vendor/gems/blog/db/migrate") will copy all migrations from vendor/gems/blog/db/migrate to db/migrate with such format: Versions of copied migrations will be reversioned to be appended after migrations that already exists in db/migrate | ||||
* | Added Rails.application.config.paths.db.migrate to remove hardcoded ↵ | Piotr Sarnacki | 2010-09-03 | 2 | -10/+13 |
| | | | | db/migrate paths | ||||
* | Merge remote branch 'docrails/master' | Xavier Noria | 2010-09-03 | 5 | -23/+23 |
|\ | |||||
| * | Use new finders syntax in docs. | Emilio Tagua | 2010-09-01 | 5 | -23/+23 |
| | | |||||
* | | A few schema changes for the SQL Server adapter. | Ken Collins | 2010-09-03 | 1 | -3/+3 |
| | | | | | | | | Signed-off-by: Michael Koziarski <michael@koziarski.com> | ||||
* | | Revert "Setup explicit requires for files with exceptions. Removed them from ↵ | José Valim | 2010-09-02 | 4 | -5/+0 |
| | | | | | | | | | | | | | | | | autoloading." Booting a new Rails application does not work after this commit [#5359 state:open] This reverts commit 38a421b34d0b414564e919f67d339fac067a56e6. | ||||
* | | Setup explicit requires for files with exceptions. Removed them from ↵ | Łukasz Strzałkowski | 2010-09-02 | 4 | -0/+5 |
| | | | | | | | | | | | | autoloading. Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
* | | remove use of echo [#4410 state:resolved] | Greg Hazel | 2010-09-02 | 1 | -2/+2 |
| | | | | | | | | Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
* | | Reset default scope in Thread.current when class is unloaded [#5497 ↵ | Andrew White | 2010-09-01 | 2 | -0/+23 |
| | | | | | | | | | | | | state:resolved] Signed-off-by: Xavier Noria <fxn@hashref.com> | ||||
* | | Fix test: this should return 0 not 7, since Arel was ignoring select clause ↵ | Emilio Tagua | 2010-09-01 | 1 | -1/+1 |
| | | | | | | | | | | | | and now it's fixed. Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
* | | split out active_record migration logic so others can easily reuse [#5389 ↵ | Jack Dempsey | 2010-09-01 | 2 | -10/+17 |
| | | | | | | | | | | | | state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
* | | nested attributes tests should rely on associated objects to verify results ↵ | Subba Rao Pasupuleti | 2010-09-01 | 1 | -57/+64 |
|/ | | | | | | not on assert_difference [#5206 state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
* | Make all the Relation finder methods consistent | Pratik Naik | 2010-08-31 | 1 | -32/+67 |
| | |||||
* | Merge remote branch 'miloops/rails_master_fixes' | Pratik Naik | 2010-08-31 | 1 | -15/+26 |
|\ | |||||
| * | Avoid calling build_where is no argument is given. | Emilio Tagua | 2010-08-31 | 1 | -1/+1 |
| | | |||||
| * | Improved conditionals usage to prevent calling methods. | Emilio Tagua | 2010-08-31 | 1 | -8/+19 |
| | | |||||
| * | Don't test conditional in iteration if it is not present just clone it. | Emilio Tagua | 2010-08-31 | 1 | -9/+9 |
| | | |||||
* | | Remove default values for Relation#limit/offset/from/create_with | Pratik Naik | 2010-08-31 | 1 | -4/+4 |
| | | |||||
* | | Change relation merging to always append select, group and order values | Pratik Naik | 2010-08-31 | 5 | -55/+28 |
|/ | |||||
* | replacing superclass_delegating_accessor with class_attribute | Neeraj Singh | 2010-08-31 | 1 | -6/+6 |
| | | | | Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
* | Replacing superclass_delegating_accessoror with class_attribute. | Neeraj Singh | 2010-08-31 | 1 | -1/+1 |
| | | | | | | | :store_full_sti_class will have value true or false so there is no danger of mutability here. Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
* | Replacing superclass_delegating_accessoror with class_attribute. | Neeraj Singh | 2010-08-31 | 1 | -1/+1 |
| | | | | | | | :partial_attributes will have value true or false so there is no danger of mutability here. Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
* | resolves merge conflict | Xavier Noria | 2010-08-31 | 1 | -3/+0 |
|\ | |||||
| * | The call-seq directive has no useful effect on our documentation and is not ↵ | Joost Baaij | 2010-08-28 | 1 | -3/+0 |
| | | | | | | | | | | | | | | | | | | | | | | used anywhere else. Worse still, its use breaks some rdoc, replacing method names with a curly brace. Having just one call-seq directive doesn't add anything since this is covered by regular rdoc. Having multiple might make sense, but these are already documented with examples. This partly re-reverts 60de0e56b7f57f0052d7e4f43bd2ef9e363c6a1a but does not touch the vendorized code in html-scanner. | ||||
* | | Update CHANGELOGs for 3.0 release and upcoming 3.1 | Jeremy Kemper | 2010-08-29 | 1 | -16/+2 |
| | | |||||
* | | Bump arel to 1.0.1 | Jeremy Kemper | 2010-08-29 | 1 | -1/+1 |
| | | |||||
* | | Depend on ARel 1.0 w/ tiny fixes | David Heinemeier Hansson | 2010-08-29 | 1 | -1/+1 |
| | | |||||
* | | PERF: Avoid two method calls | Santiago Pastorino | 2010-08-28 | 1 | -1/+1 |
| | | |||||
* | | Clean up CHANGELOGs | Jeremy Kemper | 2010-08-28 | 1 | -0/+10 |
| | | |||||
* | | Fixing typo [#5485 state:resolved] | Thiago Pradi | 2010-08-28 | 1 | -1/+1 |
|/ | | | | Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
* | Fix em_mysql2 error in rake db:create | Sam Aarons | 2010-08-27 | 1 | -1/+1 |
| | | | | Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
* | change 'a SQL' to 'an SQL' as suggested by the api documentation guidelines | Jaime Iniesta | 2010-08-26 | 1 | -2/+2 |
| | |||||
* | lifecycle should be two words, life cycle | Jaime Iniesta | 2010-08-26 | 5 | -6/+6 |
| | |||||
* | Merge remote branch 'docrails/master' | Xavier Noria | 2010-08-26 | 1 | -8/+6 |
|\ | |||||
| * | minor formatting fixes | Neeraj Singh | 2010-08-25 | 1 | -8/+6 |
| | | |||||
* | | Catch mysql2 access denied errors in rake db:create [#5432 state:resolved] | Andrew White | 2010-08-25 | 1 | -2/+4 |
| | | | | | | | | Signed-off-by: Xavier Noria <fxn@hashref.com> | ||||
* | | use blank? instead of present?, mark SQL literals as SQL literals | Aaron Patterson | 2010-08-25 | 1 | -5/+5 |
| | | | | | | | | | | | | Conflicts: activerecord/lib/active_record/relation/query_methods.rb | ||||
* | | no need to send on a public method | Aaron Patterson | 2010-08-25 | 1 | -1/+1 |
| | | |||||
* | | refactor select { is_a? } to grep() | Aaron Patterson | 2010-08-25 | 1 | -1/+1 |
| | | |||||
* | | mark SQL literals as SQL literals | Aaron Patterson | 2010-08-25 | 1 | -1/+1 |
|/ | |||||
* | :nodoc:s #unscoped until its behavior is more clear, now sometimes works, ↵ | Xavier Noria | 2010-08-25 | 1 | -1/+1 |
| | | | | sometimes not | ||||
* | edit pass to a recent doc patch | Xavier Noria | 2010-08-25 | 1 | -3/+10 |
| | |||||
* | Merge remote branch 'docrails/master' | Xavier Noria | 2010-08-25 | 2 | -2/+11 |
|\ | |||||
| * | touch operationg if used along with belongs_to will also be invoked on ↵ | Neeraj Singh | 2010-08-24 | 1 | -2/+6 |
| | | | | | | | | associated objects | ||||
| * | unscoped does not work when chained with named_scope | Neeraj Singh | 2010-08-23 | 1 | -0/+5 |
| | | |||||
* | | @user.touch should not fail if User does not have updated_at/updated_on column. | Neeraj Singh | 2010-08-24 | 2 | -10/+18 |
| | | | | | | | | | | | | [#5439 state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
* | | fix broken relative links [#5415 state:committed] | Joost Baaij | 2010-08-24 | 1 | -1/+1 |
| | | | | | | | | Signed-off-by: Xavier Noria <fxn@hashref.com> | ||||
* | | Ensure timestamps are not generated when explicitly set to false [#5440 ↵ | José Valim | 2010-08-24 | 1 | -1/+1 |
| | | | | | | | | state:resolved] |