| Commit message (Expand) | Author | Age | Files | Lines |
* | Merge pull request #23519 from kamipo/mariadb_does_not_support_json_type | Sean Griffin | 2016-02-06 | 1 | -1/+1 |
|\ |
|
| * | MariaDB does not support JSON type | Ryuta Kamizono | 2016-02-06 | 1 | -1/+1 |
* | | Avoid coupling Action Pack to Railties. | Kasper Timm Hansen | 2016-02-06 | 1 | -1/+1 |
* | | Merge pull request #23529 from syamilmj/remove_unused_method | Rafael França | 2016-02-06 | 1 | -4/+0 |
|\ \ |
|
| * | | Remove unused private method | Syamil MJ | 2016-02-07 | 1 | -4/+0 |
|/ / |
|
* | | Merge pull request #23520 from kamipo/remove_duplicated_require_arel | Sean Griffin | 2016-02-06 | 1 | -1/+0 |
|\ \
| |/
|/| |
|
| * | Remove duplicated `require 'arel'` | Ryuta Kamizono | 2016-02-06 | 1 | -1/+0 |
* | | Merge pull request #23517 from gsamokovarov/yay-youre-on-rails | Eileen M. Uchitelle | 2016-02-06 | 2 | -2/+2 |
|\ \
| |/
|/| |
|
| * | Replace old Rails greeting references | Genadi Samokovarov | 2016-02-06 | 2 | -2/+2 |
* | | Merge pull request #23513 from kamipo/revert-23502-update-travis-master | Kasper Timm Hansen | 2016-02-06 | 1 | -2/+2 |
|\ \ |
|
| * | | Revert "No need to specify Ruby patch version on Travis CI" | Ryuta Kamizono | 2016-02-06 | 1 | -2/+2 |
* | | | Merge pull request #23514 from y-yagi/revert_mailer_doc_fix | Kasper Timm Hansen | 2016-02-06 | 2 | -2/+2 |
|\ \ \
| |_|/
|/| | |
|
| * | | Revert "When generating a mailer, you must specify Mailer in the class name in" | yuuji.yaginuma | 2016-02-06 | 2 | -2/+2 |
|/ / |
|
* | | add missing require | Aaron Patterson | 2016-02-05 | 1 | -0/+1 |
* | | Fix mixing line filters with Minitest's -n filter. | Kasper Timm Hansen | 2016-02-05 | 2 | -4/+36 |
|/ |
|
* | Revert "Dump indexes in `create_table` instead of `add_index`" | Sean Griffin | 2016-02-05 | 3 | -21/+16 |
* | Merge pull request #23502 from sikachu/update-travis-master | Rafael França | 2016-02-05 | 1 | -2/+2 |
|\ |
|
| * | No need to specify Ruby patch version on Travis CI | Prem Sichanugrist | 2016-02-05 | 1 | -2/+2 |
|/ |
|
* | disable controller / view thread spawning in tests | Aaron Patterson | 2016-02-05 | 3 | -3/+31 |
* | Merge pull request #23500 from akaspick/mailer_doc_fix | Rafael França | 2016-02-05 | 2 | -2/+2 |
|\ |
|
| * | When generating a mailer, you must specify Mailer in the class name in | Andrew Kaspick | 2016-02-05 | 2 | -2/+2 |
|/ |
|
* | Missed a few spots in inline -> async switch | David Heinemeier Hansson | 2016-02-05 | 3 | -8/+3 |
* | Change the default adapter from inline to async | David Heinemeier Hansson | 2016-02-05 | 3 | -7/+16 |
* | Cant run on an out-of-the-box OSX installation without running out of TOO MAN... | David Heinemeier Hansson | 2016-02-05 | 1 | -1/+1 |
* | Merge pull request #23494 from prathamesh-sonpatki/update-turbolinks | Rafael França | 2016-02-05 | 2 | -4/+9 |
|\ |
|
| * | Update turbolinks-rails for passing railties test | Prathamesh Sonpatki | 2016-02-05 | 2 | -4/+9 |
* | | Merge pull request #23496 from y-yagi/donot_explicitly_mention_eventmachine_i... | प्रथमेश Sonpatki | 2016-02-05 | 1 | -1/+1 |
|\ \
| |/
|/| |
|
| * | don’t explicitly mention EventMachine [ci skip] | yuuji.yaginuma | 2016-02-05 | 1 | -1/+1 |
|/ |
|
* | Merge branch 'master' of github.com:rails/rails | Zachary Scott | 2016-02-05 | 1 | -2/+2 |
|\ |
|
| * | Merge pull request #23491 from y-yagi/move_changelog_entry_2 | Kasper Timm Hansen | 2016-02-05 | 1 | -2/+2 |
| |\ |
|
| | * | move CHANGELOG entry to the appropriate position [ci skip] | yuuji.yaginuma | 2016-02-05 | 1 | -2/+2 |
* | | | Check off some todos for the Testing guide with @senny [ci skip] | Zachary Scott | 2016-02-05 | 1 | -17/+26 |
|/ / |
|
* | | docs, remove trailing whitespace from testing guide. [ci skip] | Yves Senn | 2016-02-05 | 1 | -9/+9 |
* | | docs, link Rails specific assertions to the API. [ci skip] | Yves Senn | 2016-02-05 | 1 | -6/+6 |
* | | Merge pull request #23489 from y-yagi/add_missing_include_to_engine_test_example | Vipul A M | 2016-02-05 | 1 | -0/+4 |
|\ \
| |/
|/| |
|
| * | add missing include to engine test example [ci skip] | yuuji.yaginuma | 2016-02-05 | 1 | -0/+4 |
* | | Merge pull request #23472 from jhubert/patch-2 | Rafael França | 2016-02-05 | 2 | -1/+7 |
|\ \
| |/
|/| |
|
| * | Remove accidental additional test | Jeremy Baker | 2016-02-04 | 1 | -5/+0 |
| * | Add a resolver test for the missing scheme | Jeremy Baker | 2016-02-04 | 2 | -0/+11 |
| * | Remove the assumption of schema in DATABASE_URL | Jeremy Baker | 2016-02-04 | 1 | -1/+1 |
* | | Merge pull request #23473 from gsamokovarov/kernel-module-function | Rafael França | 2016-02-04 | 2 | -0/+4 |
|\ \ |
|
| * | | Don't publicize Kernel core extensions | Genadi Samokovarov | 2016-02-04 | 2 | -0/+4 |
* | | | Merge pull request #23481 from meinac/activemodel_errors_doc_for_behaviour | Sean Griffin | 2016-02-04 | 1 | -0/+9 |
|\ \ \ |
|
| * | | | Add documentation about method to describe how it works [ci skip] | Mehmet Emin İNAÇ | 2016-02-04 | 1 | -0/+9 |
* | | | | Merge pull request #23484 from rubys/patch-1 | Rafael França | 2016-02-04 | 1 | -7/+7 |
|\ \ \ \ |
|
| * | | | | hotlink to the source and results for AWDwR tests | Sam Ruby | 2016-02-04 | 1 | -7/+7 |
|/ / / / |
|
* | | | | Test with Turbolinks 5 | Rafael Mendonça França | 2016-02-04 | 2 | -4/+5 |
* | | | | Merge pull request #23479 from vipulnsward/23431-remove-jquery-on-sprockets-skip | Rafael França | 2016-02-04 | 2 | -2/+3 |
|\ \ \ \ |
|
| * | | | | - app generate option --skip-sprockets leaves jquery-rails gem, which relies ... | Vipul A M | 2016-02-04 | 2 | -2/+3 |
|/ / / / |
|
* | | | | Merge pull request #23480 from sikachu/redis-commented-out | David Heinemeier Hansson | 2016-02-04 | 1 | -1/+1 |
|\ \ \ \ |
|