| Commit message (Expand) | Author | Age | Files | Lines |
* | Deprecate `*_path` methods in mailers | @schneems and @sgrif | 2014-07-30 | 3 | -3/+55 |
* | Revert "Merge pull request #15305 from tgxworld/remove_unnecessary_require" | Santiago Pastorino | 2014-07-30 | 2 | -2/+2 |
* | Merge pull request #16328 from noinkling/template_password_confirmation_fix | Yves Senn | 2014-07-29 | 2 | -1/+6 |
|\ |
|
| * | Give password_confirmation div the "field" class in erb form template | noinkling | 2014-07-29 | 1 | -1/+1 |
|/ |
|
* | Additional clarification on password:digest in scaffold and model generator h... | noinkling | 2014-07-25 | 2 | -4/+16 |
* | Add password:digest information to scaffold generator help text [ci skip] | noinkling | 2014-07-25 | 1 | -1/+5 |
* | Remove mocha usage | Rafael Mendonça França | 2014-07-23 | 1 | -2/+5 |
* | Fix syntax error | Rafael Mendonça França | 2014-07-23 | 1 | -1/+2 |
* | Dev and edge application and plugins need to include i18n master | Rafael Mendonça França | 2014-07-23 | 1 | -1/+2 |
* | Merge pull request #16267 from robin850/rbx-yaml | Rafael Mendonça França | 2014-07-23 | 2 | -0/+22 |
|\ |
|
| * | Set Psych as the YAML engine for Rubinius | Robin Dupret | 2014-07-23 | 2 | -0/+22 |
* | | Do not set enforce_available_locales to i18n 0.7 | Rafael Mendonça França | 2014-07-23 | 1 | -18/+2 |
|/ |
|
* | Merge branch 'rm-remove-mocha' | Rafael Mendonça França | 2014-07-19 | 13 | -79/+170 |
|\ |
|
| * | Stop requiring mocha automatically | Rafael Mendonça França | 2014-07-19 | 7 | -0/+7 |
| * | Stop using mocha on dbconsole_test | Rafael Mendonça França | 2014-07-15 | 1 | -44/+68 |
| * | Stop using mocha on console_test | Rafael Mendonça França | 2014-07-07 | 1 | -15/+40 |
| * | Set the application logger using configuration | Rafael Mendonça França | 2014-07-07 | 1 | -3/+5 |
| * | Stop using mocha on configuration_test | Rafael Mendonça França | 2014-07-07 | 1 | -7/+23 |
| * | Stop using mocha on app_rails_loader_test | Rafael Mendonça França | 2014-07-07 | 2 | -10/+27 |
* | | Merge pull request #16212 from aantix/additional_migration_conflict_help_mess... | Rafael Mendonça França | 2014-07-18 | 1 | -1/+2 |
|\ \ |
|
| * | | Modified migration conflict message to remove the string concatenation. | Jim Jones | 2014-07-18 | 1 | -3/+3 |
| * | | Added additional help messaging when there's scaffolding being generated and ... | Jim Jones | 2014-07-17 | 1 | -1/+2 |
* | | | Prefer to pass block when logging. | Guo Xiang Tan | 2014-07-18 | 1 | -1/+1 |
|/ / |
|
* | | Keep quietly and capture undeprecated on your suite | Rafael Mendonça França | 2014-07-15 | 6 | -2/+77 |
* | | Add Rails::Application#config_for | Rafael Mendonça França | 2014-07-15 | 3 | -0/+134 |
* | | Add ability to extend `rails server` command options parser | Andrey Chernih | 2014-07-11 | 1 | -7/+11 |
* | | Merge pull request #16132 from tgxworld/fix_test_not_unsubscribing | Santiago Pastorino | 2014-07-11 | 1 | -2/+2 |
|\ \ |
|
| * | | Fix incorrect unsubscription. | Guo Xiang Tan | 2014-07-11 | 1 | -2/+2 |
* | | | Synced 4.2 release notes with the latest commits. | Godfrey Chan | 2014-07-11 | 1 | -1/+1 |
|/ / |
|
* | | Merge pull request #13999 from jamox/update_rack | Aaron Patterson | 2014-07-08 | 1 | -2/+4 |
|\ \
| |/
|/| |
|
| * | Upgraded rack | Jarmo Isotalo | 2014-05-19 | 1 | -2/+4 |
* | | Change back occurrences of SQLite(3) to sqlite3 when referring to the | Zachary Scott | 2014-07-06 | 1 | -1/+1 |
* | | Merge pull request #16057 from akshay-vishnoi/doc_change | Zachary Scott | 2014-07-06 | 1 | -1/+1 |
|\ \ |
|
| * | | [ci skip] /sqlite/i --> SQLite | Akshay Vishnoi | 2014-07-06 | 1 | -1/+1 |
* | | | Merge pull request #16046 from grosser/grosser/cleangen | Rafael Mendonça França | 2014-07-04 | 1 | -2/+1 |
|\ \ \ |
|
| * | | | remove bundler magic | grosser | 2014-07-03 | 1 | -2/+1 |
* | | | | Display notice in index.html pages in scaffolded generated views | Arun Agrawal | 2014-07-04 | 3 | -1/+11 |
| |/ /
|/| | |
|
* | | | Revert "Merge pull request #15394 from morgoth/fix-automatic-maintaining-test... | Rafael Mendonça França | 2014-07-02 | 1 | -90/+1 |
* | | | Rename preview_enabled option to show_previews | Rafael Mendonça França | 2014-07-01 | 2 | -10/+10 |
* | | | Add configuration to enable mail previews | Leonard Garvey | 2014-07-01 | 3 | -2/+38 |
|/ / |
|
* | | Merge pull request #15933 from rafael/master | Rafael Mendonça França | 2014-06-27 | 1 | -0/+38 |
|\ \ |
|
| * | | Improvements per code review. | Rafael Chacón | 2014-06-27 | 1 | -0/+25 |
| * | | Add always_permitted_parameters as an option. | Rafael Chacón | 2014-06-26 | 1 | -0/+13 |
* | | | Talk about config.assts.version move too | Rafael Mendonça França | 2014-06-27 | 1 | -1/+1 |
* | | | Add a test for db:migrate:status to check missing file scenario | Viktar Basharymau | 2014-06-27 | 1 | -0/+15 |
* | | | Require shellwords since it is dependecy of this file | Rafael Mendonça França | 2014-06-26 | 1 | -0/+2 |
* | | | Merge pull request #15885 from lucasmazza/lm-skip-routes | Rafael Mendonça França | 2014-06-24 | 2 | -2/+13 |
|\ \ \ |
|
| * | | | Add a '--skip-routes' flag for the Controller generator. | Lucas Mazza | 2014-06-24 | 2 | -2/+13 |
* | | | | `:nodoc: all` does not remove the constants from the API. [ci skip] | Yves Senn | 2014-06-24 | 1 | -2/+2 |
|/ / / |
|
* | | | Titling the model name in views generated by scaffold. | Amit Suryavanshi | 2014-06-18 | 3 | -3/+3 |