aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* push move_string in to `move`Aaron Patterson2014-04-011-14/+12
|
* combine move_regexp and move_string so we only loop over states onceAaron Patterson2014-04-011-9/+6
|
* do not create memo objects since we'll just throw them awayAaron Patterson2014-04-012-9/+11
|
* only ask if `t` is empty once.Aaron Patterson2014-04-011-4/+1
|
* Merge pull request #14539 from lparedes/masterGuillermo Iguaran2014-03-312-3/+23
|\ | | | | Do not overwrite selected and disabled attributes
| * 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 task
| * | Fix release taskArthur Neves2014-03-311-2/+2
|/ / | | | | | | | | Add a parentheses. related: b4c96490eeb1fbb944e116c7703dd528b37fc08a
* | Merge pull request #14532 from thedarkone/polymorphic-preload-fixAaron Patterson2014-03-313-34/+28
|\ \ | | | | | | Fix polymorphic preloads on NOT NULL _type columns
| * | Simplify Preloader#grouped_records code.thedarkone2014-03-303-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.thedarkone2014-03-302-10/+12
| | | | | | | | | | | | Defer to Association#klass instead of having a custom/duplicate code.
* | | refactor, put `PostgreSQLColumn` into `column.rb`.Yves Senn2014-03-312-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-1Arun Agrawal2014-03-311-1/+1
|\ \ \ | | | | | | | | Tiny doc fix for Strong Parameters
| * | | Tiny doc fix for Strong ParametersIan C. Anderson2014-03-301-1/+1
|/ / / | | | | | | - accepts_nested_attribute_for -> accepts_nested_attributes_for
* | | Merge pull request #14509 from lukesteensen/pg-array-defaultsRafael Mendonça França2014-03-305-3/+26
|\ \ \ | |_|/ |/| | remove calls to sql_type on pg columns
| * | fix mysql buildsLuke Steensen2014-03-301-1/+1
| | |
| * | fix bug on non empty defaults for pg array columnsLuke Steensen2014-03-304-2/+25
| | | | | | | | | | | | fixes #10613
* | | Merge pull request #14528 from planas/patch-1Rafael Mendonça França2014-03-301-0/+1
|\ \ \ | |/ / |/| | Require yaml explicitly on #database_configuration
| * | Require yaml explicitlyAdrià Planas2014-03-291-0/+1
| | |
* | | No need to call to_symRafael Mendonça França2014-03-301-2/+2
| |/ |/| | | | | It is already called inside type_to_sql method.
* | Merge pull request #14474 from tgxworld/table_cleanup_after_each_testYves Senn2014-03-302-167/+198
|\ \ | |/ |/| Refactor test to use DdlHelper.
| * Refactor test to use DdlHelper.Guo Xiang Tan2014-03-292-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-backtraceYves Senn2014-03-293-0/+47
|\ | | | | append link to bad code when error type is SyntaxError
| * 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.
| * | Fix tests not unsubscribing from Notifications.Guo Xiang Tan2014-03-284-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_equalityXavier Noria2014-03-293-8/+9
|\ \ \ | | | | | | | | Ensure we are returning either `true` or `false` for `#==`
| * | | Ensure we are returning either `true` or `false` for `#==`Godfrey Chan2014-03-293-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/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
| | | | | | | | | | | | [ci skip]
| * | | Mention required glob param name in match docs for mapperEarl St Sauver2014-03-201-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 arrayEarl St Sauver2014-03-171-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 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 include, twice as fast
| * | | 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#update respects #to_hash
| * | | HashWithIndifferentAccess better respects #to_hashPeter Jaros2014-03-283-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ç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 default. Closes #13241
| * | | | 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 variable
| * | | | | 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 joining
| * | | | Pass a base relation to build_default_scope when joiningMatt Jones2014-02-214-4/+14
| | | | | | | | | | | | | | | | | | | | | | | | | This allows the default scope to be built using the current table alias. Resolves #12770