aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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
| * | | use rails-html-sanitizer >= 1.0.3Toshi MARUYAMA2017-01-271-1/+1
| | | | | | | | | | | | | | | | CVE-2015-7579 says rails-html-sanitizer 1.0.2 has XSS vulnerability.
* | | | Missing require "active_support/multibyte/chars"Akira Matsuda2017-01-271-0/+1
| | | | | | | | | | | | | | | | this probably fixes #25840
* | | | Always use the newest rubygems when CIingAkira Matsuda2017-01-271-0/+1
|/ / /
* | | Merge pull request #27810 from etdsoft/bug-report-template-gem-versions-masterEileen M. Uchitelle2017-01-265-5/+5
|\ \ \ | | | | | | | | Bump bug report template versions to 5.0.1 in master
| * | | Bump bug report template versions to 5.0.1Daniel Martin2017-01-265-5/+5
|/ / /
* | | Merge pull request #27805 from y-yagi/fix_ruby_warningYves Senn2017-01-261-1/+1
|\ \ \ | | | | | | | | remove warning from `bin/setup` test
| * | | remove warning from `bin/setup` testyuuji.yaginuma2017-01-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This removes the following warnings. ``` test/application/bin_setup_test.rb:43: warning: ambiguous first argument; put parentheses or a space even after `/' operator ```
* | | | Uninterned Symbol can be duped since ruby 2.4.1Akira Matsuda2017-01-261-1/+4
|/ / / | | | | | | | | | | | | | | | https://github.com/ruby/ruby/commit/11e6bd5ac2a2eebfa589bd6db8c9c4daa337733e Leaving the 2.4.0 conditional for now, in order never to forget backporting r57407 to 2.4.1
* | | Merge pull request #27804 from scottgonzalez/action-mailer-guideArthur Nogueira Neves2017-01-251-2/+2
|\ \ \ | | | | | | | | Action Mailer Basics clean up [ci skip]
| * | | Action Mailer Basics clean up [ci skip]Scott González2017-01-251-2/+2
|/ / /
* | | s/an/a/Akira Matsuda2017-01-263-3/+3
| | | | | | | | | | | | [ci skip]
* | | Merge pull request #27799 from kenta-s/fix-grammar-in-number_helperVipul A M2017-01-252-2/+2
|\ \ \ | | | | | | | | Fix grammar 'an hyphen' -> 'a hyphen' [ci skip]
| * | | Fix grammar 'an hyphen' -> 'a hyphen' [ci skip]kenta-s2017-01-252-2/+2
|/ / /
* | | Add assertion messagesAkira Matsuda2017-01-252-2/+2
| | | | | | | | | | | | | | | This message could be generated by `assert_predicate`, https://github.com/rails/rails/commit/1853a4f2c8b2bddfbde6aae80abb08310295201c#commitcomment-20546113 but I'd rather handwrite the message string if I could reduce magic from the code by doing so.
* | | Merge pull request #27796 from yui-knk/keep_separator_wasAndrew White2017-01-251-1/+2
|\ \ \ | | | | | | | | Keep the value of `$,` and restore it
| * | | Keep the value of `$,` and restore ityui-knk2017-01-251-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | As unit tests, we do not know the value of `$,` when this test case started. It' better to keep the value when the test case fnished.
* | | | This seems to be working on JRuby 9KAkira Matsuda2017-01-251-10/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | % ruby -ve "p 'ほげ'.encode(Encoding::UTF_8_MAC)" jruby 1.7.26 (1.9.3p551) 2016-08-26 69763b8 on Java HotSpot(TM) 64-Bit Server VM 1.8.0_45-b14 +jit [darwin-x86_64] "\u307B\u3052" % ruby -ve "p 'ほげ'.encode(Encoding::UTF_8_MAC)" jruby 9.1.7.0 (2.3.1) 2017-01-11 68056ae Java HotSpot(TM) 64-Bit Server VM 25.45-b02 on 1.8.0_45-b14 +jit [darwin-x86_64] "\u307B\u3051\u3099" % ruby -ve "p 'ほげ'.encode(Encoding::UTF_8_MAC)" ruby 2.4.0p0 (2016-12-24 revision 57164) [x86_64-darwin14] "\u307B\u3051\u3099"
* | | | Merge pull request #27798 from yui-knk/give_message_to_test_duplicableRichard Schneeman2017-01-251-1/+1
|\ \ \ \ | | | | | | | | | | Give a message to `#test_duplicable` assertion
| * | | | Give a message to `#test_duplicable` assertionyui-knk2017-01-251-1/+1
| |/ / / | | | | | | | | | | | | | | | | Giving a message helps us to know what happened when we look at Travis CI.
* | | | Change ActionView ERB Handler from Erubis to ErubiJeremy Evans2017-01-2513-81/+214
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Erubi offers the following advantages for Rails: * Works with ruby's --enable-frozen-string-literal option * Has 88% smaller memory footprint * Does no freedom patching (Erubis adds a method to Kernel) * Has simpler internals (1 file, <150 lines of code) * Has an open development model (Erubis doesn't have a public source control repository or bug tracker) * Is not dead (Erubis hasn't been updated since 2011) Erubi is a simplified fork of Erubis that contains just the parts that are generally needed (which includes the parts that Rails uses). The only intentional difference in behavior is that it does not include support for <%=== tags for debug output. That could be added to the ActionView ERB handler if it is desired. The Erubis template handler remains in a deprecated state so that code that accesses it directly does not break. It can be removed after Rails 5.1.
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-07 08:39:50 +0000