aboutsummaryrefslogtreecommitdiffstats
path: root/railties
Commit message (Collapse)AuthorAgeFilesLines
...
* 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
* Unused variable warning removedRashmi Yadav2012-11-271-1/+0
|
* Refactor generators tests to include test helpers in the parent classCarlos Antonio da Silva2012-11-271-4/+3
|
* Initialize accessors to remove some warnings in Ruby 2.0Arun Agrawal2012-11-211-0/+2
|
* Better Error handling when parsing database.yamlGaurish Sharma2012-11-201-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_enginesRafael Mendonça França2012-11-192-3/+8
|\ | | | | require bundler groups to include rake-tasks in engines
| * require bundler groups to include rake-tasks in enginesYves Senn2012-11-182-1/+6
| | | | | | | | | | | | | | | | 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
| * cleanup, remove whitspace from railties CHANGELOGYves Senn2012-11-181-2/+2
| |
* | Refactor config abort message a bit for dbconsoleCarlos Antonio da Silva2012-11-182-8/+4
| | | | | | | | | | | | Remove not used variable. Remove config attr_reader causing warning. Fix indent in runner file.
* | Fix rails db command with sqlite3 databaseCarlos Antonio da Silva2012-11-182-5/+13
|/ | | | | | | | | | | | | | | | | | | | | | | | 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 givenRobert Nesius2012-11-162-0/+62
| | | | 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
* | Add UpgradeSignatureToEncryptionCookieStoreSantiago Pastorino2012-11-162-0/+112
| | | | | | | | | | | | 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 duplicated get /foo/write_sessionSantiago Pastorino2012-11-161-1/+0
| |
* | Remove unused config optionSantiago Pastorino2012-11-161-1/+0
| |
* | 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-1511-30/+115
|\ \ | | | | | | Encrypted cookies
| * | Rename secret_token_key to secret_key_baseSantiago Pastorino2012-11-037-16/+16
| | |
| * | Cache generated keys per KeyGenerator instance using salt + key_sizeSantiago Pastorino2012-11-031-5/+8
| | |
| * | Allow users to change the default salt if they want, shouldn't be necessarySantiago Pastorino2012-11-031-7/+15
| | |
| * | Use derived keys everywhere, http_authentication was missing itSantiago Pastorino2012-11-035-27/+9
| | |
| * | Add encrypted cookie storeSantiago Pastorino2012-11-033-2/+53
| | |
| * | Warn config.derive_keys will be true by default in 4.1Santiago Pastorino2012-11-031-9/+17
| | |
| * | Sign cookies using key deriverSantiago Pastorino2012-11-036-10/+43
| |/
* | asset compilation should not require a database connectionAaron Patterson2012-11-131-0/+26
| |
* | Merge pull request #8169 from nicolasdespres/robust_git_repository_checkRafael Mendonça França2012-11-133-1/+32
|\ \ | | | | | | Rake test:uncommitted finds git directory in ancestors.
| * | Add ChangeLog entry.Nicolas Despres2012-11-131-0/+2
| | |
| * | Rake test:uncommitted finds git directory in ancestors.Nicolas Despres2012-11-102-1/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 : ambiguous first argumentArun Agrawal2012-11-111-2/+2
|/ /
* | Removing warning : assigned but unused variableArun Agrawal2012-11-102-2/+2
| |
* | make the extremely useful logs debug levelAaron Patterson2012-11-091-2/+2
| |
* | copy the log level from the config settingsAaron Patterson2012-11-091-0/+1
| |
* | Clean up gemspecsVinny Diehl2012-11-081-14/+17
| | | | | | | | | | | | | | | | | | | | Organized the gemspec files a bit. * Made quotes more consistent (single quotes dominated, so I used that). * Moved license line down a line, separating it logically, and removed the extra whitespace before its = operator. * Minor whitespace fixes.
* | `plugin new` adds dummy app tasks when necessary.Yves Senn2012-11-084-3/+18
| | | | | | | | | | | | | | 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-044-42/+19
|/ | | | harder to read
* Small change to remove warning unused variable.Arun Agrawal2012-11-011-1/+1
|
* Make sure that RAILS_ENV is set when accessing Rails.envSteve Klabnik2012-10-312-1/+6
| | | | Fixes #8025
* Make caller attribute in deprecation methods optionalAlexey Gaziev2012-10-301-3/+2
|
* Merge pull request #8063 from nikitug/deprecation_caller_contextCarlos Antonio da Silva2012-10-291-3/+4
|\ | | | | Provide a call stack for deprecation warnings where needed.
| * Provide a call stack for deprecation warnings where needed.Nikita Afanasenko2012-10-291-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.
* | Fix deprecation message in test for Path#childrenCarlos Antonio da Silva2012-10-291-1/+1
|/
* Add test to deprecation of Path#childrenRafael Mendonça França2012-10-291-0/+6
|
* Merge pull request #7587 from elia/fix-too-eager-loadingRafael Mendonça França2012-10-293-6/+17
| | | | | | Should not eager_load app/assets Conflicts: railties/CHANGELOG.md
* USe the released version of sprockets-rails in a new Rails 4 applicationRafael Mendonça França2012-10-271-1/+1
|
* Job consumer logs to Rails.logger by defaultJeremy Kemper2012-10-262-0/+2
|
* changed test case nameTima Maslyuchenko2012-10-231-1/+1
|
* Remove extra line in Gemfile under turbolinks.Geoffrey Roguelon2012-10-211-1/+1
|