Commit Graph

3796 Commits

Author SHA1 Message Date
Matthew M. Boedicker
368e4f0eef Quote ~ in git config global excludes command.
This will put ~/ in .gitconfig so it will not be hardcoded to the home
directory where the command was run.
2012-12-01 15:14:01 -08:00
Amparo Luna
8fc0c98ec1 Gemfile source url for plugins updated 2012-11-29 11:23:32 -05:00
Rafael Mendonça França
ccecab3ba9 Remove observers and sweepers
They was extracted from a plugin.

See https://github.com/rails/rails-observers

[Rafael Mendonça França + Steve Klabnik]
2012-11-28 22:46:49 -02:00
Rafael Mendonça França
5b9c9026c4 Revert "Merge pull request #8341 from amatsuda/bundle_source_rubygems"
This reverts commit 33b29e0112db62d3a8c798bb58f51c0a839d9e26, reversing
changes made to ac8c729342e6b020a57d0d6887c8a8d5b39f96e0.

Reason:

https://github.com/rails/rails/pull/4684#commitcomment-920313
2012-11-27 14:59:58 -02:00
Akira Matsuda
4ed645b37e default source in Gemfiles to :rubygems rather than hardcoding the URL
* 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
2012-11-28 01:15:02 +09:00
Arun Agrawal
4a7a858ae7 Initialize accessors to remove some warnings in Ruby 2.0 2012-11-21 00:48:21 +05:30
Gaurish Sharma
61425f2c6d Better Error handling when parsing database.yaml
Provides a better error message incase the database.yaml
has some errors.
2012-11-20 17:04:47 +05:30
Rafael Mendonça França
133cdf0ec0 Merge pull request #8262 from senny/8229_correct_bundler_require_in_engines
require bundler groups to include rake-tasks in engines
2012-11-19 06:14:58 -08:00
Carlos Antonio da Silva
12d32ddea2 Refactor config abort message a bit for dbconsole
Remove not used variable.
Remove config attr_reader causing warning.
Fix indent in runner file.
2012-11-18 23:59:20 -02:00
Carlos Antonio da Silva
53aefdec91 Fix rails db command with sqlite3 database
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.
2012-11-18 23:52:39 -02:00
Yves Senn
a1fd9cd1a0 require bundler groups to include rake-tasks in engines
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
2012-11-18 18:03:27 +01:00
Robert Nesius
716222c664 Adding sqlserver.yml template to satisfy "-d sqlserver" being given
invocations of "rails new".
2012-11-16 23:20:59 -06:00
Vijay Dev
7b70eeed43 Merge branch 'master' of github.com:lifo/docrails
Conflicts:
	actionpack/lib/action_dispatch/routing/redirection.rb
2012-11-17 01:50:49 +05:30
Santiago Pastorino
8eefdb6d70 Add UpgradeSignatureToEncryptionCookieStore
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
2012-11-16 17:29:26 -02:00
Carlos Antonio da Silva
2bad4d2842 Remove config.threadsafe! from production env template
Closes #8232 [ci skip]
2012-11-16 09:44:59 -02:00
Santiago Pastorino
ef8b845de7 Merge pull request #8112 from rails/encrypted_cookies
Encrypted cookies
2012-11-15 12:17:25 -08:00
Guillermo Iguaran
8132bb6f79 Update production.rb: Split long comment in two lines 2012-11-12 11:35:06 -05:00
Guillermo Iguaran
40f5f31952 Update production.rb documentation: only files in app/assets are in config.assets.precompile 2012-11-12 11:19:20 -05:00
Nicolas Despres
df822961ee Rake test:uncommitted finds git directory in ancestors.
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.
2012-11-10 20:39:04 +01:00
Arun Agrawal
c33c991eab Removing warning : assigned but unused variable 2012-11-10 17:34:39 +05:30
Aaron Patterson
3ae8d6d67c make the extremely useful logs debug level 2012-11-09 13:49:46 +09:00
Aaron Patterson
e61ffe060e copy the log level from the config settings 2012-11-09 13:46:18 +09:00
Yves Senn
1785bf7d67 plugin new adds dummy app tasks when necessary.
Closes #8121

