aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Fix indentKouhei Sutou2017-01-111-1/+1
* Use already defined Encoding constant rather than freezing a StringAkira Matsuda2017-01-111-1/+1
* Make ActionDispatch::Request.parameter_parsers public APIRafael Mendonça França2017-01-111-1/+11
* Merge pull request #27639 from scottgonzalez/validator-typoRafael França2017-01-101-2/+2
|\
| * Fix typoScott González2017-01-101-2/+2
|/
* Merge pull request #27613 from prathamesh-sonpatki/add-missing-entry-to-relea...Kasper Timm Hansen2017-01-101-0/+3
|\
| * Add missing release notes entry for https://github.com/rails/rails/commit/f02...Prathamesh Sonpatki2017-01-091-0/+3
* | Merge pull request #27628 from y-yagi/revert_27619Kasper Timm Hansen2017-01-101-5/+0
|\ \
| * | Revert "Merge pull request #27619 from dixpac/add_missing_generator_test"yuuji.yaginuma2017-01-101-5/+0
* | | Merge pull request #27616 from jnicklas/time-travel-with-subclassesAndrew White2017-01-102-5/+24
|\ \ \
| * | | Make time travel work with subclasses of Time/Date/DatetimeJonas Nicklas2017-01-102-5/+24
| | |/ | |/|
* | | oops! :scream_cat:Akira Matsuda2017-01-101-1/+1
* | | Use temporary connection pool for the tests clearing AR::Base's active_connec...Akira Matsuda2017-01-101-59/+92
* | | Reconnecting AR::Base's connection breaks sqlite3_mem testsAkira Matsuda2017-01-101-2/+6
* | | sqlite3_mem tests are broken since 79887593c18919fed49f441d64236362cb755872Akira Matsuda2017-01-101-0/+2
| |/ |/|
* | Merge pull request #27621 from dylanahsmith/mysql2-nil-connection-testYves Senn2017-01-101-1/+2
|\ \
| * | activerecord/test: Fix Mysql2ConnectionTest#test_execute_after_disconnectDylan Thacker-Smith2017-01-091-1/+2
* | | Merge pull request #27622 from kamipo/improve_deprecation_messageRafael França2017-01-092-3/+3
|\ \ \
| * | | Improve deprecation message for deprecated reflection class nameRyuta Kamizono2017-01-101-1/+1
| * | | Suppress deprecation message to `has_and_belongs_to_many` only onceRyuta Kamizono2017-01-101-2/+2
| |/ /
* | | Merge pull request #27619 from dixpac/add_missing_generator_testGuillermo Iguaran2017-01-091-0/+5
|\ \ \ | |/ / |/| |
| * | Test `--skip-git` generator optiondixpac2017-01-091-0/+5
* | | Merge pull request #27551 from kirs/deprecate-class-name-as-classKasper Timm Hansen2017-01-095-3/+27
|\ \ \ | |/ / |/| |
| * | Deprecate reflection class name to accept a classKir Shatrov2017-01-095-3/+27
* | | Merge pull request #27416 from voray/remove-throw-from-action-cableMatthew Draper2017-01-102-3/+6
|\ \ \ | |_|/ |/| |
| * | ActionCable should not raise when a connection is already openDuncan Grazier2017-01-062-3/+6
* | | Merge pull request #25427 from eugeneius/update_increment_documentationKasper Timm Hansen2017-01-082-10/+8
|\ \ \
| * | | Update increment! documentation [ci skip]Eugene Kenny2016-08-152-10/+8
* | | | Merge pull request #27604 from prathamesh-sonpatki/dont-generate-erb-views-fo...Kasper Timm Hansen2017-01-083-1/+18
|\ \ \ \ | |_|_|/ |/| | |
| * | | Don't generate HTML/ERB templates for scaffold controller with --api flagPrathamesh Sonpatki2017-01-073-1/+18
* | | | Merge pull request #27603 from prathamesh-sonpatki/fix-random-failureSantiago Pastorino2017-01-081-0/+2
|\ \ \ \
| * | | | Fix random failure related to migration environmentPrathamesh Sonpatki2017-01-071-0/+2
| |/ / /
* | | | Merge pull request #27602 from prathamesh-sonpatki/followup-27596Santiago Pastorino2017-01-081-1/+8
|\ \ \ \
| * | | | Followup of #27596, test output of "run" method as wellPrathamesh Sonpatki2017-01-071-1/+8
| |/ / /
* | | | Merge pull request #27598 from NickLaMuro/fix-deep-nesting-where-clauses-with...Sean Griffin2017-01-072-1/+18
|\ \ \ \ | |/ / / |/| | |
| * | | Adds .to_s to table_name callNick LaMuro2017-01-061-1/+1
| * | | Add failing test for where with joinsNick LaMuro2017-01-061-0/+17
| | |/ | |/|
* | | Merge pull request #27596 from schneems/schneems/migrator-resultRichard Schneeman2017-01-062-2/+18
|\ \ \ | |/ / |/| |
| * | Preserve `up` and `down` return typeschneems2017-01-062-2/+18
|/ /
* | Merge pull request #27392 from y-yagi/use_same_class_on_compactSean Griffin2017-01-062-0/+14
|\ \
| * | ensure `#compact` of HWIDA to return HWIDAyuuji.yaginuma2017-01-062-0/+14
* | | Merge pull request #27227 from MQuy/allow-custom-content-type-in-mail-bodyRafael Mendonça França2017-01-063-4/+38
|\ \ \
| * | | Remove unnecessary condition in content_typeMQuy2017-01-061-1/+1
| * | | Add document in mailerMQuy2016-12-061-0/+13
| * | | Fix wrong typo in testMQuy2016-12-051-1/+1
| * | | Add changelog for custom content typeMQuy2016-12-012-0/+16
| * | | allow context type when set body mailMQuy2016-11-302-4/+13
* | | | Remove unneeded Deprecation silenceRafael Mendonça França2017-01-061-5/+3
* | | | Merge pull request #27294 from eavgerinos/doc-ar-callbacks-orderRafael França2017-01-061-0/+49
|\ \ \ \
| * | | | [ci skip] ActiveRecord: Document order of CallbacksAggelos Avgerinos2016-12-221-0/+49