aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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.
* | Merge pull request #27772 from y-yagi/remove_unreachable_codeSantiago Pastorino2017-01-242-8/+0
|\ \ | |/ |/| remove unreachable code
| * remove unreachable codeyuuji.yaginuma2017-01-232-8/+0
| | | | | | | | | | | | `app_path` is a required argument. Therefore, if `app_path` is not specified, it becomes an error in thor's option parsing, does not reach this check.
* | Merge pull request #27791 from ↵Kasper Timm Hansen2017-01-241-2/+2
|\ \ | | | | | | | | | | | | kenta-s/fix-sample-code-for-expand_cache_key-usage Fix sample code for `expand_cache_key` usage [ci skip]
| * | Fix sample code for `expand_cache_key` usage [ci skip]kenta-s2017-01-241-2/+2
|/ /
* | Merge pull request #27775 from domcleal/27774-format-resetEileen M. Uchitelle2017-01-232-0/+15
|\ \ | | | | | | Delete PATH_INFO after each controller test request
| * | Delete PATH_INFO after each controller test requestDominic Cleal2017-01-232-0/+15
|/ / | | | | | | | | | | | | | | | | | | Prevents PATH_INFO from being used to infer the request format in later test requests when no explicit format is given. As the request PATH_INFO may be set before a request, it can't be deleted during pre-request scrubbing. Fixes #27774
* | Bundler 1.14 compatMatthew Draper2017-01-231-1/+4
| |
* | Merge pull request #27771 from ↵Santiago Pastorino2017-01-232-1/+2
|\ \ | | | | | | | | | | | | y-yagi/do_not_run_git_init_when_specify_the_pretent_option do not run `git init` when specify the `pretend` option
| * | do not run `git init` when specify the `pretend` optionyuuji.yaginuma2017-01-232-1/+2
|/ / | | | | | | | | When specifying the `pretend` option, expect that no processing will be done, so do not execute `git init` as well.
* | Merge two tests that needs to initialize Rails before accessing `Rails`Akira Matsuda2017-01-231-16/+1
| | | | | | | | | | Fixes "NameError: uninitialized constant ApplicationTests::ConfigurationTests::CustomTest::Rails" when run individually
* | Merge pull request #27766 from ↵Jon Moss2017-01-221-1/+1
|\ \ | | | | | | | | | | | | kenta-s/add-module-name-to-backtrace-cleaner-sample-code Add module name to BacktraceCleaner usage example [ci skip]
| * | Add module name to BacktraceCleaner usage example [ci skip]kenta-s2017-01-221-1/+1
| |/
* | Merge pull request #27768 from kirs/am-decimal-castGuillermo Iguaran2017-01-221-1/+2
|\ \ | | | | | | Make BigDecimal casting consistent on different platforms
| * | Make BigDecimal casting consistent on different platformsKir Shatrov2017-01-221-1/+2
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Right now it behaves differently on JRuby: ``` --- expected +++ actual @@ -1 +1 @@ -#<BigDecimal:5f3c866c,'0.333333333333333333',18(20)> +#<BigDecimal:16e0afab,'0.3333333333333333',16(20)> ``` My initial PR (https://github.com/rails/rails/pull/27324) offered to let the precision to be decided by the platform and change the test expection, but other contributors suggested that we should change the default precision in Rails to be consistent of all platforms. The value (18) comes from the max default precision that comes from casting Rational(1/3) to BigDecimal.
* | Merge pull request #27763 from y-yagi/move_db_migrate_path_to_migration_moduleEileen M. Uchitelle2017-01-223-16/+8
|\ \ | | | | | | move `db_migrate_path` method to `Migration` module
| * | move `db_migrate_path` method to `Migration` moduleyuuji.yaginuma2017-01-223-16/+8
| |/ | | | | | | | | Since `Migration` module is included in both `MigrationGenerator` and `ModelGenerator`, no need to define a common method for each class.
* | Merge pull request #27764 from matrix9180/add_changelog_entry_for_27425Eileen M. Uchitelle2017-01-221-0/+6
|\ \ | |/ |/| Add changelog entry for #27425 [ci skip]
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-04 17:16:20 +0000