aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | | | Merge pull request #24284 from olivierlacan/patch-1Rafael França2016-03-231-1/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Remove reference to unmaintained plugin/gemOlivier Lacan2016-03-231-1/+1
| | |_|_|/ / / / / | |/| | | | | | |
* | | | | | | | | Merge pull request #24196 from koenpunt/plugin-action-cableKasper Timm Hansen2016-03-231-2/+4
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | Add ActionCable require statement to pluginKoen Punt2016-03-231-2/+4
|/ / / / / / / /
* | | | | | | | [ci skip] Improve comment minitest plugin initialization.Kasper Timm Hansen2016-03-221-2/+4
* | | | | | | | Don't get ahead of ourselves.Kasper Timm Hansen2016-03-221-3/+3
* | | | | | | | Set Rails as the first minitest initialized plugin.Kasper Timm Hansen2016-03-221-1/+3
* | | | | | | | Merge pull request #24278 from keram/rails_code_conventionRafael França2016-03-222-2/+2
|\ \ \ \ \ \ \ \
| * | | | | | | | Use || instead of `or` as preferred in rails code conventionMarek L2016-03-222-2/+2
* | | | | | | | | Merge pull request #24276 from artfuldodger/patch-2Kasper Timm Hansen2016-03-221-1/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fix WebSocket already open log message typoJon Evans2016-03-221-1/+1
| |/ / / / / / / /
* | | | | | | | | Merge pull request #24275 from arekf/masterKasper Timm Hansen2016-03-221-1/+1
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | Fix typo for redirect_backArkadiusz Fal2016-03-221-1/+1
|/ / / / / / / /
* | | | | | | | Merge pull request #24271 from vipulnsward/grammar-fix-changelogYves Senn2016-03-221-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | - Fixed abrupt start of sentence in changelogVipul A M2016-03-221-1/+1
|/ / / / / / / /
* | | | | | | | guides, sync 5.0 release notes with changelogsYves Senn2016-03-224-7/+43
* | | | | | | | guides, sync railties and AP changelogs with 5.0 release notes.Yves Senn2016-03-223-13/+43
* | | | | | | | Merge pull request #24269 from bquorning/require-enumerableAkira Matsuda2016-03-221-0/+1
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | |
| * | | | | | | Require enumerable module when using #sumBenjamin Quorning2016-03-221-0/+1
|/ / / / / / /
* | | | | | | Merge pull request #24261 from y-yagi/update_default_adapterJon Moss2016-03-212-5/+9
|\ \ \ \ \ \ \
| * | | | | | | update Active Job default adapter [ci skip]yuuji.yaginuma2016-03-222-5/+9
| | |/ / / / / | |/| | | | |
* | | | | | | Merge pull request #24258 from jeremy/cable/faye-and-isolated-testsJeremy Daer2016-03-212-3/+15
|\ \ \ \ \ \ \
| * | | | | | | Cable: add isolated tests and FAYE=1 test runsJeremy Daer2016-03-202-3/+15
* | | | | | | | Merge pull request #24253 from y-yagi/change_default_value_of_cachingKasper Timm Hansen2016-03-212-2/+3
|\ \ \ \ \ \ \ \
| * | | | | | | | changed default value of `caching` option to `nil`yuuji.yaginuma2016-03-212-2/+3
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge pull request #24243 from dewski/dont-upgrade-file-watcherArthur Neves2016-03-212-0/+19
|\ \ \ \ \ \ \ \
| * | | | | | | | Add tests for file_watcher config on updateArthur Neves2016-03-211-0/+14
| * | | | | | | | Don't upgrade config.file_watcher during upgrade pathGarrett Bjerkhoel2016-03-181-0/+5
* | | | | | | | | Fix generator test to match to use the stringRafael Mendonça França2016-03-212-2/+2
* | | | | | | | | Merge pull request #24231 from hallmatt/masterRafael Mendonça França2016-03-211-1/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | switched layout :mailer to a string so that mail layout can be properly found...Matt Hall2016-03-171-1/+1
* | | | | | | | | | Keep all session tests in the same fileRafael Mendonça França2016-03-212-46/+28
* | | | | | | | | | Merge pull request #24229 from maclover7/fix-24222Rafael Mendonça França2016-03-213-1/+51
|\ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / |/| | | | | | | | |
| * | | | | | | | | Fix request.reset_session for API controllersJon Moss2016-03-193-1/+51
| |/ / / / / / / /
* | | | | | | | | Merge pull request #24244 from bronson/asset-pipeline-docJon Moss2016-03-181-7/+3
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | |
| * | | | | | | | remove Rails 4 text from asset pipeline guideScott Bronson2016-03-181-7/+3
|/ / / / / / / /
* | | | | | | | Merge pull request #22518 from RochesterinNYC/better-error-message-for-includ...Arthur Nogueira Neves2016-03-182-1/+18
|\ \ \ \ \ \ \ \
| * | | | | | | | Improve clarity of error message for missing includes and eager_loadJames Wen2016-01-282-1/+18
* | | | | | | | | Merge pull request #24223 from mechanicles/reserved-keys-testsEileen M. Uchitelle2016-03-181-6/+7
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Added more tests for reserved hash keys of ActiveJob::Arguments.Santosh Wadghule2016-03-171-6/+7
* | | | | | | | | | Merge pull request #24226 from mabras/masterXavier Noria2016-03-181-0/+0
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / |/| | | | | | | | |
| * | | | | | | | | use rails 5 favicon.ico for rails guidesMohamad Abras2016-03-171-0/+0
| | |_|/ / / / / / | |/| | | | | | |
* / | | | | | | | Evented Redis adapter: log reconnect failures as errors, not just infoJeremy Daer2016-03-171-1/+1
|/ / / / / / / /
* | | | | | | | Merge pull request #24218 from schneems/schneems/match-loggerRichard Schneeman2016-03-172-10/+26
|\ \ \ \ \ \ \ \
| * | | | | | | | Document and Match the Rails logger interfaceschneems2016-03-162-10/+26
| |/ / / / / / /
* | | | | | | | Merge pull request #24201 from rails/rake-db-createRafael França2016-03-173-10/+17
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Creates development and test databases in db:migrate taskRafael Mendonça França2016-03-143-10/+17
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Merge pull request #24215 from shiraikenta/modify-atom-feed-helper-rbJon Moss2016-03-161-1/+1
|\ \ \ \ \ \ \
| * | | | | | | fix a comment in atom_feed_helper.rb白井 健太2016-03-161-1/+1
|/ / / / / / /
* | | | | | | Merge pull request #24205 from delftswa2016/improve-activesupport-dependenciesXavier Noria2016-03-161-3/+6
|\ \ \ \ \ \ \