aboutsummaryrefslogtreecommitdiffstats
path: root/railties
Commit message (Collapse)AuthorAgeFilesLines
...
| * | Add config.annotations, in order to register new extensions for Rake notes ↵robertomiranda2014-03-162-0/+14
| | | | | | | | | | | | at config level
| * | Fix Shadowing extensions variable in Register Annotation Exentsionsrobertomiranda2014-03-162-7/+7
| | |
| * | Supporting .ruby, .yml and .yaml Extension in Rake Notesrobertomiranda2014-03-142-2/+7
| | |
| * | Remove .scss, .sass, .less, .haml, .slim, coffee from Rake Notes. Now we ↵robertomiranda2014-03-142-17/+5
| | | | | | | | | | | | have an API for register it in the corresponding gems
| * | Add Public Api for register new extensions for Rake Notesrobertomiranda2014-03-142-15/+29
| | |
* | | Fix assertionsCarlos Antonio da Silva2014-03-161-2/+2
| | |
* | | Let COMMAND_WHITELIST be an Array, not a StringAkira Matsuda2014-03-161-1/+1
| | |
* | | better test error messagesschneems2014-03-141-4/+4
| | |
* | | Force sass-rails ~> 4.0.2 to avoid sprockets compatibility errorRafael Mendonça França2014-03-141-1/+1
|/ / | | | | | | See https://github.com/rails/sass-rails/issues/191 for more information
* | require actions rather than create_fileAaron Patterson2014-03-131-1/+1
| | | | | | | | | | | | | | thor's create_file seems to have a circular dependency on itself when used with our constant loading stuff. fixes #14319
* | Removed unnecessary command "application"Arun Agrawal2014-03-102-6/+5
| |
* | Merge pull request #14262 from sferik/flat_mapAndrew White2014-03-094-4/+4
|\ \ | | | | | | Replace additional instances of map.flatten with flat_map
| * | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Templates could rely on irregular inflections or external libraries for instance so we should load the application's initializers when running the rails:template task. The introducing commit of this feature is f7f11361 ; the initializers have never been loaded invoking this task. Fixes #12133.
* | | Introduce `Rails.gem_version`Prem Sichanugrist2014-03-055-11/+47
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This method return `Gem::Version.new(Rails.version)`, suggesting a more reliable way to perform version comparison. Example: Rails.version #=> "4.1.2" Rails.gem_version #=> #<Gem::Version "4.1.2"> Rails.version > "4.1.10" #=> false Rails.gem_version > Gem::Version.new("4.1.10") #=> true Gem::Requirement.new("~> 4.1.2") =~ Rails.gem_version #=> true This was originally introduced as `.version` by @charliesome in #8501 but got reverted in #10002 since it was not backward compatible. Also, updating template for `rake update_versions`.
* | | 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
|/ / | | | | | | | | | | | | | | | | HAML and probably other generators extend this class and invoke filename_with_extensions with the old signature (without format). This makes the second argument optional and defaults it to the #format method which could be overridden as well. Closes #14132.
* | Merge pull request #14195 from robin850/issue-14079Guillermo Iguaran2014-02-283-2/+23
|\ \ | | | | | | Avoid namespacing routes inside engines
| * | Avoid namespacing routes inside enginesRobin Dupret2014-02-263-2/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since #11544, invoking the controller generator, any generated route is namespaced according to the class_path method. Since a mountable plugin is namespaced, creating a controller inside would generate a namespaced route based on the engine's name. The controller generator now relies on regular_class_path which does not contain the class hierarchy but the given path. Fixes #14079.
* | | Merge pull request #14174 from kuldeepaggarwal/fix-resource_generator_testYves Senn2014-02-273-5/+5
|\ \ \ | | | | | | | | fix test cases
| * | | 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 gem
| * | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | From #14026: Specific rbx-2 to limit testing on Rubinius 2.x (since there will be other versions of Rubinius > 2.x soon). Also, as of Rubinius 2.2.5, it is no longer necessary to bundle the rubysl gem. This is what Rails master/4.1 supports, so we don't need to add rubysl to gemfiles anymore.
* | | | [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
|/ / | | | | | | Remove 4-1 related entries from master [ci skip]
* | 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
| | | | | | | | | | | | This is a follow up to #13515. It includes the name given and the singularized version in the warning message. This will aide the user to see wether the detected singular was right or not.
* | 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
|\ \ | | | | | | Added warning when user tried to create model with pluralize name.
| * | Add warning when user tried to create model with pluralize name.Kuldeep Aggarwal2014-02-235-12/+40
| | | | | | | | | | | | | | | 1. Generate model with correct_name. 2. It will help new users to avoid mistakes when tried to create model with wrong name.
* | | Revert "Only lookup `config.log_level` for stdlib `::Logger`. Closes #11665."Guillermo Iguaran2014-02-213-26/+2
|/ / | | | | | | | | | | | | | | | | | | | | | | This reverts commit e0a521cfcd13e4d1f0ae8ab96004289e1c020f71. Conflicts: railties/CHANGELOG.md We expect loggers to quack like stdlib logger. If log4r needs different level= assignment, using a Logger-quacking wrapper is the way to do it. Fixes #14114.
* | Merge branch '4-1-0-beta2'Rafael Mendonça França2014-02-181-1/+1
|\ \ | | | | | | | | | | | | | | | Conflicts: actionview/CHANGELOG.md activerecord/CHANGELOG.md
| * | 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
| | | | | | | | | | | | This reverts commit fefa8ae9a172835fb6b8aef7d1dd46d58eecd49f.
* | | remove railties changes. fixes #14054Aaron Patterson2014-02-146-191/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Squashed commit of the following: commit 96991e8e919edfb20cc4120bca4e36ed51175d57 Author: Aaron Patterson <aaron.patterson@gmail.com> Date: Fri Feb 14 11:29:24 2014 -0800 Revert "gems can be added or skipped from the template" This reverts commit 8beb42cfbc41753ae4dbb91e16abcd1fb7d00356. Conflicts: railties/lib/rails/generators/rails/app/app_generator.rb railties/test/generators/app_generator_test.rb commit 35599c0e657245ef14ac0f28c9189ad16acf40e6 Author: Aaron Patterson <aaron.patterson@gmail.com> Date: Fri Feb 14 11:26:53 2014 -0800 Revert "oops, template replay needs to happen after bundle. :orz:" This reverts commit 9104702be61253f9448ca070a22fc86bb4299555. Conflicts: railties/lib/rails/generators/rails/app/app_generator.rb commit f519c3902c313db8e906a49251c91643b8e6499e Author: Aaron Patterson <aaron.patterson@gmail.com> Date: Fri Feb 14 11:25:51 2014 -0800 Revert "only ask for these ivars if the target responds to them" This reverts commit 656d412546cd97d5660c634c2a41c799d3f9e211. commit aa524a9428e3e4c45fe221f10a66a08efb827ab5 Author: Aaron Patterson <aaron.patterson@gmail.com> Date: Fri Feb 14 11:25:39 2014 -0800 Revert "refactor generator tests to use block form of Tempfile" This reverts commit 65251820ef0ab7f3cffb38130de3dd41af8d72be. commit 7d3740549fa4dfa62e3761f8d4bc6d6d441256e7 Author: Aaron Patterson <aaron.patterson@gmail.com> Date: Fri Feb 14 11:25:25 2014 -0800 Revert "add a more restricted codepath for templates fixes #13390" This reverts commit 2875b4a66e38e4333da887a4afbed33358999298. commit 525df0af1001918986cdfce59539fd2d52c4f32c Author: Aaron Patterson <aaron.patterson@gmail.com> Date: Fri Feb 14 11:25:11 2014 -0800 Revert "add a send so `apply` can be called. Fixes #13510" This reverts commit c5034d60dba0cd31a6a8c612ee35d63b8127793a.
* | | 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
|\ \ \ | | | | | | | | Cookies serializer improvements
| * | | Updated CHANGELOG, docs, guides and release notes.Godfrey Chan2014-02-111-0/+3
| | | | | | | | | | | | | | | | Also added a `cookies_serializer.rb` initializer to the app template.
| * | | 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
|/ / / | | | | | | | | | | | | | | | | | | THIS IS A HUGE HACK. Thor does not allow us to define public methods without turning them in to "thor tasks". That means we cannot subclass the `apply` method and make it public, so we have to make the method private and call `send` on it.
* | | Merge branch 'dump-schema-after-migration-flag' of ↵Xavier Noria2014-02-064-0/+60
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | git://github.com/emilsoman/rails into emilsoman-dump-schema-after-migration-flag Conflicts: activerecord/CHANGELOG.md
| * | | Add config to disable schema dump after migrationEmil Soman2014-02-064-0/+60
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Add a config on Active Record named `dump_schema_after_migration` * Schema dump doesn't happen if the config is set to false * Set default value of the config to true * Set config in generated production environment file to false * Update configuration guide * Update CHANGELOG
* | | | synchronize 4.1 release notes with CHANGELOGS. [ci skip]Yves Senn2014-02-061-1/+1
|/ / / | | | | | | | | | /cc @chancancode