aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | Separate for new and existing applications clearlyVijay Dev2016-02-071-0/+4
* | | | Merge branch 'master' of github.com:rails/docrailsVijay Dev2016-02-074-15/+16
|\ \ \ \
| * | | | fix indentationVijay Dev2016-02-071-1/+1
| * | | | [ci skip] Good bye SQLite2yui-knk2016-02-061-2/+0
| * | | | [ci skip] fix typoMikhail Dieterle2016-01-301-1/+1
| * | | | [ci skip] Fix one more typoPrathamesh Sonpatki2016-01-301-1/+1
| * | | | [ci skip] Update internal documents about ActiveRecord's Reflectionyui-knk2016-01-301-11/+14
| * | | | [ci skip] Fix typoyui-knk2016-01-271-1/+1
* | | | | Merge pull request #23533 from y-yagi/fix_typo_in_assert_enqueued_jobs_exampleJon Moss2016-02-061-1/+1
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | fix typo in `assert_enqueued_jobs` example [ci skip]yuuji.yaginuma2016-02-071-1/+1
| | |_|/ | |/| |
* | | | Merge pull request #23519 from kamipo/mariadb_does_not_support_json_typeSean Griffin2016-02-061-1/+1
|\ \ \ \
| * | | | MariaDB does not support JSON typeRyuta Kamizono2016-02-061-1/+1
* | | | | Avoid coupling Action Pack to Railties.Kasper Timm Hansen2016-02-061-1/+1
* | | | | Merge pull request #23529 from syamilmj/remove_unused_methodRafael França2016-02-061-4/+0
|\ \ \ \ \
| * | | | | Remove unused private methodSyamil MJ2016-02-071-4/+0
|/ / / / /
* | | | | Merge pull request #23520 from kamipo/remove_duplicated_require_arelSean Griffin2016-02-061-1/+0
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Remove duplicated `require 'arel'`Ryuta Kamizono2016-02-061-1/+0
| |/ / /
* | | | Merge pull request #23517 from gsamokovarov/yay-youre-on-railsEileen M. Uchitelle2016-02-062-2/+2
|\ \ \ \ | |/ / / |/| | |
| * | | Replace old Rails greeting referencesGenadi Samokovarov2016-02-062-2/+2
* | | | Merge pull request #23513 from kamipo/revert-23502-update-travis-masterKasper Timm Hansen2016-02-061-2/+2
|\ \ \ \
| * | | | Revert "No need to specify Ruby patch version on Travis CI"Ryuta Kamizono2016-02-061-2/+2
* | | | | Merge pull request #23514 from y-yagi/revert_mailer_doc_fixKasper Timm Hansen2016-02-062-2/+2
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Revert "When generating a mailer, you must specify Mailer in the class name in"yuuji.yaginuma2016-02-062-2/+2
|/ / / /
* | | | add missing requireAaron Patterson2016-02-051-0/+1
* | | | Fix mixing line filters with Minitest's -n filter.Kasper Timm Hansen2016-02-052-4/+36
|/ / /
* | | Revert "Dump indexes in `create_table` instead of `add_index`"Sean Griffin2016-02-053-21/+16
* | | Merge pull request #23502 from sikachu/update-travis-masterRafael França2016-02-051-2/+2
|\ \ \
| * | | No need to specify Ruby patch version on Travis CIPrem Sichanugrist2016-02-051-2/+2
|/ / /
* | / disable controller / view thread spawning in testsAaron Patterson2016-02-053-3/+31
| |/ |/|
* | Merge pull request #23500 from akaspick/mailer_doc_fixRafael França2016-02-052-2/+2
|\ \
| * | When generating a mailer, you must specify Mailer in the class name inAndrew Kaspick2016-02-052-2/+2
|/ /
* | Missed a few spots in inline -> async switchDavid Heinemeier Hansson2016-02-053-8/+3
* | Change the default adapter from inline to asyncDavid Heinemeier Hansson2016-02-053-7/+16
* | Cant run on an out-of-the-box OSX installation without running out of TOO MAN...David Heinemeier Hansson2016-02-051-1/+1
* | Merge pull request #23494 from prathamesh-sonpatki/update-turbolinksRafael França2016-02-052-4/+9
|\ \
| * | Update turbolinks-rails for passing railties testPrathamesh Sonpatki2016-02-052-4/+9
* | | Merge pull request #23496 from y-yagi/donot_explicitly_mention_eventmachine_i...प्रथमेश Sonpatki2016-02-051-1/+1
|\ \ \ | |/ / |/| |
| * | don’t explicitly mention EventMachine [ci skip]yuuji.yaginuma2016-02-051-1/+1
|/ /
* | Merge branch 'master' of github.com:rails/railsZachary Scott2016-02-051-2/+2
|\ \
| * \ Merge pull request #23491 from y-yagi/move_changelog_entry_2Kasper Timm Hansen2016-02-051-2/+2
| |\ \
| | * | move CHANGELOG entry to the appropriate position [ci skip]yuuji.yaginuma2016-02-051-2/+2
* | | | Check off some todos for the Testing guide with @senny [ci skip]Zachary Scott2016-02-051-17/+26
|/ / /
* | | docs, remove trailing whitespace from testing guide. [ci skip]Yves Senn2016-02-051-9/+9
* | | docs, link Rails specific assertions to the API. [ci skip]Yves Senn2016-02-051-6/+6
* | | Merge pull request #23489 from y-yagi/add_missing_include_to_engine_test_exampleVipul A M2016-02-051-0/+4
|\ \ \ | |/ / |/| |
| * | add missing include to engine test example [ci skip]yuuji.yaginuma2016-02-051-0/+4
* | | Merge pull request #23472 from jhubert/patch-2Rafael França2016-02-052-1/+7
|\ \ \ | |/ / |/| |
| * | Remove accidental additional testJeremy Baker2016-02-041-5/+0
| * | Add a resolver test for the missing schemeJeremy Baker2016-02-042-0/+11
| * | Remove the assumption of schema in DATABASE_URLJeremy Baker2016-02-041-1/+1