The `plugin new` generator always adds the dummy app rake tasks,
when a dummy app was created.
2012-11-08 13:08:19 +01:00
Carlos Antonio da Silva
1fef1bedbc Remove some line breaks between array items that make the assert file tests harder to read 2012-11-04 19:22:05 -02:00
Santiago Pastorino
4faa041845 Rename secret_token_key to secret_key_base 2012-11-03 14:57:54 -02:00
Santiago Pastorino
851e8fe897 Cache generated keys per KeyGenerator instance using salt + key_size 2012-11-03 14:57:54 -02:00
Santiago Pastorino
47da574474 Allow users to change the default salt if they want, shouldn't be necessary 2012-11-03 14:57:54 -02:00
Santiago Pastorino
5d23925f84 Use derived keys everywhere, http_authentication was missing it 2012-11-03 14:57:54 -02:00
Santiago Pastorino
fb0cea2b8c Add encrypted cookie store 2012-11-03 14:57:54 -02:00
Santiago Pastorino
e272000c80 Warn config.derive_keys will be true by default in 4.1 2012-11-03 14:57:53 -02:00
Santiago Pastorino
60609bb50d Sign cookies using key deriver 2012-11-03 14:57:53 -02:00
Steve Klabnik
b3125c89f4 Make sure that RAILS_ENV is set when accessing Rails.env
Fixes #8025
2012-10-31 17:05:26 -07:00
Alexey Gaziev
b955939d55 Make caller attribute in deprecation methods optional 2012-10-30 10:23:41 +08:00
Nikita Afanasenko
0b7067d849 Provide a call stack for deprecation warnings where needed.
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.
2012-10-29 19:22:59 +04:00
Rafael Mendonça França
3663057518 Merge pull request #7587 from elia/fix-too-eager-loading
Should not eager_load app/assets
Conflicts:
	railties/CHANGELOG.md
2012-10-29 11:14:14 -02:00
Rafael Mendonça França
2e44dda27a USe the released version of sprockets-rails in a new Rails 4 application 2012-10-27 16:49:34 -02:00
Jeremy Kemper
bf2009f995 Job consumer logs to Rails.logger by default 2012-10-26 16:18:52 -07:00
Geoffrey Roguelon
1f74315f85 Remove extra line in Gemfile under turbolinks. 2012-10-21 20:17:23 +02:00
Vijay Dev
f938019da2 Merge branch 'master' of github.com:lifo/docrails
Conflicts:
	activesupport/lib/active_support/core_ext/hash/slice.rb
	guides/source/active_support_core_extensions.md
2012-10-21 18:49:19 +05:30
Rafael Mendonça França
bfc6c17a87 We don't need this anymore since we had a sprockets-rails release 2012-10-19 22:27:20 -03:00
Robb Shecter
b83e0c3f29 Corrected the logic in production.rb comment. 2012-10-18 22:41:31 -07:00
Rafael Mendonça França
90733e70d7 Don't use action_controller.perform_caching to enable rack-rack.
Setting the action_dispatch.rack_cache options to true or a hash should
be the way to enable it.
2012-10-18 14:34:26 -03:00
Rafael Mendonça França
12fb9372bf Fix the app_generator and plugin_new tests 2012-10-18 14:34:26 -03:00
Rafael Mendonça França
fc32ff4ee3 Now the Sprockets railtie lives in sprockets/railtie 2012-10-18 01:03:24 -03:00
Joshua Peek
d88b65f986 Change back to official sprockets-rails 2012-10-17 21:51:37 -05:00
Rafael Mendonça França
0dfebbcd8e Merge pull request #7968 from josh/only-precompile-app-assets-by-default
Only compile non-js/css under app/assets by default
2012-10-17 19:18:09 -07:00
Joshua Peek
117d5e3bbb Only compile non-js/css under app/assets by default 2012-10-16 14:17:41 -05:00
AvnerCohen
d761eab42b Moving code base to 1.9 hash syntax 2012-10-16 05:08:10 +02:00
Joshua Peek
b8c7e31a57 Switch to new sprockets-rails plugin 2012-10-15 18:22:12 -05:00
Joshua Peek
eafc2b0580 Use sprockets-rails master 2012-10-15 11:46:05 -05:00