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 | |
| | | | ||||||
* | | | Merge pull request #8395 from bmaland/attr_accessors | Carlos Antonio da Silva | 2012-12-08 | 1 | -23/+1 | |
|\ \ \ | | | | | | | | | Use attr_accessor for Rails.{application,cache,logger} | |||||
| * | | | Use attr_accessor for Rails.{application,cache,logger} | Bjørn Arild Mæland | 2012-12-01 | 1 | -23/+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 | |
| | | ||||||
* | | Add ENV['RACK_ENV'] support to rake runner/console/server. | kennyj | 2012-12-06 | 3 | -3/+3 | |
| | | ||||||
* | | Merge pull request #8404 from freegenie/filter_redirects | Andrew White | 2012-12-05 | 2 | -1/+4 | |
|\ \ | ||||||
| * | | Adding filter capability to ActionController logs | Fabrizio Regini | 2012-12-05 | 2 | -1/+4 | |
| | | | ||||||
* | | | Replace comments' non-breaking spaces with spaces | claudiob | 2012-12-04 | 2 | -2/+2 | |
|/ / | | | | | | | | | | | | | | | | | | | 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. | |||||
* | | Fix wrong doc and message about rails profiler. | kennyj | 2012-12-04 | 1 | -1/+1 | |
| | | ||||||
* | | Merge pull request #8394 from acangiano/add_db_folder_to_annotations | Rafael Mendonça França | 2012-12-01 | 1 | -1/+1 | |
|\ \ | | | | | | | Add db to the list of default annotation folders | |||||
| * | | Add db to the list of default annotation folders | Antonio Cangiano | 2012-12-01 | 1 | -1/+1 | |
| |/ | ||||||
* / | 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 | 8 | -47/+4 | |
| | | | | | | | | 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 | |||||
* | Initialize accessors to remove some warnings in Ruby 2.0 | Arun Agrawal | 2012-11-21 | 1 | -0/+2 | |
| | ||||||
* | Better Error handling when parsing database.yaml | Gaurish Sharma | 2012-11-20 | 1 | -0/+4 | |
| | | | | | Provides a better error message incase the database.yaml has some errors. | |||||
* | Merge pull request #8262 from senny/8229_correct_bundler_require_in_engines | Rafael Mendonça França | 2012-11-19 | 1 | -1/+1 | |
|\ | | | | | require bundler groups to include rake-tasks in engines | |||||
| * | 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 | |||||
* | | Refactor config abort message a bit for dbconsole | Carlos Antonio da Silva | 2012-11-18 | 2 | -8/+4 | |
| | | | | | | | | | | | | Remove not used variable. Remove config attr_reader causing warning. Fix indent in runner file. | |||||
* | | Fix rails db command with sqlite3 database | Carlos Antonio da Silva | 2012-11-18 | 1 | -5/+5 | |
|/ | | | | | | | | | | | | | | | | | | | | | | | | When using sqlite3 it was attempting to find the database file based on Rails.root, the problem is that Rails.root is not always present because we try to first manually load "config/database.yml" instead of loading the entire app, to make "rails db" faster. This means that when we're in the root path of the app, calling "rails db" won't allow us to use Rails.root, making the command fail for sqlite3 with the error: ./rails/commands/dbconsole.rb:62:in `start': undefined method `root' for Rails:Module (NoMethodError) The fix is to simply not pass any dir string to File.expand_path, which will make it use the current directory of the process as base, or the root path of the app, which is what we want. When we are in any other subdirectory, calling "rails db" should work just fine, because "config/database.yml" won't be found, thus "rails db" will fallback to loading the app, making Rails.root available. Closes #8257. | |||||
* | 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 | |||||
* | | Add UpgradeSignatureToEncryptionCookieStore | Santiago Pastorino | 2012-11-16 | 1 | -0/+2 | |
| | | | | | | | | | | | | This allows easy upgrading from the old signed Cookie Store <= 3.2 or the deprecated one in 4.0 (the ones that doesn't use key derivation) to the new one that signs using key derivation | |||||
* | | 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 | 4 | -20/+49 | |
|\ \ | | | | | | | Encrypted cookies | |||||
| * | | Rename secret_token_key to secret_key_base | Santiago Pastorino | 2012-11-03 | 3 | -10/+10 | |
| | | | ||||||
| * | | Cache generated keys per KeyGenerator instance using salt + key_size | Santiago Pastorino | 2012-11-03 | 1 | -5/+8 | |
| | | | ||||||
| * | | Allow users to change the default salt if they want, shouldn't be necessary | Santiago Pastorino | 2012-11-03 | 1 | -7/+15 | |
| | | | ||||||
| * | | Use derived keys everywhere, http_authentication was missing it | Santiago Pastorino | 2012-11-03 | 2 | -8/+5 | |
| | | | ||||||
| * | | Add encrypted cookie store | Santiago Pastorino | 2012-11-03 | 1 | -1/+1 | |
| | | | ||||||
| * | | Warn config.derive_keys will be true by default in 4.1 | Santiago Pastorino | 2012-11-03 | 1 | -9/+17 | |
| | | | ||||||
| * | | Sign cookies using key deriver | Santiago Pastorino | 2012-11-03 | 3 | -5/+18 | |
| |/ | ||||||
* | | Rake test:uncommitted finds git directory in ancestors. | Nicolas Despres | 2012-11-10 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | Sometimes your git directory is an ancestor of your application root directory. For example: ./repo/.git/ ./repo/app/Rakefile In this case rake test:uncommitted will be unable to detect your SCM. This patch fixes this and add a test. | |||||
* | | Removing warning : assigned but unused variable | Arun Agrawal | 2012-11-10 | 1 | -1/+1 | |
| | | ||||||
* | | make the extremely useful logs debug level | Aaron Patterson | 2012-11-09 | 1 | -2/+2 | |
| | | ||||||
* | | copy the log level from the config settings | Aaron Patterson | 2012-11-09 | 1 | -0/+1 | |
| | | ||||||
* | | `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 | |||||
* | Make sure that RAILS_ENV is set when accessing Rails.env | Steve Klabnik | 2012-10-31 | 1 | -1/+4 | |
| | | | | Fixes #8025 | |||||
* | Make caller attribute in deprecation methods optional | Alexey Gaziev | 2012-10-30 | 1 | -3/+2 | |
| |