Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | warning fix : mismatched indentations at 'end' with 'case' | Arun Agrawal | 2012-03-06 | 1 | -1/+1 |
| | |||||
* | Fix #5069 - Protect foreign key from mass assignment throught association ↵ | Jean Boussier | 2012-03-05 | 3 | -1/+40 |
| | | | | builder | ||||
* | Merge pull request #5274 from tigrish/master | José Valim | 2012-03-05 | 2 | -1/+20 |
|\ | | | | | Update I18n defaults for activerecord.errors.messages.record_invalid | ||||
| * | Tweak ↵ | Christopher Dell | 2012-03-05 | 1 | -1/+2 |
| | | | | | | | | activerecord/test/cases/validations/i18n_generate_message_validation_test.rb | ||||
| * | Test that RecordInvalid exception's translation falls back to the :errors ↵ | Christopher Dell | 2012-03-05 | 1 | -0/+18 |
| | | | | | | | | namespace | ||||
| * | Allow translations of activerecord.errors.messages.record_invalid to be ↵ | Christopher Dell | 2012-03-05 | 1 | -1/+1 |
| | | | | | | | | looked up in errors.messages.record_invalid | ||||
* | | Whitelist all attribute assignment by default. | Michael Koziarski | 2012-03-05 | 2 | -0/+9 |
| | | | | | | | | Change the default for newly generated applications to whitelist all attribute assignment. Also update the generated model classes so users are reminded of the importance of attr_accessible. | ||||
* | | Fix message assertions for quoting database name in "show tables" for mysql | Carlos Antonio da Silva | 2012-03-04 | 2 | -2/+2 |
|/ | |||||
* | Merge pull request #5268 from carlosantoniodasilva/ar-new-record-warning | Jon Leighton | 2012-03-04 | 3 | -1/+10 |
|\ | | | | | Fix ActiveRecord warning in tests with Marshal | ||||
| * | Initialize @stale_state to nil in association | Carlos Antonio da Silva | 2012-03-04 | 3 | -6/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | This apparently fix the warning related to @new_record variable not being initialized in AR's test suit, when an association is built and the object is marshalled/loaded. See these tests in AR's base_test.rb: test_marshalling_with_associations test_marshalling_new_record_round_trip_with_associations Closes #3720. | ||||
| * | Added test case for new_record round trip with associations problem | kennyj | 2012-03-04 | 1 | -0/+14 |
| | | |||||
* | | tidy up formatting | Jon Leighton | 2012-03-04 | 1 | -10/+11 |
| | | |||||
* | | Merge pull request #5267 from kennyj/fix_4674 | Jon Leighton | 2012-03-04 | 2 | -5/+38 |
|\ \ | | | | | | | Fix GH #4674. Reset column information and sequence name when setting table_name. | ||||
| * | | Don't clear sequence name when we explicitly assign it. | kennyj | 2012-03-04 | 2 | -2/+15 |
| | | | |||||
| * | | Fix GH #4674. Reset column information and sequence name when setting ↵ | kennyj | 2012-03-04 | 2 | -4/+24 |
| | | | | | | | | | | | | table_name. | ||||
* | | | Fix GH #3163. Should quote database on mysql/mysql2. | kennyj | 2012-03-05 | 3 | -1/+22 |
|/ / | |||||
* | | Fix rake test_sqlite3_mem | Jon Leighton | 2012-03-04 | 1 | -7/+9 |
| | | |||||
* | | Remove unusused variables | Jon Leighton | 2012-03-04 | 3 | -14/+9 |
|/ | |||||
* | Merge pull request #5255 from carlosantoniodasilva/active-record-review | Piotr Sarnacki | 2012-03-03 | 8 | -68/+77 |
|\ | | | | | Refactor and cleanup in some ActiveRecord modules | ||||
| * | Refactor and cleanup in some ActiveRecord modules | Carlos Antonio da Silva | 2012-03-03 | 8 | -68/+77 |
| | | | | | | | | | | | | | | | | | | | | | | * Avoid double hash lookups in AR::Reflection when reflecting associations/aggregations * Minor cleanups: use elsif, do..end, if..else instead of unless..else * Simplify DynamicMatchers#respond_to? * Use "where" instead of scoped with conditions hash * Extract `scoped_by` method pattern regexp to constant * Extract noisy class_eval from method_missing in dynamic matchers * Extract readonly check, avoid calling column#to_s twice in persistence * Refactor predicate builder, remove some variables | ||||
* | | remove usages of AS::OrderedHash | Vishnu Atrai | 2012-03-03 | 1 | -1/+1 |
| | | |||||
* | | Merge pull request #4984 from raghunadhd/change_orderhash | Vijay Dev | 2012-03-03 | 3 | -3/+3 |
|\ \ | | | | | | | Refactored code | ||||
| * | | Refactored code | Raghunadh | 2012-02-10 | 3 | -3/+3 |
| | | | |||||
* | | | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2012-03-03 | 1 | -0/+3 |
|\ \ \ | |_|/ |/| | | |||||
| * | | Add documentation for IndexDefinition. | Waseem Ahmad | 2012-03-02 | 1 | -0/+3 |
| | | | |||||
* | | | only log an error if there is a logger. fixes #5226 | Aaron Patterson | 2012-03-02 | 3 | -2/+11 |
| | | | |||||
* | | | revert setting NOT NULL constraints in add_timestamps | Xavier Noria | 2012-03-01 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Commit 3dbedd2 added NOT NULL constraints both to table creation and modification. For creation the new default makes sense, but the generic situation for changing a table is that there exist records. Those records have no creation or modification timestamps, and in the general case you don't even know them, so when updating a table these constraints are not going to work. See a bug report for this use case in #3334. | ||||
* | | | Add release dates to documentation | claudiob | 2012-03-01 | 1 | -2/+2 |
| | | | | | | | | | | | | Set "March 1, 2012" as the release date for 3.2.2, 3.1.4, 3.0.12 | ||||
* | | | Fix warning: assigned but unused variable | kennyj | 2012-03-01 | 1 | -3/+0 |
| | | | |||||
* | | | Merge pull request #5212 from MarkMT/master | Xavier Noria | 2012-02-28 | 1 | -8/+19 |
|\ \ \ | | | | | | | | | update_only documentation for accepts_nested_attributes_for | ||||
| * | | | Modified comments explaining what the update_only option does. | Mark | 2012-02-28 | 1 | -8/+19 |
| | | | | |||||
* | | | | Merge pull request #5196 from lest/patch-3 | José Valim | 2012-02-28 | 2 | -0/+14 |
|\ \ \ \ | |_|/ / |/| | | | force datetime attributes to be changed, fix GH #3965 | ||||
| * | | | force datetime attributes to be changed, fix GH #3965 | Sergey Nartimov | 2012-02-28 | 2 | -0/+14 |
| | | | | |||||
* | | | | Merge pull request #5197 from lest/patch-4 | José Valim | 2012-02-27 | 1 | -6/+0 |
|\ \ \ \ | |_|/ / |/| | | | remove unnecessary code | ||||
| * | | | remove unnecessary code | Sergey Nartimov | 2012-02-28 | 1 | -6/+0 |
| |/ / | | | | | | | | | | | | | it was added in 36129f21b86db4bd69e932e586129e246c2a5ca8 but isn't useful anymore as corresponding tests pass without it | ||||
* | | | Revert "only mutate the scope object in the `bind` method" | Aaron Patterson | 2012-02-27 | 1 | -1/+1 |
| | | | | | | | | | | | | This reverts commit 1b9e19cd22f2b5d5e7b82e042f92340822c0f966. | ||||
* | | | only mutate the scope object in the `bind` method | Aaron Patterson | 2012-02-27 | 1 | -1/+1 |
| | | | |||||
* | | | bind value creation refactoring | Aaron Patterson | 2012-02-27 | 1 | -4/+10 |
|/ / | |||||
* | | removing dead code | Aaron Patterson | 2012-02-27 | 1 | -3/+2 |
| | | |||||
* | | use bind values for join columns | Aaron Patterson | 2012-02-27 | 6 | -12/+36 |
| | | |||||
* | | Merge pull request #5168 from kennyj/fix_5152 | Aaron Patterson | 2012-02-27 | 2 | -1/+6 |
|\ \ | | | | | | | [PostgreSQL] Remove NULLS FIRST/LAST. Closes #5152 | ||||
| * | | Remove NULLS FIRST/LAST. closes #5152 | kennyj | 2012-02-25 | 2 | -1/+6 |
| | | | |||||
* | | | Merge pull request #5173 from kennyj/fix_3931-2 | Aaron Patterson | 2012-02-27 | 3 | -12/+23 |
|\ \ \ | | | | | | | | | Fix type_to_sql with text and limit on mysql/mysql2. Fix GH #3931 (Try again). | ||||
| * | | | Fix type_to_sql with text and limit on mysql/mysql2. Fix GH #3931. | kennyj | 2012-02-26 | 3 | -12/+23 |
| | | | | |||||
* | | | | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2012-02-25 | 2 | -3/+4 |
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | Conflicts: actionmailer/CHANGELOG.md | ||||
| * | | | Fixed typo in composed_of example with Money#<=>, was comparing amount ↵ | Noah Hendrix | 2012-02-24 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | itself instead of other_money.amount | ||||
| * | | | Revert "Remove meaningless code from the examples" of AutosaveAssociation | Dimitar Dimitrov | 2012-02-22 | 1 | -0/+3 |
| | | | | | | | | | | | | Reverts a part of 91148936f770dc8bbbb33d46a09528f1a32d8a71. Should probably be squashed with it when merging back in rails/rails. | ||||
| * | | | Minor fixes to ActiveRecord::AutosaveAssociation's docs | Dimitar Dimitrov | 2012-02-22 | 1 | -5/+3 |
| | | | | | | | | | | | | | | | | * Fix typos * Remove meaningless code from the examples | ||||
* | | | | Update changelogs with rails 3.0-stable branch info | Paco Guzman | 2012-02-25 | 1 | -3/+85 |
| |/ / |/| | | |||||
* | | | use regular ruby for fewer method calls. we do not need :gift:s! | Aaron Patterson | 2012-02-24 | 1 | -1/+4 |
| | | |