aboutsummaryrefslogtreecommitdiffstats
path: root/railties
Commit message (Expand)AuthorAgeFilesLines
* Avoid defining the test if it does not need to when not on JRubyCarlos Antonio da Silva2014-07-301-2/+2
* Use default argument when testing generators without the need for extra argsCarlos Antonio da Silva2014-07-302-7/+7
* Simplify path setupCarlos Antonio da Silva2014-07-301-1/+1
* Simplify plugin tests a bit, leave the regexp work for minitestCarlos Antonio da Silva2014-07-301-6/+6
* Invert unless..else conditions on JRuby checksCarlos Antonio da Silva2014-07-302-12/+12
* Remove some more globals from testsCarlos Antonio da Silva2014-07-301-26/+26
* Fix / improve some assertionsCarlos Antonio da Silva2014-07-301-6/+4
* Remove some globals from configuration testsCarlos Antonio da Silva2014-07-301-20/+20
* Deprecate `*_path` methods in mailers@schneems and @sgrif2014-07-303-3/+55
* Revert "Merge pull request #15305 from tgxworld/remove_unnecessary_require"Santiago Pastorino2014-07-302-2/+2
* Merge pull request #16328 from noinkling/template_password_confirmation_fixYves Senn2014-07-292-1/+6
|\
| * Give password_confirmation div the "field" class in erb form templatenoinkling2014-07-291-1/+1
|/
* Additional clarification on password:digest in scaffold and model generator h...noinkling2014-07-252-4/+16
* Add password:digest information to scaffold generator help text [ci skip]noinkling2014-07-251-1/+5
* Remove mocha usageRafael Mendonça França2014-07-231-2/+5
* Fix syntax errorRafael Mendonça França2014-07-231-1/+2
* Dev and edge application and plugins need to include i18n masterRafael Mendonça França2014-07-231-1/+2
* Merge pull request #16267 from robin850/rbx-yamlRafael Mendonça França2014-07-232-0/+22
|\
| * Set Psych as the YAML engine for RubiniusRobin Dupret2014-07-232-0/+22
* | Do not set enforce_available_locales to i18n 0.7Rafael Mendonça França2014-07-231-18/+2
|/
* Merge branch 'rm-remove-mocha'Rafael Mendonça França2014-07-1913-79/+170
|\
| * Stop requiring mocha automaticallyRafael Mendonça França2014-07-197-0/+7
| * Stop using mocha on dbconsole_testRafael Mendonça França2014-07-151-44/+68
| * Stop using mocha on console_testRafael Mendonça França2014-07-071-15/+40
| * Set the application logger using configurationRafael Mendonça França2014-07-071-3/+5
| * Stop using mocha on configuration_testRafael Mendonça França2014-07-071-7/+23
| * Stop using mocha on app_rails_loader_testRafael Mendonça França2014-07-072-10/+27
* | Merge pull request #16212 from aantix/additional_migration_conflict_help_mess...Rafael Mendonça França2014-07-181-1/+2
|\ \
| * | Modified migration conflict message to remove the string concatenation.Jim Jones2014-07-181-3/+3
| * | Added additional help messaging when there's scaffolding being generated and ...Jim Jones2014-07-171-1/+2
* | | Prefer to pass block when logging.Guo Xiang Tan2014-07-181-1/+1
|/ /
* | Keep quietly and capture undeprecated on your suiteRafael Mendonça França2014-07-156-2/+77
* | Add Rails::Application#config_forRafael Mendonça França2014-07-153-0/+134
* | Add ability to extend `rails server` command options parserAndrey Chernih2014-07-111-7/+11
* | Merge pull request #16132 from tgxworld/fix_test_not_unsubscribingSantiago Pastorino2014-07-111-2/+2
|\ \
| * | Fix incorrect unsubscription.Guo Xiang Tan2014-07-111-2/+2
* | | Synced 4.2 release notes with the latest commits.Godfrey Chan2014-07-111-1/+1
|/ /
* | Merge pull request #13999 from jamox/update_rackAaron Patterson2014-07-081-2/+4
|\ \ | |/ |/|
| * Upgraded rackJarmo Isotalo2014-05-191-2/+4
* | Change back occurrences of SQLite(3) to sqlite3 when referring to theZachary Scott2014-07-061-1/+1
* | Merge pull request #16057 from akshay-vishnoi/doc_changeZachary Scott2014-07-061-1/+1
|\ \
| * | [ci skip] /sqlite/i --> SQLiteAkshay Vishnoi2014-07-061-1/+1
* | | Merge pull request #16046 from grosser/grosser/cleangenRafael Mendonça França2014-07-041-2/+1
|\ \ \
| * | | remove bundler magicgrosser2014-07-031-2/+1
* | | | Display notice in index.html pages in scaffolded generated viewsArun Agrawal2014-07-043-1/+11
| |/ / |/| |
* | | Revert "Merge pull request #15394 from morgoth/fix-automatic-maintaining-test...Rafael Mendonça França2014-07-021-90/+1
* | | Rename preview_enabled option to show_previewsRafael Mendonça França2014-07-012-10/+10
* | | Add configuration to enable mail previewsLeonard Garvey2014-07-013-2/+38
|/ /
* | Merge pull request #15933 from rafael/masterRafael Mendonça França2014-06-271-0/+38
|\ \
| * | Improvements per code review.Rafael Chacón2014-06-271-0/+25