aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* make events not use date and time to determine parent_of. fixes #5932タコ焼き仮面2012-06-183-11/+42
|
* Add CHANGELOG entry to composed_of removalRafael Mendonça França2012-06-181-0/+6
|
* Merge pull request #6743 from steveklabnik/remove_composed_ofRafael Mendonça França2012-06-1818-768/+9
|\ | | | | | | Removing composed_of
| * Removing composed_of from ActiveRecord.Steve Klabnik2012-06-1818-768/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This feature adds a lot of complication to ActiveRecord for dubious value. Let's talk about what it does currently: class Customer < ActiveRecord::Base composed_of :balance, :class_name => "Money", :mapping => %w(balance amount) end Instead, you can do something like this: def balance @balance ||= Money.new(value, currency) end def balance=(balance) self[:value] = balance.value self[:currency] = balance.currency @balance = balance end Since that's fairly easy code to write, and doesn't need anything extra from the framework, if you use composed_of today, you'll have to add accessors/mutators like that. Closes #1436 Closes #2084 Closes #3807
* | Merge pull request #6772 from yahonda/reset_sequence_name_oracleRafael Mendonça França2012-06-181-0/+2
|\ \ | |/ |/| ORA-02289: sequence does not exist for `SELECT "BLACK_JOKES_SEQ".NEXTVAL FROM dual`
| * Add ensure Joke.reset_sequence_nameYasuo Honda2012-06-191-0/+2
|/ | | | | to avoid ORA-02289: sequence does not exist for `SELECT "BLACK_JOKES_SEQ".NEXTVAL FROM dual`
* Merge branch 'eliminate_notice_messages'Carlos Antonio da Silva2012-06-185-5/+15
|\ | | | | | | Closes #6754
| * Change minimum (default) log level in PostgreSQL to warning.kennyj2012-06-185-5/+15
|/
* Require thor 0.15.3 onwardsJosé Valim2012-06-182-5/+2
|
* Merge branch 'dp_docs'Carlos Antonio da Silva2012-06-181-0/+92
|\ | | | | | | Closes #6697
| * Documentation for where and where! methods on relations.David Paschich2012-06-181-0/+92
| | | | | | | | Based on examples seen in the Rails test suite. [ci skip]
* | Merge pull request #6767 from frodsan/fix_sqlite_rake_testsRafael Mendonça França2012-06-174-6/+9
|\ \ | | | | | | fix invalid syntax and sqlite rake failing tests
| * | fix invalid syntax and sqlite rake failing testsFrancesco Rodriguez2012-06-184-6/+9
|/ /
* | Merge pull request #6766 from frodsan/refactor_db_tasksRafael Mendonça França2012-06-174-208/+226
|\ \ | | | | | | add :nodoc: to AR::Tasks and update to follow the coding conventions
| * | add :nodoc: to AR::Tasks and update to follow the coding conventionsFrancesco Rodriguez2012-06-184-208/+226
|/ /
* | Merge pull request #6765 from frodsan/fix_build_railtiesRafael Mendonça França2012-06-171-3/+3
|\ \ | | | | | | Fix build: check if sqlite3 file exists before remove
| * | check if sqlite3 file exists before removeFrancesco Rodriguez2012-06-181-3/+3
|/ /
* | Merge pull request #6761 from freelancing-god/db-rakeJon Leighton2012-06-1710-156/+983
|\ \ | | | | | | Get logic out of db rake tasks, and into classes and objects
| * | Rails is the default (but now override able) source for environment and path.Pat Allan2012-06-174-43/+57
| | |
| * | Cleaning up after some warnings, adding slightly higher-level tests.Pat Allan2012-06-176-9/+309
| | |
| * | One line db:create/db:drop tasks.Pat Allan2012-06-172-55/+50
| | | | | | | | | | | | | | | | | | Now isn't that better? And yes, I know that private has no impact on class methods - it's a visual distinction, not a technical one.
| * | db:drop and some of db:test:purge.Pat Allan2012-06-178-52/+243
| | |
| * | db:create for PostgreSQL pulled out into a class.Pat Allan2012-06-176-36/+99
| | |
| * | db:create for MySQL now much cleaner.Pat Allan2012-06-176-37/+230
| | |
| * | Confirm connection is not established if file exists.Pat Allan2012-06-171-1/+10
| | |
| * | A beginning of sorts.Pat Allan2012-06-174-12/+74
| | | | | | | | | | | | Minimal implementation that supports db:create SQLite replacement
* | | Merge pull request #6762 from frodsan/patch-3José Valim2012-06-171-2/+2
|\ \ \ | | | | | | | | bump AS deprecation_horizon to 4.1
| * | | bump AS deprecation_horizon to 4.1Francesco Rodríguez2012-06-171-2/+2
|/ / /
* | | Merge pull request #6760 from kennyj/bump_20120617Santiago Pastorino2012-06-172-2/+2
|\ \ \ | | | | | | | | Bump tzinfo gem.
| * | | Bump tzinfo gem.kennyj2012-06-172-2/+2
| | | |
* | | | Merge pull request #6759 from dylanahsmith/only-catch-standard-errorSantiago Pastorino2012-06-175-8/+8
|\ \ \ \ | | | | | | | | | | Avoid unnecessary catching of Exception instead of StandardError.
| * | | | Avoid unnecessary catching of Exception instead of StandardError.Dylan Smith2012-06-175-8/+8
| | | | |
* | | | | Merge pull request #6758 from caironoleto/masterJosé Valim2012-06-171-14/+14
|\ \ \ \ \ | |/ / / / |/| / / / | |/ / / Fixing load config in some tasks
| * / / Adding `load_config` task as dependency.Cairo Noleto2012-06-161-14/+14
|/ / / | | | | | | | | | Without this, some tasks won't load configurations like custom engines.
* | | Merge pull request #6755 from kennyj/remove_csv_supportRafael Mendonça França2012-06-162-1/+13
|\ \ \ | | | | | | | | Don't read csv file during executing db:fixtures:load.
| * | | Don't read csv file during executing db:fixtures:load.kennyj2012-06-172-1/+13
|/ / /
* | | Merge pull request #6752 from steveklabnik/fix_5680Rafael Mendonça França2012-06-163-4/+21
|\ \ \ | | | | | | | | Respect absolute paths in compute_source_path.
| * | | Respect absolute paths in compute_source_path.Steve Klabnik2012-06-163-4/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When using compute_source_path to determine the full path of an asset, if our source begins with '/', we don't want to include the directory. Examples are illustrative: > compute_source_path("foo", "stylesheets", "css") => "/Users/steve/src/my_app/public/stylesheets/foo.css" > compute_source_path("/foo", "stylesheets", "css") => "/Users/steve/src/my_app/public/foo.css" Before this patch, the second example would return the same as the first. Fixes #5680.
* | | | Merge pull request #6753 from schnittchen/patch-1José Valim2012-06-161-1/+1
|\ \ \ \ | | | | | | | | | | Documentation: "asynchronously" is misleading here
| * | | | Documentation: make it clearer that subscribers are not notified ↵Schnittchen2012-06-161-1/+1
|/ / / / | | | | | | | | | | | | asynchronously, but saved for later use.
* | | | Merge pull request #6748 from marcandre/dasherize_docRafael Mendonça França2012-06-151-1/+1
|\ \ \ \ | | | | | | | | | | Fix doc example for dasherize
| * | | | Fix doc example for dasherizeMarc-Andre Lafortune2012-06-151-1/+1
|/ / / /
* | | | TestCase does not need to be loaded when loading the frameworkAaron Patterson2012-06-152-2/+13
| | | |
* | | | no need to define methods in included hookJon Leighton2012-06-151-13/+13
| | | |
* | | | Fix deprecation warnings when using ↵Jon Leighton2012-06-152-3/+40
| | | | | | | | | | | | | | | | config.active_record.mass_assignment_sanitizer=
* | | | Fix observers with AR::ModelJon Leighton2012-06-154-3/+27
| | | |
* | | | Fix config.active_record.whitelist_attributes with AR::ModelJon Leighton2012-06-154-6/+44
| | | |
* | | | Simplify AR configuration code.Jon Leighton2012-06-1531-567/+356
| | | | | | | | | | | | | | | | | | | | Get rid of ActiveModel::Configuration, make better use of ActiveSupport::Concern + class_attribute, etc.
* | | | refactorJon Leighton2012-06-151-11/+5
| | | |
* | | | Merge pull request #6646 from kennyj/fix_3470Carlos Antonio da Silva2012-06-157-3/+35
|\ \ \ \ | |/ / / |/| | | Support unicode character route directly in config/routes.rb. Fix #3470.