Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Added test for case when view doesn't have logger method when using ↵ | Dmitry Vorotilin | 2012-06-19 | 1 | -0/+17 |
| | | | | ActionController::Metal controller. | ||||
* | Merge branch 'acapilleri-update_nested_attributes' | Rafael Mendonça França | 2012-06-19 | 2 | -5/+25 |
|\ | | | | | | | Closes #6675 | ||||
| * | Refactor the conditionals | Rafael Mendonça França | 2012-06-19 | 1 | -7/+7 |
| | | |||||
| * | Validates_numericality_of is skipped when changing 0 to to non-empty string | Angelo capilleri | 2012-06-19 | 2 | -5/+25 |
|/ | | | | | | | | | | This happens when A has_many many B and A accepts_nested_attributes B that has a numeric colum with initial 0 value. So a.update_attributes({:b_attributes => { :id => b.id, :numeric => 'foo' }}) passes the validation test but, the value of :numeric doesn't change. his commit forces that the update fails with the above conditions. Fixes #6393 Fixes #2331 | ||||
* | Merge pull request #5412 from tilsammans/stored_attributes | Carlos Antonio da Silva | 2012-06-18 | 3 | -2/+32 |
|\ | | | | | | | | | | | | | | | | | | | | | | | Added `stored_attributes` hash which contains the attributes stored using ActiveRecord::Store. This allows you to retrieve the list of attributes you've defined. class User < ActiveRecord::Base store :settings, accessors: [:color, :homepage] end User.stored_attributes[:settings] # [:color, :homepage] | ||||
| * | Refactor and use class_attribute | Carlos Antonio da Silva | 2012-06-18 | 2 | -7/+15 |
| | | |||||
| * | Remember the stored attributes in a config attribute. | Joost Baaij | 2012-06-18 | 3 | -1/+23 |
|/ | | | | | | This allows you to retrieve the list of attributes you've defined. Usable for e.g. selects in the view, or interators based on the attributes you wish to store in the serialized column. | ||||
* | Improve the CHANGELOG entry [ci skip] | Rafael Mendonça França | 2012-06-18 | 1 | -2/+19 |
| | |||||
* | Merge branch 'hash_with_indifferent_access_fix' | Carlos Antonio da Silva | 2012-06-18 | 2 | -1/+9 |
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The problem: Accessing a HashWithIndifferentAccess does not return the the same object that is stored in the hash (i.e. equal?) causing unexpected results: hash = HashWithIndifferentAccess.new {|h, k| h[k] = []} hash[:a] << 1 # => [1] hash[:a] # => [], expected [1] The cause: When a block is provided to generate default values the generated values are duped if they are arrays. The duped value is stored in the hash but the original value is returned when the hash is accessed. The fix: The duping is there for allowing frozen arrays containing hashes to be modified. The fix restricts the duping to this case. Note that if default function generates a frozen array an error will be raised on assignment before and after the patch. Closes #3811 | ||||
| * | Use map! instead of replace + map | Carlos Antonio da Silva | 2012-06-18 | 1 | -1/+1 |
| | | |||||
| * | Fix lookup on HashWithIndifferentAccess for array values. | Chris Zetter | 2012-06-18 | 2 | -1/+9 |
|/ | |||||
* | Refactor Relation#update a bit to avoid an extra Enumerator instance | Carlos Antonio da Silva | 2012-06-18 | 1 | -1/+1 |
| | |||||
* | Make DatabaseTasks a module with real private methods | Carlos Antonio da Silva | 2012-06-18 | 1 | -13/+14 |
| | |||||
* | Merge pull request #6775 from takoyakikamen/events | Aaron Patterson | 2012-06-18 | 3 | -11/+42 |
|\ | | | | | make events not use date and time to determine parent_of. fixes #5932 | ||||
| * | make events not use date and time to determine parent_of. fixes #5932 | タコ焼き仮面 | 2012-06-18 | 3 | -11/+42 |
|/ | |||||
* | Add CHANGELOG entry to composed_of removal | Rafael Mendonça França | 2012-06-18 | 1 | -0/+6 |
| | |||||
* | Merge pull request #6743 from steveklabnik/remove_composed_of | Rafael Mendonça França | 2012-06-18 | 18 | -768/+9 |
|\ | | | | | | | Removing composed_of | ||||
| * | Removing composed_of from ActiveRecord. | Steve Klabnik | 2012-06-18 | 18 | -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_oracle | Rafael Mendonça França | 2012-06-18 | 1 | -0/+2 |
|\ \ | |/ |/| | ORA-02289: sequence does not exist for `SELECT "BLACK_JOKES_SEQ".NEXTVAL FROM dual` | ||||
| * | Add ensure Joke.reset_sequence_name | Yasuo Honda | 2012-06-19 | 1 | -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 Silva | 2012-06-18 | 5 | -5/+15 |
|\ | | | | | | | Closes #6754 | ||||
| * | Change minimum (default) log level in PostgreSQL to warning. | kennyj | 2012-06-18 | 5 | -5/+15 |
|/ | |||||
* | Require thor 0.15.3 onwards | José Valim | 2012-06-18 | 2 | -5/+2 |
| | |||||
* | Merge branch 'dp_docs' | Carlos Antonio da Silva | 2012-06-18 | 1 | -0/+92 |
|\ | | | | | | | Closes #6697 | ||||
| * | Documentation for where and where! methods on relations. | David Paschich | 2012-06-18 | 1 | -0/+92 |
| | | | | | | | | Based on examples seen in the Rails test suite. [ci skip] | ||||
* | | Merge pull request #6767 from frodsan/fix_sqlite_rake_tests | Rafael Mendonça França | 2012-06-17 | 4 | -6/+9 |
|\ \ | | | | | | | fix invalid syntax and sqlite rake failing tests | ||||
| * | | fix invalid syntax and sqlite rake failing tests | Francesco Rodriguez | 2012-06-18 | 4 | -6/+9 |
|/ / | |||||
* | | Merge pull request #6766 from frodsan/refactor_db_tasks | Rafael Mendonça França | 2012-06-17 | 4 | -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 conventions | Francesco Rodriguez | 2012-06-18 | 4 | -208/+226 |
|/ / | |||||
* | | Merge pull request #6765 from frodsan/fix_build_railties | Rafael Mendonça França | 2012-06-17 | 1 | -3/+3 |
|\ \ | | | | | | | Fix build: check if sqlite3 file exists before remove | ||||
| * | | check if sqlite3 file exists before remove | Francesco Rodriguez | 2012-06-18 | 1 | -3/+3 |
|/ / | |||||
* | | Merge pull request #6761 from freelancing-god/db-rake | Jon Leighton | 2012-06-17 | 10 | -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 Allan | 2012-06-17 | 4 | -43/+57 |
| | | | |||||
| * | | Cleaning up after some warnings, adding slightly higher-level tests. | Pat Allan | 2012-06-17 | 6 | -9/+309 |
| | | | |||||
| * | | One line db:create/db:drop tasks. | Pat Allan | 2012-06-17 | 2 | -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 Allan | 2012-06-17 | 8 | -52/+243 |
| | | | |||||
| * | | db:create for PostgreSQL pulled out into a class. | Pat Allan | 2012-06-17 | 6 | -36/+99 |
| | | | |||||
| * | | db:create for MySQL now much cleaner. | Pat Allan | 2012-06-17 | 6 | -37/+230 |
| | | | |||||
| * | | Confirm connection is not established if file exists. | Pat Allan | 2012-06-17 | 1 | -1/+10 |
| | | | |||||
| * | | A beginning of sorts. | Pat Allan | 2012-06-17 | 4 | -12/+74 |
| | | | | | | | | | | | | Minimal implementation that supports db:create SQLite replacement | ||||
* | | | Merge pull request #6762 from frodsan/patch-3 | José Valim | 2012-06-17 | 1 | -2/+2 |
|\ \ \ | | | | | | | | | bump AS deprecation_horizon to 4.1 | ||||
| * | | | bump AS deprecation_horizon to 4.1 | Francesco Rodríguez | 2012-06-17 | 1 | -2/+2 |
|/ / / | |||||
* | | | Merge pull request #6760 from kennyj/bump_20120617 | Santiago Pastorino | 2012-06-17 | 2 | -2/+2 |
|\ \ \ | | | | | | | | | Bump tzinfo gem. | ||||
| * | | | Bump tzinfo gem. | kennyj | 2012-06-17 | 2 | -2/+2 |
| | | | | |||||
* | | | | Merge pull request #6759 from dylanahsmith/only-catch-standard-error | Santiago Pastorino | 2012-06-17 | 5 | -8/+8 |
|\ \ \ \ | | | | | | | | | | | Avoid unnecessary catching of Exception instead of StandardError. | ||||
| * | | | | Avoid unnecessary catching of Exception instead of StandardError. | Dylan Smith | 2012-06-17 | 5 | -8/+8 |
| | | | | | |||||
* | | | | | Merge pull request #6758 from caironoleto/master | José Valim | 2012-06-17 | 1 | -14/+14 |
|\ \ \ \ \ | |/ / / / |/| / / / | |/ / / | Fixing load config in some tasks | ||||
| * / / | Adding `load_config` task as dependency. | Cairo Noleto | 2012-06-16 | 1 | -14/+14 |
|/ / / | | | | | | | | | | Without this, some tasks won't load configurations like custom engines. | ||||
* | | | Merge pull request #6755 from kennyj/remove_csv_support | Rafael Mendonça França | 2012-06-16 | 2 | -1/+13 |
|\ \ \ | | | | | | | | | Don't read csv file during executing db:fixtures:load. | ||||
| * | | | Don't read csv file during executing db:fixtures:load. | kennyj | 2012-06-17 | 2 | -1/+13 |
|/ / / |