| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | 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 |
| | | |||||
| * | Provide a call stack for deprecation warnings where needed. | Nikita Afanasenko | 2012-10-29 | 1 | -3/+4 |
| | | | | | It's sometimes hard to quickly find where deprecated call was performed, especially in case of migrating between Rails versions. So this is an attempt to improve the call stack part of the warning message by providing caller explicitly. | ||||
| * | Merge pull request #7587 from elia/fix-too-eager-loading | Rafael Mendonça França | 2012-10-29 | 1 | -6/+12 |
| | | | | | | | Should not eager_load app/assets Conflicts: railties/CHANGELOG.md | ||||
| * | USe the released version of sprockets-rails in a new Rails 4 application | Rafael Mendonça França | 2012-10-27 | 1 | -1/+1 |
| | | |||||
| * | Job consumer logs to Rails.logger by default | Jeremy Kemper | 2012-10-26 | 1 | -0/+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 |
| | | | |||||
| | * | Hash syntax to 1.9 style | AvnerCohen | 2012-10-15 | 2 | -3/+3 |
| | | | |||||
| * | | We don't need this anymore since we had a sprockets-rails release | Rafael Mendonça França | 2012-10-19 | 1 | -3/+0 |
| | | | |||||
| * | | Don't use action_controller.perform_caching to enable rack-rack. | Rafael Mendonça França | 2012-10-18 | 1 | -1/+1 |
| | | | | | | | | | | | Setting the action_dispatch.rack_cache options to true or a hash should be the way to enable it. | ||||
| * | | 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 | 3 | -3/+3 |
| | | | |||||
| * | | Change back to official sprockets-rails | Joshua Peek | 2012-10-17 | 1 | -2/+2 |
| | | | |||||
| * | | Merge pull request #7968 from josh/only-precompile-app-assets-by-default | Rafael Mendonça França | 2012-10-17 | 1 | -1/+1 |
| |\ \ | | | | | | | Only compile non-js/css under app/assets by default | ||||
| | * | | Only compile non-js/css under app/assets by default | Joshua Peek | 2012-10-16 | 1 | -1/+1 |
| | | | | |||||
| * | | | Switch to new sprockets-rails plugin | Joshua Peek | 2012-10-15 | 3 | -7/+5 |
| |/ / | |||||
| * | | Use sprockets-rails master | Joshua Peek | 2012-10-15 | 1 | -2/+2 |
| | | | |||||
| * | | Use sprockets-rails branch for now | Joshua Peek | 2012-10-15 | 1 | -2/+2 |
| | | | |||||
| * | | Merge branch 'master' into asset-path-helper | Joshua Peek | 2012-10-15 | 65 | -266/+272 |
| |\ \ | | | | | | | | | | | | | Conflicts: railties/test/application/configuration_test.rb | ||||
 |
index : rails.git | |
| Mirror of official rails repo with custom fixes. | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |