Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | add capture_sql method to compare sql statements and compare | eileencodes | 2014-03-31 | 1 | -0/+6 | |
| |/ / / | | | | | | | | | | | | | | | | | Other methods compare specific patterns, this method outputs the actual sql query that is generated. | |||||
* | | | | Merge pull request #14539 from lparedes/master | Guillermo Iguaran | 2014-03-31 | 2 | -3/+23 | |
|\ \ \ \ | | | | | | | | | | | Do not overwrite selected and disabled attributes | |||||
| * | | | | Add test for selected and disabled custom attributes in options_for_select | Laura Paredes | 2014-03-31 | 1 | -1/+21 | |
| | | | | | ||||||
| * | | | | Do not overwrite selected and disabled attributes | Laura Paredes | 2014-03-30 | 1 | -2/+2 | |
| | | | | | ||||||
* | | | | | Merge pull request #14542 from arthurnn/fix_release_task | Rafael Mendonça França | 2014-03-31 | 1 | -2/+2 | |
|\ \ \ \ \ | | | | | | | | | | | | | Fix release task | |||||
| * | | | | | Fix release task | Arthur Neves | 2014-03-31 | 1 | -2/+2 | |
|/ / / / / | | | | | | | | | | | | | | | | | | | | | Add a parentheses. related: b4c96490eeb1fbb944e116c7703dd528b37fc08a | |||||
* | | | | | Merge pull request #14532 from thedarkone/polymorphic-preload-fix | Aaron Patterson | 2014-03-31 | 3 | -34/+28 | |
|\ \ \ \ \ | |_|/ / / |/| | | | | Fix polymorphic preloads on NOT NULL _type columns | |||||
| * | | | | Simplify Preloader#grouped_records code. | thedarkone | 2014-03-30 | 3 | -25/+17 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The new method relies on AR::Associations::Association knowing about both reflection and a model class. AR::Base#association now raises a descriptive error when trying to access non-existent associations. Previously it would blow up with a confusing NoMethodError: undefined method `association_class' for nil:NilClass. | |||||
| * | | | | Fix polymorphic preloads on NOT NULL _type columns. | thedarkone | 2014-03-30 | 2 | -10/+12 | |
| | | | | | | | | | | | | | | | | | | | | Defer to Association#klass instead of having a custom/duplicate code. | |||||
* | | | | | refactor, put `PostgreSQLColumn` into `column.rb`. | Yves Senn | 2014-03-31 | 2 | -218/+222 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | We have `connection_adapters/column.rb` so it's easier to remember that the column in in a separate file. | |||||
* | | | | | Merge pull request #14535 from iancanderson/patch-1 | Arun Agrawal | 2014-03-31 | 1 | -1/+1 | |
|\ \ \ \ \ | | | | | | | | | | | | | Tiny doc fix for Strong Parameters | |||||
| * | | | | | Tiny doc fix for Strong Parameters | Ian C. Anderson | 2014-03-30 | 1 | -1/+1 | |
|/ / / / / | | | | | | | | | | | - accepts_nested_attribute_for -> accepts_nested_attributes_for | |||||
* | | | | | Merge pull request #14509 from lukesteensen/pg-array-defaults | Rafael Mendonça França | 2014-03-30 | 5 | -3/+26 | |
|\ \ \ \ \ | |_|/ / / |/| | | | | remove calls to sql_type on pg columns | |||||
| * | | | | fix mysql builds | Luke Steensen | 2014-03-30 | 1 | -1/+1 | |
| | | | | | ||||||
| * | | | | fix bug on non empty defaults for pg array columns | Luke Steensen | 2014-03-30 | 4 | -2/+25 | |
| | | | | | | | | | | | | | | | | | | | | fixes #10613 | |||||
* | | | | | Merge pull request #14528 from planas/patch-1 | Rafael Mendonça França | 2014-03-30 | 1 | -0/+1 | |
|\ \ \ \ \ | |/ / / / |/| | | | | Require yaml explicitly on #database_configuration | |||||
| * | | | | Require yaml explicitly | Adrià Planas | 2014-03-29 | 1 | -0/+1 | |
| | |/ / | |/| | | ||||||
* | | | | No need to call to_sym | Rafael Mendonça França | 2014-03-30 | 1 | -2/+2 | |
| |/ / |/| | | | | | | | | It is already called inside type_to_sql method. | |||||
* | | | Merge pull request #14474 from tgxworld/table_cleanup_after_each_test | Yves Senn | 2014-03-30 | 2 | -167/+198 | |
|\ \ \ | |/ / |/| | | Refactor test to use DdlHelper. | |||||
| * | | Refactor test to use DdlHelper. | Guo Xiang Tan | 2014-03-29 | 2 | -167/+198 | |
|/ / | | | | | | | | | | | | | Follow-Up to https://github.com/rails/rails/pull/14400 This ensures that all tables are removed after each test and thereby allowing us to run the tests in a random order. | |||||
* | | Merge pull request #13890 from achempion/syntax-error-backtrace | Yves Senn | 2014-03-29 | 3 | -0/+47 | |
|\ \ | | | | | | | append link to bad code when error type is SyntaxError | |||||
| * | | Append link to bad code to backtrace when exception is SyntaxError | Boris Kuznetsov | 2014-03-27 | 3 | -0/+47 | |
| | | | ||||||
* | | | Merge pull request #14524 from tgxworld/fix_unsubscribe_from_notifications | Yves Senn | 2014-03-29 | 4 | -12/+12 | |
|\ \ \ | | | | | | | | | | | | | Fix tests not unsubscribing from Notifications. | |||||
| * | | | Fix tests not unsubscribing from Notifications. | Guo Xiang Tan | 2014-03-28 | 4 | -8/+8 | |
| | | | | | | | | | | | | | | | | See https://github.com/rails/rails/blob/master/activesupport/lib/active_support/notifications.rb#L131 | |||||
* | | | | Merge pull request #14526 from chancancode/fix_ar_equality | Xavier Noria | 2014-03-29 | 3 | -8/+9 | |
|\ \ \ \ | | | | | | | | | | | Ensure we are returning either `true` or `false` for `#==` | |||||
| * | | | | Ensure we are returning either `true` or `false` for `#==` | Godfrey Chan | 2014-03-29 | 3 | -8/+9 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 460eb83d cused `ActiveRecord::Base#==` to sometimes return `nil` in some cases, this ensures we always return a boolean value. Also fixed a similar problem in AR reflections. | |||||
* | | | | | Merge branch 'master' of github.com:rails/docrails | Vijay Dev | 2014-03-29 | 4 | -2/+20 | |
|\ \ \ \ \ | |/ / / / |/| | | | | ||||||
| * | | | | copy edit [ci skip] | Vijay Dev | 2014-03-29 | 1 | -1/+1 | |
| | | | | | ||||||
| * | | | | Clarify environment_name for logs | Gaurish Sharma | 2014-03-27 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | [ci skip] | |||||
| * | | | | Mention required glob param name in match docs for mapper | Earl St Sauver | 2014-03-20 | 1 | -0/+4 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | THe match documentation doesn't mention any requirement of the parameter name requirement for matches. However, including a bare glob character without a variable assignment causes a parse error. | |||||
| * | | | | Update documentation on group method to indicate it takes an array | Earl St Sauver | 2014-03-17 | 1 | -0/+4 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The group method also takes an array, however this isn't immediately clear by reading the source since it delegates this method. If you trace it back to the AREL building you can see that it does support an array. Shoutout to @betovelandia for pointing this out. | |||||
| * | | | | Fix misspelling in references docs | Steven Harman | 2014-03-14 | 1 | -1/+1 | |
| | | | | | ||||||
| * | | | | Updating select helper doc [ci skip] | Rashmi Yadav | 2014-03-08 | 1 | -0/+10 | |
| | | | | | ||||||
* | | | | | Merge pull request #14521 from kreynolds/replace-regexp-with-include-or-string | Xavier Noria | 2014-03-28 | 4 | -4/+4 | |
|\ \ \ \ \ | |_|/ / / |/| | | | | Replace trivial regexp with string or include, twice as fast | |||||
| * | | | | Replace trivial regexp with string or index, twice as fast | Kelley Reynolds | 2014-03-28 | 4 | -4/+4 | |
|/ / / / | ||||||
* | | | | Merge pull request #12550 from Peeja/hash-wia-update-respects-to-hash | Rafael Mendonça França | 2014-03-28 | 3 | -3/+51 | |
|\ \ \ \ | | | | | | | | | | | HashWithIndifferentAccess#update respects #to_hash | |||||
| * | | | | HashWithIndifferentAccess better respects #to_hash | Peter Jaros | 2014-03-28 | 3 | -3/+51 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In particular, `.new`, `#update`, `#merge`, `#replace` all accept objects which respond to `#to_hash`, even if those objects are not Hashes directly. | |||||
* | | | | | Add CHANGELOG entry for #12778 [ci skip] | Rafael Mendonça França | 2014-03-28 | 1 | -0/+4 | |
| | | | | | ||||||
* | | | | | Merge pull request #12778 from etehtsea/rake-default-fix | Rafael Mendonça França | 2014-03-28 | 1 | -1/+1 | |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Don't load test env by default. Closes #13241 | |||||
| * | | | | | Don't load test env by default | Konstantin Shabanov | 2013-11-11 | 1 | -1/+1 | |
| | | | | | | ||||||
* | | | | | | PostgreSQL, use `PostgreSQLColumn` in PG specific tests. | Yves Senn | 2014-03-28 | 1 | -8/+8 | |
| | | | | | | ||||||
* | | | | | | PostgreSQL, test-cases to lock down column default values. | Yves Senn | 2014-03-28 | 3 | -0/+33 | |
| | | | | | | ||||||
* | | | | | | Merge pull request #14515 from mzahir/fix_xml_warning | Yves Senn | 2014-03-28 | 1 | -2/+2 | |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Fix warning for overshadowing XML variable | |||||
| * | | | | | | Fix warning for overshadowing XML variable | Musannif Zahir | 2014-03-28 | 1 | -2/+2 | |
|/ / / / / / | ||||||
* | | | | | | PostgreSQL, test cases to lock the current column types. | Yves Senn | 2014-03-28 | 8 | -15/+68 | |
| | | | | | | ||||||
* | | | | | | Merge pull request #14154 from al2o3cr/issue12770 | Aaron Patterson | 2014-03-27 | 4 | -4/+14 | |
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | Pass a base relation to build_default_scope when joining | |||||
| * | | | | | Pass a base relation to build_default_scope when joining | Matt Jones | 2014-02-21 | 4 | -4/+14 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows the default scope to be built using the current table alias. Resolves #12770 | |||||
* | | | | | | Merge pull request #14469 from tiegz/timestamp_inheritance_fix | Rafael Mendonça França | 2014-03-27 | 3 | -1/+23 | |
| | | | | | | | | | | | | | | | | | | | | | | | | Swap Timestamp/Callbacks order in ActiveRecord::Base | |||||
* | | | | | | Merge pull request #14505 from davefp/patch-1 | Carlos Antonio da Silva | 2014-03-27 | 1 | -0/+7 | |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Adds explanation of :base attribute to errors.add [ci skip] | |||||
| * | | | | | | Adds explanation of :base attribute to errors.add | David Underwood | 2014-03-27 | 1 | -0/+7 | |
|/ / / / / / | | | | | | | | | | | | | [ci skip] |