Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Fix method assertion ensuring it will match "end" with the same indentation | Carlos Antonio da Silva | 2012-12-08 | 1 | -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_generators | Carlos Antonio da Silva | 2012-12-08 | 1 | -1/+1 |
|\ | | | | | Fix #assert_instance_method to also assert indented methods | ||||
| * | Fix #assert_instance_method to also assert indented methods | Francesco Rodriguez | 2012-12-08 | 1 | -1/+1 |
| | | |||||
* | | use :only instead of :except callback option in the controller template | Francesco Rodriguez | 2012-12-07 | 1 | -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 Hansson | 2012-12-07 | 1 | -6/+7 |
| | | | | callbacks | ||||
* | Revert turbolinks load order requirement | Nick Reed | 2012-12-05 | 1 | -3/+1 |
| | |||||
* | Replace comments' non-breaking spaces with spaces | claudiob | 2012-12-04 | 1 | -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.0 | David Heinemeier Hansson | 2012-12-04 | 1 | -2/+2 |
| | |||||
* | Locate `=require turbolinks` at the bottom of application.js | Yasuharu Ozaki | 2012-12-04 | 1 | -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. Boedicker | 2012-12-01 | 1 | -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 updated | Amparo Luna | 2012-11-29 | 1 | -1/+1 |
| | |||||
* | Remove observers and sweepers | Rafael Mendonça França | 2012-11-28 | 6 | -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ça | 2012-11-27 | 2 | -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 URL | Akira Matsuda | 2012-11-28 | 2 | -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 engines | Yves Senn | 2012-11-18 | 1 | -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 given | Robert Nesius | 2012-11-16 | 1 | -0/+57 |
| | | | | invocations of "rails new". | ||||
* | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2012-11-17 | 1 | -1/+2 |
|\ | | | | | | | | | Conflicts: actionpack/lib/action_dispatch/routing/redirection.rb | ||||
| * | Update production.rb: Split long comment in two lines | Guillermo Iguaran | 2012-11-12 | 1 | -1/+2 |
| | | |||||
| * | Update production.rb documentation: only files in app/assets are in ↵ | Guillermo Iguaran | 2012-11-12 | 1 | -1/+1 |
| | | | | | | | | config.assets.precompile | ||||
* | | Remove config.threadsafe! from production env template | Carlos Antonio da Silva | 2012-11-16 | 1 | -3/+0 |
| | | | | | | | | Closes #8232 [ci skip] | ||||
* | | Merge pull request #8112 from rails/encrypted_cookies | Santiago Pastorino | 2012-11-15 | 2 | -3/+3 |
|\ \ | | | | | | | Encrypted cookies | ||||
| * | | Rename secret_token_key to secret_key_base | Santiago Pastorino | 2012-11-03 | 1 | -2/+2 |
| | | | |||||
| * | | Add encrypted cookie store | Santiago Pastorino | 2012-11-03 | 1 | -1/+1 |
| | | | |||||
| * | | Sign cookies using key deriver | Santiago Pastorino | 2012-11-03 | 1 | -2/+2 |
| |/ | |||||
* | | `plugin new` adds dummy app tasks when necessary. | Yves Senn | 2012-11-08 | 2 | -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 Silva | 2012-11-04 | 1 | -1/+1 |
|/ | | | | harder to read | ||||
* | USe the released version of sprockets-rails in a new Rails 4 application | Rafael Mendonça França | 2012-10-27 | 1 | -1/+1 |
| | |||||
* | Remove extra line in Gemfile under turbolinks. | Geoffrey Roguelon | 2012-10-21 | 1 | -1/+1 |
| | |||||
* | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2012-10-21 | 1 | -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 Shecter | 2012-10-18 | 1 | -1/+1 |
| | | |||||
| * | Moving code base to 1.9 hash syntax | AvnerCohen | 2012-10-16 | 3 | -7/+7 |
| | | |||||
* | | We don't need this anymore since we had a sprockets-rails release | Rafael Mendonça França | 2012-10-19 | 1 | -3/+0 |
| | | |||||
* | | Fix the app_generator and plugin_new tests | Rafael Mendonça França | 2012-10-18 | 1 | -0/+3 |
| | | |||||
* | | Now the Sprockets railtie lives in sprockets/railtie | Rafael Mendonça França | 2012-10-18 | 2 | -2/+2 |
| | | |||||
* | | Change back to official sprockets-rails | Joshua Peek | 2012-10-17 | 1 | -2/+2 |
| | | |||||
* | | Switch to new sprockets-rails plugin | Joshua Peek | 2012-10-15 | 3 | -7/+5 |
| | | |||||
* | | Use Ruby 1.9 Hash syntax in railties | Robin Dupret | 2012-10-14 | 35 | -112/+112 |
| | | |||||
* | | Backpedal from class-oriented config.queue. Set an actual queue instance. | Jeremy Kemper | 2012-10-12 | 2 | -2/+2 |
| | | |||||
* | | Immediately run queued jobs in tests. Otherwise you have to explicitly drain ↵ | Jeremy Kemper | 2012-10-12 | 1 | -2/+2 |
| | | | | | | | | the queue to actually deliver your emails. | ||||
* | | Fixing build failures | Vijay Dev | 2012-10-11 | 6 | -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_instructions | Vijay Dev | 2012-10-10 | 1 | -1/+3 |
|\ \ | |/ |/| | Offer instructions for pg gem when installed via Homebrew | ||||
| * | Offer instructions for pg gem when installed via Homebrew | Olivier Lacan | 2012-10-10 | 1 | -1/+3 |
| | | |||||
* | | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2012-10-11 | 39 | -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 comment | Vijay Dev | 2012-10-11 | 1 | -1/+1 |
| | | | |||||
| * | | update Rails::Generators docs [ci skip] | Francesco Rodriguez | 2012-10-07 | 21 | -42/+34 |
| | | | |||||
| * | | nodoc JS::Generators [ci skip] | Francesco Rodriguez | 2012-10-07 | 1 | -3/+3 |
| | | | |||||
| * | | nodoc Erb::Generators [ci skip] | Francesco Rodriguez | 2012-10-07 | 4 | -11/+11 |
| | | | |||||
| * | | nodoc CSS::Generators [ci skip] | Francesco Rodriguez | 2012-10-07 | 2 | -6/+6 |
| | | | |||||
| * | | nodoc TestUnit::Generators [ci skip] | Francesco Rodriguez | 2012-10-07 | 10 | -30/+30 |
| | | | |||||
| * | | Update ↵ | Adrien Lamothe | 2012-10-06 | 1 | -1/+2 |
| | | | | | | | | | | | | railties/lib/rails/generators/rails/app/templates/config/environments/production.rb.tt |