aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | | | | | | | correctly check error messageyuuji.yaginuma2017-01-256-12/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `assert_raise` does not check error message. However, in some tests, it seems like expecting error message checking with `assert_raise`. Instead of specifying an error message in `assert_raise`, modify to use another assert to check the error message.
* | | | | | | | | | | | | | Avoid lambda scopes when possibleAaron Patterson2017-01-301-3/+1
| |_|_|_|/ / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Lambda scopes require a bunch more work. Ideally the `scope` list would be a homogeneous collection. In this case, the reflection knows how to construct the right reflection for this join, so lets just construct that relation rather than instance execing to figure it out later.
* | | | | | | | | | | | | Merge pull request #27851 from tenderlove/scope-chainAaron Patterson2017-01-304-57/+47
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / / / |/| | | | | | | | | | | | Deprecate `scope_chain`
| * | | | | | | | | | | | deprecate `scope_chain`Aaron Patterson2017-01-302-5/+17
| | | | | | | | | | | | |
| * | | | | | | | | | | | update comments and call `super`Aaron Patterson2017-01-301-24/+3
| | | | | | | | | | | | |
| * | | | | | | | | | | | remove caching until we prove it is requiredAaron Patterson2017-01-301-7/+3
| | | | | | | | | | | | |
| * | | | | | | | | | | | Fix `scopes` implementation on `PolymorphicReflection`Aaron Patterson2017-01-303-54/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `PolymorphicReflection` needs to be custom for handling scope lambdas
| * | | | | | | | | | | | Implement `scopes` method on each Reflectioneileencodes2017-01-301-5/+47
|/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Each reflection should be responsible for returning the scopes needed to query against the db.
* | | | | | | | | | | | Merge pull request #27822 from mtsmfm/bump-unicode-versionJeremy Daer2017-01-305-10/+38
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | Update Unicode Version to 9.0.0
| * | | | | | | | | | | | Update Unicode Version to 9.0.0Fumiaki MATSUSHIMA2017-01-285-10/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 9.0.0 was released on June 21, 2016 http://blog.unicode.org/2016/06/announcing-unicode-standard-version-90.html http://www.unicode.org/versions/Unicode9.0.0/ There are some changes about grapheme cluster in Unicode 9.0.0: http://unicode.org/reports/tr29/#Grapheme_Cluster_Boundary_Rules ------------ I noticed that `unpack_graphemes` returns [Other] when the argument is Other ÷ Prepend (it must be [Other, Prepend]). But in [Unicode 8.0.0's Prepend has no characters](http://www.unicode.org/reports/tr29/tr29-27.html#Prepend) so we don't have to backport following patch: ```diff should_break = + if pos == eoc + true ```
* | | | | | | | | | | | | Document with with an example an link to ParameterizedRafael Mendonça França2017-01-301-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also change the class_methods to ClassMethods since the former document the method as an instance method of Parameterized not as a class method.
* | | | | | | | | | | | | :scissors:Rafael Mendonça França2017-01-301-1/+1
| | | | | | | | | | | | |
* | | | | | | | | | | | | No need to advertise in the rdoc documentationRafael Mendonça França2017-01-301-3/+0
| | | | | | | | | | | | |
* | | | | | | | | | | | | Avoid should in test namesRafael Mendonça França2017-01-301-1/+1
| | | | | | | | | | | | |
* | | | | | | | | | | | | Implement respond_to_missing? in the Parameterized::Mailer classRafael Mendonça França2017-01-302-6/+25
| | | | | | | | | | | | |
* | | | | | | | | | | | | Remove unneeded nodocRafael Mendonça França2017-01-301-1/+1
| | | | | | | | | | | | |
* | | | | | | | | | | | | Override the initializers instead of using tapRafael Mendonça França2017-01-301-3/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We own the class so we can override the initialize.
* | | | | | | | | | | | | Make internal classes internal for the documentationRafael Mendonça França2017-01-301-2/+2
| |_|_|_|_|_|_|_|/ / / / |/| | | | | | | | | | |
* | | | | | | | | | | | Merge pull request #27784 from y-yagi/add_warnings_option_to_test_runnerRafael França2017-01-304-0/+31
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | add warnings option to test runner
| * | | | | | | | | | | | add warnings option to test runneryuuji.yaginuma2017-01-244-0/+31
| | | | | | | | | | | | |
* | | | | | | | | | | | | Merge pull request #27787 from y-yagi/show_correct_class_name_in_migration_errorRafael França2017-01-302-3/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | show correct class name in migration inherited directly error
| * | | | | | | | | | | | | show correct class name in migration inherited directly erroryuuji.yaginuma2017-01-242-3/+4
| | |_|/ / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Follow up to 249f71a
* | | | | | | | | | | | | Merge pull request #27847 from jaredbeck/patch-6Rafael França2017-01-301-0/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Docs: Specify return value of `save!`
| * | | | | | | | | | | | | Docs: Specify return value of `save!`Jared Beck2017-01-301-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I can never remember if it returns `self` or `true` (seems to be `true`) [ci skip]
* | | | | | | | | | | | | | Merge pull request #27743 from jordanlewis/simplify-postgres-column-definitionsRafael França2017-01-301-5/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / |/| | | | | | | | | | | | | Simplify query in column_definitions() for Postgres
| * | | | | | | | | | | | | Simplify Postgres query for column_definitions()Jordan Lewis2017-01-301-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | column_definitions() needs to fetch the collation for every column, if present. Previously, it did so using a correlated subquery - a subquery that references results from the outer scope. This patch updates the query to remove the subquery in favor of a simpler and more efficient JOIN clause. Running the two queries through EXPLAIN against Postgres additionally shows that the original form with a correlated subquery requires a Nested Loop Left Join, while the new form with a simple JOIN can use a more efficient Merge Left Join.
* | | | | | | | | | | | | | Merge pull request #27773 from kirs/serialized-error-attributeRafael França2017-01-305-17/+34
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Report the attribute on ActiveRecord::SerializationTypeMismatch
| * | | | | | | | | | | | | | Report the attribute on ActiveRecord::SerializationTypeMismatchKir Shatrov2017-01-295-17/+34
| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge pull request #27846 from kenta-s/improve-insufficient-test-for-safe_joinRafael França2017-01-301-2/+13
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / / |/| | | | | | | | | | | | | | Improve insufficient test for `safe_join`
| * | | | | | | | | | | | | | Improve insufficient test for `safe_join`kenta-s2017-01-301-2/+13
| | |_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | Make assert_enqueued_emails + assert_no_enqueued_emails consider ↵David Heinemeier Hansson2017-01-302-2/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | parameterized delivery jobs Needed for testing of parameterized mailers
* | | | | | | | | | | | | | Ruby constant look-up no longer falls back to top-level since 2.5Akira Matsuda2017-01-301-7/+10
|/ / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This behavior used to warn until 2.4, and raises since 2.5. The test here was intentinally named not to start with "test_" and so it used not to be executed because this never passes, but now is should pass in trunk. https://bugs.ruby-lang.org/issues/11547 https://github.com/ruby/ruby/commit/44a2576f798b07139adde2d279e48fdbe71a0148 closes #19897
* | | | | | | | | | | | | delayed_job and delayed_job_active_record gems with AR5 support are availableAkira Matsuda2017-01-292-19/+9
| | | | | | | | | | | | |
* | | | | | | | | | | | | Missing require 'active_support/core_ext/hash/keys'Akira Matsuda2017-01-291-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Without this, the test causes a "method redefined" warning because * first it loads I18n and defines Hash#deep_symbolize_keys inside I18n's lib/i18n/core_ext/hash.rb * then it loads AS/core_ext/hash/keys.rb afterwards
* | | | | | | | | | | | | bundle update some gemsAkira Matsuda2017-01-291-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * puma 3.7.0: to let kill("TERM") properly terminate the process in railties test (3.6.2 doesnot on my machine) * amq-protocol 2.1.0: to reduce warnings in AJ tests * rails-html-sanitizer: missing change in a previous commit that updated Gemfile
* | | | | | | | | | | | | [ci skip] other -> order; expand ivarKasper Timm Hansen2017-01-281-1/+2
| | | | | | | | | | | | |
* | | | | | | | | | | | | Merge pull request #27835 from y-yagi/restore_delivery_method_after_testKasper Timm Hansen2017-01-281-4/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | restore `delivery_method` after test
| * | | | | | | | | | | | | restore `delivery_method` after testyuuji.yaginuma2017-01-291-4/+1
|/ / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently use two variables to restore `delivery_method`, but the order of restoring the values is incorrect and does not restore is correctly.
* | | | | | | | | | | | | Merge pull request #27833 from csgavino/masterAndrew White2017-01-281-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix judgment spelling [ci skip]
| * | | | | | | | | | | | | Fix judgement spelling [ci skip]Carlos Gavino2017-01-281-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `judgment` is the preferred form as Rails usually follows en-us spelling not en-gb.
* | | | | | | | | | | | | | Merge pull request #27831 from y-yagi/make_backburner_integration_test_to_workAndrew White2017-01-281-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / |/| | | | | | | | | | | | | make backburner integration test to work
| * | | | | | | | | | | | | make backburner integration test to workyuuji.yaginuma2017-01-281-2/+2
| | |_|_|/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently, backburner integration test is not running on CI. https://travis-ci.org/rails/rails/jobs/196005322#L610 Using `Backburner::Worker.connection` to check whether beanstalkd is running. But `Backburner::Worker.connection` was removed in backburner 1.2.0. https://github.com/nesquena/backburner/commit/81fde499c2263abe8dedee59a3d0e03e92d72627 Therefore, this check process always becomes false, so the test is no longer done. I fixed it so that check processing is done correctly.
* / | | | | | | | | | | | Offer the option to use parameterization for shared processing of headers ↵David Heinemeier Hansson2017-01-286-7/+212
|/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | and ivars (#27825) Offer the option to use parameterization for shared processing of headers and ivars
* | | | | | | | | | | | Merge pull request #27815 from y-yagi/ruby2_4_0_with_aj_integrationJeremy Daer2017-01-271-0/+6
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | add combination of Ruby 2.4 + aj:integration to CI
| * | | | | | | | | | | | add combination of Ruby 2.4 + aj:integration to CIyuuji.yaginuma2017-01-281-0/+6
| | | | | | | | | | | | |
* | | | | | | | | | | | | Merge pull request #27820 from metaskills/mater-sqlserverymlEileen M. Uchitelle2017-01-271-21/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / |/| | | | | | | | | | | | Modernize SQL Server database YAML for Linux/vNext.
| * | | | | | | | | | | | Modernize SQL Server database YAML for Linux/vNext.Ken Collins2017-01-271-21/+4
| | |_|_|_|_|/ / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge pull request #27823 from ↵Eileen M. Uchitelle2017-01-271-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | kenta-s/fix-broken-example-for-file_update_checker Fix broken sample code for EventedFileUpdateChecker [ci skip]
| * | | | | | | | | | | Fix broken sample code for EventedFileUpdateChecker [ci skip]kenta-s2017-01-281-1/+1
|/ / / / / / / / / / /
* | | | | | | | | | | Merge pull request #27814 from marutosi/rails-html-sanitizer-1.0.3Akira Matsuda2017-01-271-1/+1
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | use rails-html-sanitizer >= 1.0.3