Revert r6104 "Merged r6098 from trunk."

I messed things up with a cherry-pick on master, I'll re-apply it after.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.2-stable@6105 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Jean-Baptiste Barth
2011-06-21 03:16:49 +00:00
parent 16ba6bcb77
commit 102c9afadf
18 changed files with 60 additions and 131 deletions
+2 -3
View File
@@ -7,7 +7,7 @@ task :extract_fixtures => :environment do
ActiveRecord::Base.establish_connection
(ActiveRecord::Base.connection.tables - skip_tables).each do |table_name|
i = "000"
File.open("#{Rails.root}/#{table_name}.yml", 'w' ) do |file|
File.open("#{RAILS_ROOT}/#{table_name}.yml", 'w' ) do |file|
data = ActiveRecord::Base.connection.select_all(sql % table_name)
file.write data.inject({}) { |hash, record|
# cast extracted values
@@ -19,5 +19,4 @@ task :extract_fixtures => :environment do
}.to_yaml
end
end
end
end
+1 -1
View File
@@ -1,7 +1,7 @@
desc 'Generates a configuration file for cookie store sessions.'
file 'config/initializers/session_store.rb' do
path = File.join(Rails.root, 'config', 'initializers', 'session_store.rb')
path = File.join(RAILS_ROOT, 'config', 'initializers', 'session_store.rb')
secret = ActiveSupport::SecureRandom.hex(40)
File.open(path, 'w') do |f|
f.write <<"EOF"