aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Minor improvement: Use the merge method on the relation instead of instance_e...Jan Habermann2014-04-031-1/+1
* Simplify the code in target_scopeJan Habermann2014-04-031-5/+2
* Add a CHANGELOG entry for the has_many :through scoping fix (See #14537 for d...Jan Habermann2014-04-031-0/+9
* Properly handle scoping with has_many :through. Fixes #14537.Jan Habermann2014-04-034-2/+25
* Merge pull request #14539 from lparedes/masterGuillermo Iguaran2014-03-312-3/+23
|\
| * Add test for selected and disabled custom attributes in options_for_selectLaura Paredes2014-03-311-1/+21
| * Do not overwrite selected and disabled attributesLaura Paredes2014-03-301-2/+2
* | Merge pull request #14542 from arthurnn/fix_release_taskRafael Mendonça França2014-03-311-2/+2
|\ \
| * | Fix release taskArthur Neves2014-03-311-2/+2
|/ /
* | Merge pull request #14532 from thedarkone/polymorphic-preload-fixAaron Patterson2014-03-313-34/+28
|\ \
| * | Simplify Preloader#grouped_records code.thedarkone2014-03-303-25/+17
| * | Fix polymorphic preloads on NOT NULL _type columns.thedarkone2014-03-302-10/+12
* | | refactor, put `PostgreSQLColumn` into `column.rb`.Yves Senn2014-03-312-218/+222
* | | Merge pull request #14535 from iancanderson/patch-1Arun Agrawal2014-03-311-1/+1
|\ \ \
| * | | Tiny doc fix for Strong ParametersIan C. Anderson2014-03-301-1/+1
|/ / /
* | | Merge pull request #14509 from lukesteensen/pg-array-defaultsRafael Mendonça França2014-03-305-3/+26
|\ \ \ | |_|/ |/| |
| * | fix mysql buildsLuke Steensen2014-03-301-1/+1
| * | fix bug on non empty defaults for pg array columnsLuke Steensen2014-03-304-2/+25
* | | Merge pull request #14528 from planas/patch-1Rafael Mendonça França2014-03-301-0/+1
|\ \ \ | |/ / |/| |
| * | Require yaml explicitlyAdrià Planas2014-03-291-0/+1
* | | No need to call to_symRafael Mendonça França2014-03-301-2/+2
| |/ |/|
* | Merge pull request #14474 from tgxworld/table_cleanup_after_each_testYves Senn2014-03-302-167/+198
|\ \ | |/ |/|
| * Refactor test to use DdlHelper.Guo Xiang Tan2014-03-292-167/+198
|/
* Merge pull request #13890 from achempion/syntax-error-backtraceYves Senn2014-03-293-0/+47
|\
| * Append link to bad code to backtrace when exception is SyntaxErrorBoris Kuznetsov2014-03-273-0/+47
* | Merge pull request #14524 from tgxworld/fix_unsubscribe_from_notificationsYves Senn2014-03-294-12/+12
|\ \
| * | Fix tests not unsubscribing from Notifications.Guo Xiang Tan2014-03-284-8/+8
* | | Merge pull request #14526 from chancancode/fix_ar_equalityXavier Noria2014-03-293-8/+9
|\ \ \
| * | | Ensure we are returning either `true` or `false` for `#==`Godfrey Chan2014-03-293-8/+9
* | | | Merge branch 'master' of github.com:rails/docrailsVijay Dev2014-03-294-2/+20
|\ \ \ \ | |/ / / |/| | |
| * | | copy edit [ci skip]Vijay Dev2014-03-291-1/+1
| * | | Clarify environment_name for logsGaurish Sharma2014-03-271-1/+1
| * | | Mention required glob param name in match docs for mapperEarl St Sauver2014-03-201-0/+4
| * | | Update documentation on group method to indicate it takes an arrayEarl St Sauver2014-03-171-0/+4
| * | | Fix misspelling in references docsSteven Harman2014-03-141-1/+1
| * | | Updating select helper doc [ci skip]Rashmi Yadav2014-03-081-0/+10
* | | | Merge pull request #14521 from kreynolds/replace-regexp-with-include-or-stringXavier Noria2014-03-284-4/+4
|\ \ \ \ | |_|/ / |/| | |
| * | | Replace trivial regexp with string or index, twice as fastKelley Reynolds2014-03-284-4/+4
|/ / /
* | | Merge pull request #12550 from Peeja/hash-wia-update-respects-to-hashRafael Mendonça França2014-03-283-3/+51
|\ \ \
| * | | HashWithIndifferentAccess better respects #to_hashPeter Jaros2014-03-283-3/+51
* | | | Add CHANGELOG entry for #12778 [ci skip]Rafael Mendonça França2014-03-281-0/+4
* | | | Merge pull request #12778 from etehtsea/rake-default-fixRafael Mendonça França2014-03-281-1/+1
|\ \ \ \
| * | | | Don't load test env by defaultKonstantin Shabanov2013-11-111-1/+1
* | | | | PostgreSQL, use `PostgreSQLColumn` in PG specific tests.Yves Senn2014-03-281-8/+8
* | | | | PostgreSQL, test-cases to lock down column default values.Yves Senn2014-03-283-0/+33
* | | | | Merge pull request #14515 from mzahir/fix_xml_warningYves Senn2014-03-281-2/+2
|\ \ \ \ \
| * | | | | Fix warning for overshadowing XML variableMusannif Zahir2014-03-281-2/+2
|/ / / / /
* | | | | PostgreSQL, test cases to lock the current column types.Yves Senn2014-03-288-15/+68
* | | | | Merge pull request #14154 from al2o3cr/issue12770Aaron Patterson2014-03-274-4/+14
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Pass a base relation to build_default_scope when joiningMatt Jones2014-02-214-4/+14