aboutsummaryrefslogtreecommitdiffstats
path: root/railties
Commit message (Expand)AuthorAgeFilesLines
* Removed unnecessary command "application"Arun Agrawal2014-03-102-6/+5
* Merge pull request #14262 from sferik/flat_mapAndrew White2014-03-094-4/+4
|\
| * Replace map.flatten with flat_map in railtiesErik Michaels-Ober2014-03-044-4/+4
* | Make the rails:template rake task load initializersRobin Dupret2014-03-083-1/+18
* | Introduce `Rails.gem_version`Prem Sichanugrist2014-03-055-11/+47
* | Always return an array from formats so there is no need to wrap it when callingCarlos Antonio da Silva2014-03-043-3/+3
* | Fix for external generators extend Erb::GeneratorsAllen Fair2014-03-041-1/+1
|/
* Merge pull request #14195 from robin850/issue-14079Guillermo Iguaran2014-02-283-2/+23
|\
| * Avoid namespacing routes inside enginesRobin Dupret2014-02-263-2/+23
* | Merge pull request #14174 from kuldeepaggarwal/fix-resource_generator_testYves Senn2014-02-273-5/+5
|\ \
| * | modify model generator warning message. refs [#174c9f0]Kuldeep Aggarwal2014-02-273-5/+5
* | | pass strings to the underscore methodAaron Patterson2014-02-262-3/+3
* | | Merge pull request #14149 from tjschuck/bcrypt_gem_renameCarlos Antonio da Silva2014-02-261-1/+1
|\ \ \
| * | | Bump version of bcrypt gemT.J. Schuck2014-02-251-1/+1
| | |/ | |/|
* | | Remove inclusion of rubysl gem for rbx on generated GemfileCarlos Antonio da Silva2014-02-252-16/+0
* | | [skip ci] Fix test name typo in app generator tests.Spencer Rogers2014-02-251-1/+1
|/ /
* / Point master changelogs to 4-1-stable branchCarlos Antonio da Silva2014-02-251-312/+1
|/
* build fix. follow up to 174c9f0df39cd338a4871f82794256cc64f68a81Yves Senn2014-02-241-1/+1
* include names in model generator warning message. refs #13515.Yves Senn2014-02-242-5/+7
* Group assets options in production env templateCarlos Antonio da Silva2014-02-231-6/+4
* update version to 4.2.0.alphaYves Senn2014-02-231-2/+2
* Merge pull request #13515 from kuldeepaggarwal/f-model-generationGodfrey Chan2014-02-225-12/+40
|\
| * Add warning when user tried to create model with pluralize name.Kuldeep Aggarwal2014-02-235-12/+40
* | Revert "Only lookup `config.log_level` for stdlib `::Logger`. Closes #11665."Guillermo Iguaran2014-02-213-26/+2
|/
* Merge branch '4-1-0-beta2'Rafael Mendonça França2014-02-181-1/+1
|\
| * Preparing for 4.1.0.beta2 releaseRafael Mendonça França2014-02-181-1/+1
* | Revert "Fixed plugin_generator test"Arun Agrawal2014-02-151-4/+1
* | remove railties changes. fixes #14054Aaron Patterson2014-02-146-191/+10
* | fix path shown in mailer's templatesKassio Borges2014-02-143-6/+6
* | Merge pull request #13945 from rails/json_cookie_serializer_improvementsGuillermo Iguaran2014-02-134-3/+6
|\ \
| * | Updated CHANGELOG, docs, guides and release notes.Godfrey Chan2014-02-111-0/+3
| * | Fix AppGeneratorTest: serializer option was removed from session_storeGuillermo Iguaran2014-02-111-1/+1
| * | Remove serializer option from session_store.rb templateGuillermo Iguaran2014-02-111-1/+1
| * | Renamed session_serializer option to cookies_serializerGodfrey Chan2014-02-111-1/+1
* | | do not crash when `config/secrets.yml` is blank.Yves Senn2014-02-123-1/+14
* | | Hide bundler output for `rails new` if quiet option is specified.Christian Wesselhoeft2014-02-111-1/+2
* | | add a send so `apply` can be called. Fixes #13510Aaron Patterson2014-02-112-1/+33
|/ /
* | Merge branch 'dump-schema-after-migration-flag' of git://github.com/emilsoman...Xavier Noria2014-02-064-0/+60
|\ \
| * | Add config to disable schema dump after migrationEmil Soman2014-02-064-0/+60
* | | synchronize 4.1 release notes with CHANGELOGS. [ci skip]Yves Senn2014-02-061-1/+1
|/ /
* | Merge pull request #13612 from eval/issue-13588Rafael Mendonça França2014-01-304-16/+230
|\ \
| * | Add CreateMigration actionGert Goet2014-01-284-16/+230
* | | Modify the session serializer implementationGuillermo Iguaran2014-01-302-2/+2
* | | Enhance errors while retrieving database configschneems2014-01-291-0/+2
* | | Allow session serializer key in config.session_storeLukasz Sarnacki2014-01-293-3/+4
* | | Merge pull request #13857 from teoljungberg/replace-file-exists-ehCarlos Antonio da Silva2014-01-271-1/+1
|\ \ \ | |/ / |/| |
| * | Replace File.exists? with File.exist?Teo Ljungberg2014-01-271-1/+1
* | | Rails config for raise on missing translationsKassio Borges2014-01-272-0/+6
|/ /
* | Correct grammar from '... allowing both thread web servers ...' to '... allow...Adrien Lamothe2014-01-251-1/+1
* | Add a missing changelog entry for #13825 [ci skip]Robin Dupret2014-01-251-0/+6