aboutsummaryrefslogtreecommitdiffstats
path: root/railties
Commit message (Collapse)AuthorAgeFilesLines
* 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
* | Merge pull request #13612 from eval/issue-13588Rafael Mendonça França2014-01-304-16/+230
|\ \ | | | | | | Add CreateMigration action
| * | Add CreateMigration actionGert Goet2014-01-284-16/+230
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This Thor-action isolates the logic whether to (over-)write migration and what is shown to the user. It's modelled after Thor's CreateFile-action. This solves the issue that removing a non-existing migration, tried to remove the template-path (#13588). Related issues: #12674
* | | Modify the session serializer implementationGuillermo Iguaran2014-01-302-2/+2
| | | | | | | | | | | | | | | Rename allowed options to :marshal and :json, for custom serializers only allow the use of custom classes.
* | | Enhance errors while retrieving database configschneems2014-01-291-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Right now if there is an error retrieving database configuration the intent of the error (what the code was trying to do while you got the error) could be more explicit. Instead of this error: ``` Invalid DATABASE_URL: nil (erb):9:in `rescue in <main>' (erb):6:in `<main>' /Users/schneems/.rbenv/versions/2.1.0/lib/ruby/2.1.0/erb.rb:850:in `eval' /Users/schneems/.rbenv/versions/2.1.0/lib/ruby/2.1.0/erb.rb:850:in `result' /Users/schneems/Documents/projects/rails/railties/lib/rails/application/configuration.rb:98:in `database_configuration' /Users/schneems/Documents/projects/rails/activerecord/lib/active_record/railtie.rb:41:in `block in <class:Railtie>' /Users/schneems/Documents/projects/rails/railties/lib/rails/railtie.rb:237:in `instance_exec' /Users/schneems/Documents/projects/rails/railties/lib/rails/railtie.rb:237:in `block in run_tasks_blocks' /Users/schneems/Documents/projects/rails/railties/lib/rails/railtie.rb:237:in `each' /Users/schneems/Documents/projects/rails/railties/lib/rails/railtie.rb:237:in `run_tasks_blocks' /Users/schneems/Documents/projects/rails/railties/lib/rails/application.rb:339:in `block in run_tasks_blocks' /Users/schneems/Documents/projects/rails/railties/lib/rails/engine/railties.rb:13:in `each' ``` I propose we issue this error: ``` Cannot load `Rails.application.database_configuration`: Invalid DATABASE_URL: nil (erb):9:in `rescue in <main>' (erb):6:in `<main>' /Users/schneems/.rbenv/versions/2.1.0/lib/ruby/2.1.0/erb.rb:850:in `eval' /Users/schneems/.rbenv/versions/2.1.0/lib/ruby/2.1.0/erb.rb:850:in `result' /Users/schneems/Documents/projects/rails/railties/lib/rails/application/configuration.rb:98:in `database_configuration' /Users/schneems/Documents/projects/rails/activerecord/lib/active_record/railtie.rb:41:in `block in <class:Railtie>' /Users/schneems/Documents/projects/rails/railties/lib/rails/railtie.rb:237:in `instance_exec' /Users/schneems/Documents/projects/rails/railties/lib/rails/railtie.rb:237:in `block in run_tasks_blocks' /Users/schneems/Documents/projects/rails/railties/lib/rails/railtie.rb:237:in `each' /Users/schneems/Documents/projects/rails/railties/lib/rails/railtie.rb:237:in `run_tasks_blocks' /Users/schneems/Documents/projects/rails/railties/lib/rails/application.rb:339:in `block in run_tasks_blocks' /Users/schneems/Documents/projects/rails/railties/lib/rails/engine/railties.rb:13:in `each' ```
* | | Allow session serializer key in config.session_storeLukasz Sarnacki2014-01-293-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MessageEncryptor has :serializer option, where any serializer object can be passed. This commit make it possible to set this serializer from configuration level. There are predefined serializers (:marshal_serializer, :json_serialzier) and custom serializer can be passed as String, Symbol (camelized and constantized in ActionDispatch::Session namepspace) or serializer object. Default :json_serializer was also added to generators to provide secure defalt.
* | | Merge pull request #13857 from teoljungberg/replace-file-exists-ehCarlos Antonio da Silva2014-01-271-1/+1
|\ \ \ | |/ / |/| | Replace File.exists? with File.exist?
| * | Replace File.exists? with File.exist?Teo Ljungberg2014-01-271-1/+1
| | | | | | | | | | | | To quell warnings on ruby 2.1
* | | Rails config for raise on missing translationsKassio Borges2014-01-272-0/+6
|/ / | | | | | | | | Add a config to setup whether raise exception for missing translation or not.
* | Correct grammar from '... allowing both thread web servers ...' to '... ↵Adrien Lamothe2014-01-251-1/+1
| | | | | | | | allowing both threaded web servers ...'.
* | Add a missing changelog entry for #13825 [ci skip]Robin Dupret2014-01-251-0/+6
| |
* | Add a test-case for GH #13825Guillermo Iguaran2014-01-241-2/+8
| |
* | app_rails_loader.rb should check if bin/rails is a File before calling ↵Byron Bischoff2014-01-241-1/+1
| | | | | | | | File.read(exe); closes #13825
* | Merge pull request #13696 from senny/engine_bin_rails_load_bundlerYves Senn2014-01-211-0/+4
|\ \ | | | | | | setup Bundler in engines `bin/rails` stub.
| * | setup Bundler in engines `bin/rails` stub.Yves Senn2014-01-131-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is necessary when bundling gems locally using `BUNDLE_PATH`. Without this patch `bin/rails` fails with: ``` /Users/senny/.rbenv/versions/2.0.0-p353/lib/ruby/site_ruby/2.0.0/rubygems/core_ext/kernel_require.rb:55:in `require': cannot load such file -- rails/all (LoadError) from /Users/senny/.rbenv/versions/2.0.0-p353/lib/ruby/site_ruby/2.0.0/rubygems/core_ext/kernel_require.rb:55:in `require' from bin/rails:7:in `<main>' ```
* | | moving controller_name assignment before model name conditionanilmaurya2014-01-201-3/+1
| | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-17 17:17:24 +0000