aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | | 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
* | | | | | | | bundle update some gemsAkira Matsuda2017-01-291-3/+3
* | | | | | | | [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 testyuuji.yaginuma2017-01-291-4/+1
|/ / / / / / / /
* | | | | | | | Merge pull request #27833 from csgavino/masterAndrew White2017-01-281-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix judgement spelling [ci skip]Carlos Gavino2017-01-281-1/+1
* | | | | | | | | Merge pull request #27831 from y-yagi/make_backburner_integration_test_to_workAndrew White2017-01-281-2/+2
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | make backburner integration test to workyuuji.yaginuma2017-01-281-2/+2
| | |_|_|/ / / / | |/| | | | | |
* / | | | | | | Offer the option to use parameterization for shared processing of headers and...David Heinemeier Hansson2017-01-286-7/+212
|/ / / / / / /
* | | | | | | 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 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.Ken Collins2017-01-271-21/+4
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Merge pull request #27823 from kenta-s/fix-broken-example-for-file_update_che...Eileen M. Uchitelle2017-01-271-1/+1
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | 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.3Toshi MARUYAMA2017-01-271-1/+1
* | | | | | | Missing require "active_support/multibyte/chars"Akira Matsuda2017-01-271-0/+1
* | | | | | | 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.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` testyuuji.yaginuma2017-01-261-1/+1
* | | | | | | Uninterned Symbol can be duped since ruby 2.4.1Akira Matsuda2017-01-261-1/+4
|/ / / / / /
* | | | | | Merge pull request #27804 from scottgonzalez/action-mailer-guideArthur Nogueira Neves2017-01-251-2/+2
|\ \ \ \ \ \
| * | | | | | Action Mailer Basics clean up [ci skip]Scott González2017-01-251-2/+2
|/ / / / / /
* | | | | | s/an/a/Akira Matsuda2017-01-263-3/+3
* | | | | | 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]kenta-s2017-01-252-2/+2
|/ / / / / /
* | | | | | Add assertion messagesAkira Matsuda2017-01-252-2/+2
* | | | | | Merge pull request #27796 from yui-knk/keep_separator_wasAndrew White2017-01-251-1/+2
|\ \ \ \ \ \
| * | | | | | Keep the value of `$,` and restore ityui-knk2017-01-251-1/+2
* | | | | | | This seems to be working on JRuby 9KAkira Matsuda2017-01-251-10/+0
* | | | | | | Merge pull request #27798 from yui-knk/give_message_to_test_duplicableRichard Schneeman2017-01-251-1/+1
|\ \ \ \ \ \ \
| * | | | | | | Give a message to `#test_duplicable` assertionyui-knk2017-01-251-1/+1
| |/ / / / / /
* | | | | | | Change ActionView ERB Handler from Erubis to ErubiJeremy Evans2017-01-2513-81/+214
* | | | | | | Merge pull request #27772 from y-yagi/remove_unreachable_codeSantiago Pastorino2017-01-242-8/+0
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | remove unreachable codeyuuji.yaginuma2017-01-232-8/+0
* | | | | | | Merge pull request #27791 from kenta-s/fix-sample-code-for-expand_cache_key-u...Kasper Timm Hansen2017-01-241-2/+2
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | |
| * | | | | | 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 requestDominic Cleal2017-01-232-0/+15
|/ / / / / /
* | | | | | Bundler 1.14 compatMatthew Draper2017-01-231-1/+4
* | | | | | Merge pull request #27771 from y-yagi/do_not_run_git_init_when_specify_the_pr...Santiago Pastorino2017-01-232-1/+2
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | do not run `git init` when specify the `pretend` optionyuuji.yaginuma2017-01-232-1/+2
|/ / / / /
* | | | | Merge two tests that needs to initialize Rails before accessing `Rails`Akira Matsuda2017-01-231-16/+1
* | | | | Merge pull request #27766 from kenta-s/add-module-name-to-backtrace-cleaner-s...Jon Moss2017-01-221-1/+1
|\ \ \ \ \
| * | | | | Add module name to BacktraceCleaner usage example [ci skip]kenta-s2017-01-221-1/+1
| |/ / / /