aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | | | | | | | 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
| |/ / / / / /
* | | | | | | Merge pull request #27768 from kirs/am-decimal-castGuillermo Iguaran2017-01-221-1/+2
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | Make BigDecimal casting consistent on different platformsKir Shatrov2017-01-221-1/+2
|/ / / / / /
* | | | | | 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` moduleyuuji.yaginuma2017-01-223-16/+8
| |/ / / / /
* | | | | | Merge pull request #27764 from matrix9180/add_changelog_entry_for_27425Eileen M. Uchitelle2017-01-221-0/+6
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Add changelog entry for #27425 [ci skip]Chad Ingram2017-01-211-0/+6
|/ / / / /
* | | | | Merge pull request #27760 from kenta-s/remove-unnecessary-comments-in-cache_h...Kasper Timm Hansen2017-01-211-2/+0
|\ \ \ \ \
| * | | | | Remove unnecessary comments in cache_helper.rb [ci skip]kenta-s2017-01-211-2/+0
| | |_|/ / | |/| | |
* | | | | Merge pull request #27761 from scottgonzalez/action-mailer-guideVipul A M2017-01-211-2/+2
|\ \ \ \ \
| * | | | | Clean up wording in Action Mailer Basics [ci skip]Scott González2017-01-211-2/+2
|/ / / / /
* / / / / Add examples for behaviour about redirection with and without options. Fixes ...Vipul A M2017-01-211-0/+8
|/ / / /
* | | | Merge pull request #27751 from bogdanvlviv/add_missing_comment_outRafael França2017-01-201-1/+1
|\ \ \ \