aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Disallow calling `#deliver_later` after local message modifications.Jeremy Daer2016-04-073-2/+40
* Cable typo: isSupportedProtocol -> isProtocolSupportedJeremy Daer2016-04-051-1/+1
* Revert "Merge pull request #24440 from yahonda/use_newer_version_of_sqlite3_a...Rafael Mendonça França2016-04-061-5/+0
* Merge pull request #24431 from vipulnsward/24119-followupRafael França2016-04-061-0/+8
|\
| * Add test case for interpolation with passing of data along with record attrib...Vipul A M2016-04-051-0/+8
* | Merge pull request #24444 from prathamesh-sonpatki/update-message-proc-docume...Rafael França2016-04-062-4/+10
|\ \
| * | Update example of passing a proc to `:message` option for validating records ...Prathamesh Sonpatki2016-04-062-4/+10
* | | Fix Active Model basics introduction to indicate it only introduces us to int...Rafael França2016-04-061-1/+1
|\ \ \ | |/ / |/| |
| * | Fix Active Model basics introduction to indicate it only introduces us to int...Vipul A M2016-04-051-1/+1
| |/
* | Fix undefined method `owners' for NullPreloader:ClassLadislav Smola2016-04-066-1/+32
* | Merge pull request #24436 from arktisklada/matching-sendmail-default-argumentsRafael França2016-04-063-2/+8
|\ \
| * | Sendmail default arguments match Mail::SendMailarktisklada2016-04-053-2/+8
* | | Merge pull request #24440 from yahonda/use_newer_version_of_sqlite3_at_travis_ciRafael França2016-04-061-0/+5
|\ \ \
| * | | Use SQLite3 3.7.15 which supports multiple values insertYasuo Honda2016-04-051-0/+5
* | | | Merge pull request #24433 from kamipo/avoid_unused_captureRafael França2016-04-051-1/+1
|\ \ \ \
| * | | | Avoid unused captureRyuta Kamizono2016-04-051-1/+1
| | |/ / | |/| |
* | | | Merge pull request #24441 from harsimranmaan/patch-1Rafael França2016-04-051-3/+3
|\ \ \ \ | |_|/ / |/| | |
| * | | Remove hard-coded backticks in SQL statementsHarsimran Singh Maan2016-04-051-3/+3
|/ / /
* | | Merge pull request #24224 from danielrhodes/actioncable-websocket-protocolsJeremy Daer2016-04-059-24/+93
|\ \ \
| * | | Added protocol negotiationDaniel Rhodes2016-04-058-24/+73
* | | | quick edits on the AC::API RDoc [ci skip]Xavier Noria2016-04-051-19/+20
| |/ / |/| |
* | | Merge pull request #24419 from rgm/masterEileen M. Uchitelle2016-04-052-2/+2
|\ \ \
| * | | it's => its typoRyan McCuaig2016-04-042-2/+2
* | | | Merge pull request #24410 from mechanicles/strong-weak-etags-infoप्रथमेश Sonpatki2016-04-051-3/+29
|\ \ \ \ | |_|_|/ |/| | |
| * | | Update documentation based on the new changes for strong & weak ETags [ci skip]Santosh Wadghule2016-04-051-3/+29
* | | | Merge pull request #24119 from prathamesh-sonpatki/proc-messagesRafael França2016-04-053-1/+15
|\ \ \ \
| * | | | Allow passing record being validated to error message generatorPrathamesh Sonpatki2016-04-053-1/+15
* | | | | Merge pull request #24429 from vipulnsward/24401-docsRafael França2016-04-051-1/+1
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Guides changes, follow up of #24401Vipul A M2016-04-051-1/+1
|/ / / /
* | | | Merge pull request #24345 from mtsmfm/fix-marshal-with-autoloading-for-nested...Rafael França2016-04-052-4/+19
|\ \ \ \
| * | | | Fix marshal with autoloading for nested class/moduleFumiaki MATSUSHIMA2016-03-282-4/+19
* | | | | Merge pull request #24401 from pan/number-to-phoneRafael Mendonça França2016-04-055-4/+36
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | `number_to_phone` formats number with regexpPan GaoYong2016-04-025-4/+36
* | | | | Merge pull request #24426 from yui-knk/refactor_mysql2Rafael França2016-04-042-6/+16
|\ \ \ \ \
| * | | | | Use `QUOTED_TRUE` and `QUOTED_FALSE` instead of magic stringsyui-knk2016-04-052-6/+16
|/ / / / /
* | | | | Merge pull request #24421 from arthur-vieira/patch-1Rafael França2016-04-041-2/+2
|\ \ \ \ \
| * | | | | [ci skip] Fix variable nameArthur Vieira2016-04-041-2/+2
|/ / / / /
* | | | | Merge pull request #24304 from rthbound/24239-workAndrew White2016-04-043-1/+31
|\ \ \ \ \
| * | | | | Fixes #24239Ryan T. Hosford2016-04-043-1/+31
| | |_|/ / | |/| | |
* | | | | Merge pull request #24332 from blackchestnut/doc/deprecation_warnSantiago Pastorino2016-04-041-2/+2
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Added 'config.' to deprecation warningAlexander Kalinichev2016-03-261-2/+2
* | | | | Merge pull request #24247 from ypxing/refactor_substitute_valuesAndrew White2016-04-041-5/+5
|\ \ \ \ \
| * | | | | enhance ActiveRecord#substitute_values to loop values just onceRick Xing2016-03-191-5/+5
* | | | | | Match `String#to_time`'s behaviour to rubySiim Liiser2016-04-043-1/+14
* | | | | | Call super instead of returning nil for DateTime#<=>Andrew White2016-04-033-5/+29
* | | | | | Use block form of Dir.mktmpdir to ensure tidy upAndrew White2016-04-031-3/+3
* | | | | | Prevent void context warningsAndrew White2016-04-032-2/+2
* | | | | | Merge pull request #24406 from prathamesh-sonpatki/update-release-notesKasper Timm Hansen2016-04-031-10/+0
|\ \ \ \ \ \
| * | | | | | Update Rails 5 release notes [ci skip]Prathamesh Sonpatki2016-04-031-10/+0
* | | | | | | Merge branch 'master' of github.com:rails/docrailsVijay Dev2016-04-035-4/+11
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |