aboutsummaryrefslogtreecommitdiffstats
path: root/railties/lib/rails/generators
Commit message (Collapse)AuthorAgeFilesLines
* Fix method assertion ensuring it will match "end" with the same indentationCarlos Antonio da Silva2012-12-081-2/+2
| | | | | Otherwise it was matching "end" lines from blocks within the method body, making tests such as the migration ones fail.
* Merge pull request #8461 from frodsan/fix_assert_method_generatorsCarlos Antonio da Silva2012-12-081-1/+1
|\ | | | | Fix #assert_instance_method to also assert indented methods
| * Fix #assert_instance_method to also assert indented methodsFrancesco Rodriguez2012-12-081-1/+1
| |
* | use :only instead of :except callback option in the controller templateFrancesco Rodriguez2012-12-071-3/+2
|/ | | | | | As [Security Guide](http://edgeguides.rubyonrails.org/security.html#whitelists-versus-blacklists) says, it's better to use `before_filter only: []` instead of `except: []` so we don't forget to turn the filter off for newly added actions.
* Let the scaffold example use the "set shared record" pattern to explain ↵David Heinemeier Hansson2012-12-071-6/+7
| | | | callbacks
* Revert turbolinks load order requirementNick Reed2012-12-051-3/+1
|
* Replace comments' non-breaking spaces with spacesclaudiob2012-12-041-1/+1
| | | | | | | | | | Sometimes, on Mac OS X, programmers accidentally press Option+Space rather than just Space and don’t see the difference. The problem is that Option+Space writes a non-breaking space (0XA0) rather than a normal space (0x20). This commit removes all the non-breaking spaces inadvertently introduced in the comments of the code.
* Track the default application.css/js files for turbolinks as per version 0.6.0David Heinemeier Hansson2012-12-041-2/+2
|
* Locate `=require turbolinks` at the bottom of application.jsYasuharu Ozaki2012-12-041-1/+3
| | | | | Turbolinks should be located at the bottom of application.js to detect assets change properly.
* Quote ~ in git config global excludes command.Matthew M. Boedicker2012-12-011-1/+1
| | | | | This will put ~/ in .gitconfig so it will not be hardcoded to the home directory where the command was run.
* Gemfile source url for plugins updatedAmparo Luna2012-11-291-1/+1
|
* Remove observers and sweepersRafael Mendonça França2012-11-286-44/+3
| | | | | | | | They was extracted from a plugin. See https://github.com/rails/rails-observers [Rafael Mendonça França + Steve Klabnik]
* Revert "Merge pull request #8341 from amatsuda/bundle_source_rubygems"Rafael Mendonça França2012-11-272-2/+2
| | | | | | | | | This reverts commit 33b29e0112db62d3a8c798bb58f51c0a839d9e26, reversing changes made to ac8c729342e6b020a57d0d6887c8a8d5b39f96e0. Reason: https://github.com/rails/rails/pull/4684#commitcomment-920313
* default source in Gemfiles to :rubygems rather than hardcoding the URLAkira Matsuda2012-11-282-2/+2
| | | | | | * I guess this would be the preferrable default for Bundler * current version of Bundler converts :rubygems into 'http://rubygems.org', not https://, and that will help those who are working on a very poor network environment that doesn't allow SSL
* require bundler groups to include rake-tasks in enginesYves Senn2012-11-181-1/+1
| | | | | | | | If you generate a full engine, this will include rake tasks from your gem under the `app` namespace. For example if you have a dependency on `rspec-rails` in your engine's `gemspec`. You will get the task `app:spec` Closes #8229
* Adding sqlserver.yml template to satisfy "-d sqlserver" being givenRobert Nesius2012-11-161-0/+57
| | | | invocations of "rails new".
* Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-11-171-1/+2
|\ | | | | | | | | Conflicts: actionpack/lib/action_dispatch/routing/redirection.rb
| * Update production.rb: Split long comment in two linesGuillermo Iguaran2012-11-121-1/+2
| |
| * Update production.rb documentation: only files in app/assets are in ↵Guillermo Iguaran2012-11-121-1/+1
| | | | | | | | config.assets.precompile
* | Remove config.threadsafe! from production env templateCarlos Antonio da Silva2012-11-161-3/+0
| | | | | | | | Closes #8232 [ci skip]
* | Merge pull request #8112 from rails/encrypted_cookiesSantiago Pastorino2012-11-152-3/+3
|\ \ | | | | | | Encrypted cookies
| * | Rename secret_token_key to secret_key_baseSantiago Pastorino2012-11-031-2/+2
| | |
| * | Add encrypted cookie storeSantiago Pastorino2012-11-031-1/+1
| | |
| * | Sign cookies using key deriverSantiago Pastorino2012-11-031-2/+2
| |/
* | `plugin new` adds dummy app tasks when necessary.Yves Senn2012-11-082-2/+6
| | | | | | | | | | | | | | Closes #8121 The `plugin new` generator always adds the dummy app rake tasks, when a dummy app was created.
* | Remove some line breaks between array items that make the assert file tests ↵Carlos Antonio da Silva2012-11-041-1/+1
|/ | | | harder to read
* USe the released version of sprockets-rails in a new Rails 4 applicationRafael Mendonça França2012-10-271-1/+1
|
* Remove extra line in Gemfile under turbolinks.Geoffrey Roguelon2012-10-211-1/+1
|
* Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-10-211-1/+1
|\ | | | | | | | | | | Conflicts: activesupport/lib/active_support/core_ext/hash/slice.rb guides/source/active_support_core_extensions.md
| * Corrected the logic in production.rb comment.Robb Shecter2012-10-181-1/+1
| |
| * Moving code base to 1.9 hash syntaxAvnerCohen2012-10-163-7/+7
| |
* | We don't need this anymore since we had a sprockets-rails releaseRafael Mendonça França2012-10-191-3/+0
| |
* | Fix the app_generator and plugin_new testsRafael Mendonça França2012-10-181-0/+3
| |
* | Now the Sprockets railtie lives in sprockets/railtieRafael Mendonça França2012-10-182-2/+2
| |
* | Change back to official sprockets-railsJoshua Peek2012-10-171-2/+2
| |
* | Switch to new sprockets-rails pluginJoshua Peek2012-10-153-7/+5
| |
* | Use Ruby 1.9 Hash syntax in railtiesRobin Dupret2012-10-1435-112/+112
| |
* | Backpedal from class-oriented config.queue. Set an actual queue instance.Jeremy Kemper2012-10-122-2/+2
| |
* | Immediately run queued jobs in tests. Otherwise you have to explicitly drain ↵Jeremy Kemper2012-10-121-2/+2
| | | | | | | | the queue to actually deliver your emails.
* | Fixing build failuresVijay Dev2012-10-116-14/+14
| | | | | | | | | | | | | | Build failed with an error "invalid multibyte char (US-ASCII)" in these files. Apparently, some UTF-8 char disguised as whitespace causes this. Thanks @rafaelfranca
* | Merge pull request #7898 from olivierlacan/pg_homebrew_instructionsVijay Dev2012-10-101-1/+3
|\ \ | |/ |/| Offer instructions for pg gem when installed via Homebrew
| * Offer instructions for pg gem when installed via HomebrewOlivier Lacan2012-10-101-1/+3
| |
* | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-10-1139-93/+86
|\ \ | | | | | | | | | | | | | | | Conflicts: activerecord/lib/active_record/persistence.rb railties/lib/rails/generators/rails/resource_route/resource_route_generator.rb
| * | copy-edit the email delivery errors commentVijay Dev2012-10-111-1/+1
| | |
| * | update Rails::Generators docs [ci skip]Francesco Rodriguez2012-10-0721-42/+34
| | |
| * | nodoc JS::Generators [ci skip]Francesco Rodriguez2012-10-071-3/+3
| | |
| * | nodoc Erb::Generators [ci skip]Francesco Rodriguez2012-10-074-11/+11
| | |
| * | nodoc CSS::Generators [ci skip]Francesco Rodriguez2012-10-072-6/+6
| | |
| * | nodoc TestUnit::Generators [ci skip]Francesco Rodriguez2012-10-0710-30/+30
| | |
| * | Update ↵Adrien Lamothe2012-10-061-1/+2
| | | | | | | | | | | | railties/lib/rails/generators/rails/app/templates/config/environments/production.rb.tt