aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Revert "Merge pull request #27586 from maclover7/jm-fix-27584"Rafael Mendonça França2017-01-112-11/+3
* Merge pull request #27646 from palkan/chore/upd-gitignoreRafael França2017-01-111-0/+1
|\
| * [ci skip] Add .byebug_history to .gitignorepalkan2017-01-111-0/+1
* | Merge branch 'master' of github.com:rails/docrailsVijay Dev2017-01-117-17/+17
|\ \
| * | `meta-data` --> `metadata`Jon Moss2016-12-311-3/+3
| * | Small grammar fixes in `Rails::Paths`Jon Moss2016-12-201-2/+2
| * | Small grammar fixes in `Rails::Info`Jon Moss2016-12-201-3/+3
| * | Capitalize RakeJon Moss2016-12-191-3/+3
| * | Capitalize Ruby and small grammar fixJon Moss2016-12-191-1/+1
| * | Capitalize Rack gem nameJon Moss2016-12-191-3/+3
| * | Capitalize Thor gem nameJon Moss2016-12-192-2/+2
* | | Merge pull request #27644 from kenta-s/fix-grammar-in-http-parametersप्रथमेश Sonpatki2017-01-111-1/+1
|\ \ \
| * | | Fix grammar in action_dispatch/http/parameters.rb [ci skip]kenta-s2017-01-111-1/+1
|/ / /
* | | Merge pull request #27642 from kou/fix-indentAndrew White2017-01-111-1/+1
|\ \ \ | |_|/ |/| |
| * | Fix indentKouhei Sutou2017-01-111-1/+1
* | | Current default Rails app encoding "utf-8" looks more like a W3C charset than...Akira Matsuda2017-01-112-2/+2
* | | Use Encoding::UTF_8 constant for default_{internal,external} in the testsAkira Matsuda2017-01-114-8/+8
|/ /
* | 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
| |/ / / /