jro_apps/redmine Commit - r9346:5e57a1a9d947

Merged rails-3.2 branch....

Jean-Philippe Lang -

r9346:5e57a1a9d947

parent child

Context file:

r9346:5e57a1a9d947

Expand all files

The requested changes are too big and content was truncated. Show full diff

config.ru created 644 +4 0

@@ -0,0 +1,4
	1	# This file is used by Rack-based servers to start the application.
	2
	3	require ::File.expand_path('../config/environment', __FILE__)
	4	run RedmineApp::Application

config/application.rb created 644 +56 0

@@ -0,0 +1,56
	1	require File.expand_path('../boot', __FILE__)
	2
	3	require 'rails/all'
	4
	5	if defined?(Bundler)
	6	# If you precompile assets before deploying to production, use this line
	7	Bundler.require(*Rails.groups(:assets => %w(development test)))
	8	# If you want your assets lazily compiled in production, use this line
	9	# Bundler.require(:default, :assets, Rails.env)
	10	end
	11
	12	module RedmineApp
	13	class Application < Rails::Application
	14	# Settings in config/environments/* take precedence over those specified here.
	15	# Application configuration should go into files in config/initializers
	16	# -- all .rb files in that directory are automatically loaded.
	17
	18	# Custom directories with classes and modules you want to be autoloadable.
	19	config.autoload_paths += %W(#{config.root}/lib)
	20
	21	# Only load the plugins named here, in the order given (default is alphabetical).
	22	# :all can be used as a placeholder for all plugins not explicitly named.
	23	# config.plugins = [ :exception_notification, :ssl_requirement, :all ]
	24
	25	# Activate observers that should always be running.
	26	config.active_record.observers = :message_observer, :issue_observer, :journal_observer, :news_observer, :document_observer, :wiki_content_observer, :comment_observer
	27
	28	config.active_record.store_full_sti_class = true
	29
	30	# Set Time.zone default to the specified zone and make Active Record auto-convert to this zone.
	31	# Run "rake -D time" for a list of tasks for finding time zone names. Default is UTC.
	32	# config.time_zone = 'Central Time (US & Canada)'
	33
	34	# The default locale is :en and all translations from config/locales/*.rb,yml are auto loaded.
	35	# config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}').to_s]
	36	# config.i18n.default_locale = :de
	37
	38	# Configure the default encoding used in templates for Ruby 1.9.
	39	config.encoding = "utf-8"
	40
	41	# Configure sensitive parameters which will be filtered from the log file.
	42	config.filter_parameters += [:password]
	43
	44	# Enable the asset pipeline
	45	config.assets.enabled = false
	46
	47	# Version of your assets, change this if you want to expire all your assets
	48	config.assets.version = '1.0'
	49
	50	config.action_mailer.perform_deliveries = false
	51
	52	if File.exists?(File.join(File.dirname(__FILE__), 'additional_environment.rb'))
	53	instance_eval File.read(File.join(File.dirname(__FILE__), 'additional_environment.rb'))
	54	end
	55	end
	56	end

db/migrate/20120422150750_change_repositories_to_full_sti.rb created 644 0 0

	1	NO CONTENT: new file 100644			NO CONTENT: new file 100644
The requested commit or file is too big and content was truncated. Show full diff

extra/sample_plugin/config/routes.rb created 644 0 0

	1	NO CONTENT: new file 100644			NO CONTENT: new file 100644
The requested commit or file is too big and content was truncated. Show full diff

lib/generators/redmine_plugin/templates/routes.rb created 644 0 0

	1	NO CONTENT: new file 100644			NO CONTENT: new file 100644
The requested commit or file is too big and content was truncated. Show full diff

lib/vendor/tmail-1.2.7/tmail.rb created 644 0 0

	1	NO CONTENT: new file 100644			NO CONTENT: new file 100644
The requested commit or file is too big and content was truncated. Show full diff

lib/vendor/tmail-1.2.7/tmail/Makefile created 644 0 0

	1	NO CONTENT: new file 100644			NO CONTENT: new file 100644
The requested commit or file is too big and content was truncated. Show full diff

lib/vendor/tmail-1.2.7/tmail/address.rb created 644 0 0

	1	NO CONTENT: new file 100644			NO CONTENT: new file 100644
The requested commit or file is too big and content was truncated. Show full diff

lib/vendor/tmail-1.2.7/tmail/attachments.rb created 644 0 0

	1	NO CONTENT: new file 100644			NO CONTENT: new file 100644
The requested commit or file is too big and content was truncated. Show full diff

lib/vendor/tmail-1.2.7/tmail/base64.rb created 644 0 0

	1	NO CONTENT: new file 100644			NO CONTENT: new file 100644
The requested commit or file is too big and content was truncated. Show full diff

lib/vendor/tmail-1.2.7/tmail/compat.rb created 644 0 0

	1	NO CONTENT: new file 100644			NO CONTENT: new file 100644
The requested commit or file is too big and content was truncated. Show full diff

lib/vendor/tmail-1.2.7/tmail/config.rb created 644 0 0

	1	NO CONTENT: new file 100644			NO CONTENT: new file 100644
The requested commit or file is too big and content was truncated. Show full diff

lib/vendor/tmail-1.2.7/tmail/core_extensions.rb created 644 0 0

	1	NO CONTENT: new file 100644			NO CONTENT: new file 100644
The requested commit or file is too big and content was truncated. Show full diff

lib/vendor/tmail-1.2.7/tmail/encode.rb created 644 0 0

	1	NO CONTENT: new file 100644			NO CONTENT: new file 100644
The requested commit or file is too big and content was truncated. Show full diff

lib/vendor/tmail-1.2.7/tmail/header.rb created 644 0 0

	1	NO CONTENT: new file 100644			NO CONTENT: new file 100644
The requested commit or file is too big and content was truncated. Show full diff

lib/vendor/tmail-1.2.7/tmail/index.rb created 644 0 0

	1	NO CONTENT: new file 100644			NO CONTENT: new file 100644
The requested commit or file is too big and content was truncated. Show full diff

lib/vendor/tmail-1.2.7/tmail/interface.rb created 644 0 0

	1	NO CONTENT: new file 100644			NO CONTENT: new file 100644
The requested commit or file is too big and content was truncated. Show full diff

lib/vendor/tmail-1.2.7/tmail/loader.rb created 644 0 0

	1	NO CONTENT: new file 100644			NO CONTENT: new file 100644
The requested commit or file is too big and content was truncated. Show full diff

lib/vendor/tmail-1.2.7/tmail/mail.rb created 644 0 0

	1	NO CONTENT: new file 100644			NO CONTENT: new file 100644
The requested commit or file is too big and content was truncated. Show full diff

lib/vendor/tmail-1.2.7/tmail/mailbox.rb created 644 0 0

	1	NO CONTENT: new file 100644			NO CONTENT: new file 100644
The requested commit or file is too big and content was truncated. Show full diff

lib/vendor/tmail-1.2.7/tmail/main.rb created 644 0 0

	1	NO CONTENT: new file 100644			NO CONTENT: new file 100644
The requested commit or file is too big and content was truncated. Show full diff

lib/vendor/tmail-1.2.7/tmail/mbox.rb created 644 0 0

	1	NO CONTENT: new file 100644			NO CONTENT: new file 100644
The requested commit or file is too big and content was truncated. Show full diff

lib/vendor/tmail-1.2.7/tmail/net.rb created 644 0 0

	1	NO CONTENT: new file 100644			NO CONTENT: new file 100644
The requested commit or file is too big and content was truncated. Show full diff

lib/vendor/tmail-1.2.7/tmail/obsolete.rb created 644 0 0

	1	NO CONTENT: new file 100644			NO CONTENT: new file 100644
The requested commit or file is too big and content was truncated. Show full diff

lib/vendor/tmail-1.2.7/tmail/parser.rb created 644 0 0

	1	NO CONTENT: new file 100644			NO CONTENT: new file 100644
The requested commit or file is too big and content was truncated. Show full diff

lib/vendor/tmail-1.2.7/tmail/parser.y created 644 0 0

	1	NO CONTENT: new file 100644			NO CONTENT: new file 100644
The requested commit or file is too big and content was truncated. Show full diff

lib/vendor/tmail-1.2.7/tmail/port.rb created 644 0 0

	1	NO CONTENT: new file 100644			NO CONTENT: new file 100644
The requested commit or file is too big and content was truncated. Show full diff

lib/vendor/tmail-1.2.7/tmail/quoting.rb created 644 0 0

	1	NO CONTENT: new file 100644			NO CONTENT: new file 100644
The requested commit or file is too big and content was truncated. Show full diff

lib/vendor/tmail-1.2.7/tmail/require_arch.rb created 644 0 0

	1	NO CONTENT: new file 100644			NO CONTENT: new file 100644
The requested commit or file is too big and content was truncated. Show full diff

lib/vendor/tmail-1.2.7/tmail/scanner.rb created 644 0 0

	1	NO CONTENT: new file 100644			NO CONTENT: new file 100644
The requested commit or file is too big and content was truncated. Show full diff

lib/vendor/tmail-1.2.7/tmail/scanner_r.rb created 644 0 0

	1	NO CONTENT: new file 100644			NO CONTENT: new file 100644
The requested commit or file is too big and content was truncated. Show full diff

lib/vendor/tmail-1.2.7/tmail/stringio.rb created 644 0 0

	1	NO CONTENT: new file 100644			NO CONTENT: new file 100644
The requested commit or file is too big and content was truncated. Show full diff

lib/vendor/tmail-1.2.7/tmail/utils.rb created 644 0 0

	1	NO CONTENT: new file 100644			NO CONTENT: new file 100644
The requested commit or file is too big and content was truncated. Show full diff

lib/vendor/tmail-1.2.7/tmail/vendor/rchardet-1.3/COPYING created 644 0 0

	1	NO CONTENT: new file 100644			NO CONTENT: new file 100644
The requested commit or file is too big and content was truncated. Show full diff

lib/vendor/tmail-1.2.7/tmail/vendor/rchardet-1.3/README created 644 0 0

	1	NO CONTENT: new file 100644			NO CONTENT: new file 100644
The requested commit or file is too big and content was truncated. Show full diff

lib/vendor/tmail-1.2.7/tmail/vendor/rchardet-1.3/lib/rchardet.rb created 644 0 0

	1	NO CONTENT: new file 100644			NO CONTENT: new file 100644
The requested commit or file is too big and content was truncated. Show full diff

lib/vendor/tmail-1.2.7/tmail/vendor/rchardet-1.3/lib/rchardet/big5freq.rb created 644 0 0

	1	NO CONTENT: new file 100644			NO CONTENT: new file 100644
The requested commit or file is too big and content was truncated. Show full diff

lib/vendor/tmail-1.2.7/tmail/vendor/rchardet-1.3/lib/rchardet/big5prober.rb created 644 0 0

	1	NO CONTENT: new file 100644			NO CONTENT: new file 100644
The requested commit or file is too big and content was truncated. Show full diff

lib/vendor/tmail-1.2.7/tmail/vendor/rchardet-1.3/lib/rchardet/chardistribution.rb created 644 0 0

	1	NO CONTENT: new file 100644			NO CONTENT: new file 100644
The requested commit or file is too big and content was truncated. Show full diff

lib/vendor/tmail-1.2.7/tmail/vendor/rchardet-1.3/lib/rchardet/charsetgroupprober.rb created 644 0 0

	1	NO CONTENT: new file 100644			NO CONTENT: new file 100644
The requested commit or file is too big and content was truncated. Show full diff

lib/vendor/tmail-1.2.7/tmail/vendor/rchardet-1.3/lib/rchardet/charsetprober.rb created 644 0 0

	1	NO CONTENT: new file 100644			NO CONTENT: new file 100644
The requested commit or file is too big and content was truncated. Show full diff

lib/vendor/tmail-1.2.7/tmail/vendor/rchardet-1.3/lib/rchardet/codingstatemachine.rb created 644 0 0

	1	NO CONTENT: new file 100644			NO CONTENT: new file 100644
The requested commit or file is too big and content was truncated. Show full diff

lib/vendor/tmail-1.2.7/tmail/vendor/rchardet-1.3/lib/rchardet/constants.rb created 644 0 0

	1	NO CONTENT: new file 100644			NO CONTENT: new file 100644
The requested commit or file is too big and content was truncated. Show full diff

lib/vendor/tmail-1.2.7/tmail/vendor/rchardet-1.3/lib/rchardet/escprober.rb created 644 0 0

	1	NO CONTENT: new file 100644			NO CONTENT: new file 100644
The requested commit or file is too big and content was truncated. Show full diff

lib/vendor/tmail-1.2.7/tmail/vendor/rchardet-1.3/lib/rchardet/escsm.rb created 644 0 0

	1	NO CONTENT: new file 100644			NO CONTENT: new file 100644
The requested commit or file is too big and content was truncated. Show full diff

lib/vendor/tmail-1.2.7/tmail/vendor/rchardet-1.3/lib/rchardet/eucjpprober.rb created 644 0 0

	1	NO CONTENT: new file 100644			NO CONTENT: new file 100644
The requested commit or file is too big and content was truncated. Show full diff

lib/vendor/tmail-1.2.7/tmail/vendor/rchardet-1.3/lib/rchardet/euckrfreq.rb created 644 0 0

	1	NO CONTENT: new file 100644			NO CONTENT: new file 100644
The requested commit or file is too big and content was truncated. Show full diff

lib/vendor/tmail-1.2.7/tmail/vendor/rchardet-1.3/lib/rchardet/euckrprober.rb created 644 0 0

	1	NO CONTENT: new file 100644			NO CONTENT: new file 100644
The requested commit or file is too big and content was truncated. Show full diff

lib/vendor/tmail-1.2.7/tmail/vendor/rchardet-1.3/lib/rchardet/euctwfreq.rb created 644 0 0

	1	NO CONTENT: new file 100644			NO CONTENT: new file 100644
The requested commit or file is too big and content was truncated. Show full diff

lib/vendor/tmail-1.2.7/tmail/vendor/rchardet-1.3/lib/rchardet/euctwprober.rb created 644 0 0

	1	NO CONTENT: new file 100644			NO CONTENT: new file 100644
The requested commit or file is too big and content was truncated. Show full diff

lib/vendor/tmail-1.2.7/tmail/vendor/rchardet-1.3/lib/rchardet/gb2312freq.rb created 644 0 0

	1	NO CONTENT: new file 100644			NO CONTENT: new file 100644
The requested commit or file is too big and content was truncated. Show full diff

lib/vendor/tmail-1.2.7/tmail/vendor/rchardet-1.3/lib/rchardet/gb2312prober.rb created 644 0 0

	1	NO CONTENT: new file 100644			NO CONTENT: new file 100644
The requested commit or file is too big and content was truncated. Show full diff

lib/vendor/tmail-1.2.7/tmail/vendor/rchardet-1.3/lib/rchardet/hebrewprober.rb created 644 0 0

	1	NO CONTENT: new file 100644			NO CONTENT: new file 100644
The requested commit or file is too big and content was truncated. Show full diff

lib/vendor/tmail-1.2.7/tmail/vendor/rchardet-1.3/lib/rchardet/jisfreq.rb created 644 0 0

	1	NO CONTENT: new file 100644			NO CONTENT: new file 100644
The requested commit or file is too big and content was truncated. Show full diff

lib/vendor/tmail-1.2.7/tmail/vendor/rchardet-1.3/lib/rchardet/jpcntx.rb created 644 0 0

	1	NO CONTENT: new file 100644			NO CONTENT: new file 100644
The requested commit or file is too big and content was truncated. Show full diff

lib/vendor/tmail-1.2.7/tmail/vendor/rchardet-1.3/lib/rchardet/langbulgarianmodel.rb created 644 0 0

	1	NO CONTENT: new file 100644			NO CONTENT: new file 100644
The requested commit or file is too big and content was truncated. Show full diff

lib/vendor/tmail-1.2.7/tmail/vendor/rchardet-1.3/lib/rchardet/langcyrillicmodel.rb created 644 0 0

	1	NO CONTENT: new file 100644			NO CONTENT: new file 100644
The requested commit or file is too big and content was truncated. Show full diff

lib/vendor/tmail-1.2.7/tmail/vendor/rchardet-1.3/lib/rchardet/langgreekmodel.rb created 644 0 0

	1	NO CONTENT: new file 100644			NO CONTENT: new file 100644
The requested commit or file is too big and content was truncated. Show full diff

lib/vendor/tmail-1.2.7/tmail/vendor/rchardet-1.3/lib/rchardet/langhebrewmodel.rb created 644 0 0

	1	NO CONTENT: new file 100644			NO CONTENT: new file 100644
The requested commit or file is too big and content was truncated. Show full diff

lib/vendor/tmail-1.2.7/tmail/vendor/rchardet-1.3/lib/rchardet/langhungarianmodel.rb created 644 0 0

	1	NO CONTENT: new file 100644			NO CONTENT: new file 100644
The requested commit or file is too big and content was truncated. Show full diff

lib/vendor/tmail-1.2.7/tmail/vendor/rchardet-1.3/lib/rchardet/langthaimodel.rb created 644 0 0

	1	NO CONTENT: new file 100644			NO CONTENT: new file 100644
The requested commit or file is too big and content was truncated. Show full diff

lib/vendor/tmail-1.2.7/tmail/vendor/rchardet-1.3/lib/rchardet/latin1prober.rb created 644 0 0

	1	NO CONTENT: new file 100644			NO CONTENT: new file 100644
The requested commit or file is too big and content was truncated. Show full diff

lib/vendor/tmail-1.2.7/tmail/vendor/rchardet-1.3/lib/rchardet/mbcharsetprober.rb created 644 0 0

	1	NO CONTENT: new file 100644			NO CONTENT: new file 100644
The requested commit or file is too big and content was truncated. Show full diff

lib/vendor/tmail-1.2.7/tmail/vendor/rchardet-1.3/lib/rchardet/mbcsgroupprober.rb created 644 0 0

	1	NO CONTENT: new file 100644			NO CONTENT: new file 100644
The requested commit or file is too big and content was truncated. Show full diff

lib/vendor/tmail-1.2.7/tmail/vendor/rchardet-1.3/lib/rchardet/mbcssm.rb created 644 0 0

	1	NO CONTENT: new file 100644			NO CONTENT: new file 100644
The requested commit or file is too big and content was truncated. Show full diff

lib/vendor/tmail-1.2.7/tmail/vendor/rchardet-1.3/lib/rchardet/sbcharsetprober.rb created 644 0 0

	1	NO CONTENT: new file 100644			NO CONTENT: new file 100644
The requested commit or file is too big and content was truncated. Show full diff

lib/vendor/tmail-1.2.7/tmail/vendor/rchardet-1.3/lib/rchardet/sbcsgroupprober.rb created 644 0 0

	1	NO CONTENT: new file 100644			NO CONTENT: new file 100644
The requested commit or file is too big and content was truncated. Show full diff

lib/vendor/tmail-1.2.7/tmail/vendor/rchardet-1.3/lib/rchardet/sjisprober.rb created 644 0 0

	1	NO CONTENT: new file 100644			NO CONTENT: new file 100644
The requested commit or file is too big and content was truncated. Show full diff

lib/vendor/tmail-1.2.7/tmail/vendor/rchardet-1.3/lib/rchardet/universaldetector.rb created 644 0 0

	1	NO CONTENT: new file 100644			NO CONTENT: new file 100644
The requested commit or file is too big and content was truncated. Show full diff

lib/vendor/tmail-1.2.7/tmail/vendor/rchardet-1.3/lib/rchardet/utf8prober.rb created 644 0 0

	1	NO CONTENT: new file 100644			NO CONTENT: new file 100644
The requested commit or file is too big and content was truncated. Show full diff

lib/vendor/tmail-1.2.7/tmail/version.rb created 644 0 0

	1	NO CONTENT: new file 100644			NO CONTENT: new file 100644
The requested commit or file is too big and content was truncated. Show full diff

lib/vendor/tmail.rb created 644 0 0

	1	NO CONTENT: new file 100644			NO CONTENT: new file 100644
The requested commit or file is too big and content was truncated. Show full diff

plugins/README created 644 0 0

	1	NO CONTENT: new file 100644			NO CONTENT: new file 100644
The requested commit or file is too big and content was truncated. Show full diff

public/javascripts/rails.js created 644 0 0

	1	NO CONTENT: new file 100644			NO CONTENT: new file 100644
The requested commit or file is too big and content was truncated. Show full diff

script/rails created 644 0 0

	1	NO CONTENT: new file 100644			NO CONTENT: new file 100644
The requested commit or file is too big and content was truncated. Show full diff

vendor/plugins/awesome_nested_set/.autotest created 644 0 0

	1	NO CONTENT: new file 100644			NO CONTENT: new file 100644
The requested commit or file is too big and content was truncated. Show full diff

vendor/plugins/awesome_nested_set/.travis.yml created 644 0 0

	1	NO CONTENT: new file 100644			NO CONTENT: new file 100644
The requested commit or file is too big and content was truncated. Show full diff

vendor/plugins/awesome_nested_set/CHANGELOG created 644 0 0

	1	NO CONTENT: new file 100644			NO CONTENT: new file 100644
The requested commit or file is too big and content was truncated. Show full diff

vendor/plugins/awesome_nested_set/lib/awesome_nested_set/awesome_nested_set.rb created 644 0 0

	1	NO CONTENT: new file 100644			NO CONTENT: new file 100644
The requested commit or file is too big and content was truncated. Show full diff

vendor/plugins/awesome_nested_set/lib/awesome_nested_set/version.rb created 644 0 0

	1	NO CONTENT: new file 100644			NO CONTENT: new file 100644
The requested commit or file is too big and content was truncated. Show full diff

vendor/plugins/awesome_nested_set/spec/awesome_nested_set/helper_spec.rb created 644 0 0

	1	NO CONTENT: new file 100644			NO CONTENT: new file 100644
The requested commit or file is too big and content was truncated. Show full diff

vendor/plugins/awesome_nested_set/spec/awesome_nested_set_spec.rb created 644 0 0

	1	NO CONTENT: new file 100644			NO CONTENT: new file 100644
The requested commit or file is too big and content was truncated. Show full diff

vendor/plugins/awesome_nested_set/spec/db/database.yml created 644 0 0

	1	NO CONTENT: new file 100644			NO CONTENT: new file 100644
The requested commit or file is too big and content was truncated. Show full diff

vendor/plugins/awesome_nested_set/spec/db/schema.rb created 644 0 0

	1	NO CONTENT: new file 100644			NO CONTENT: new file 100644
The requested commit or file is too big and content was truncated. Show full diff

vendor/plugins/awesome_nested_set/spec/fixtures/brokens.yml created 644 0 0

	1	NO CONTENT: new file 100644			NO CONTENT: new file 100644
The requested commit or file is too big and content was truncated. Show full diff

vendor/plugins/awesome_nested_set/spec/fixtures/categories.yml created 644 0 0

	1	NO CONTENT: new file 100644			NO CONTENT: new file 100644
The requested commit or file is too big and content was truncated. Show full diff

vendor/plugins/awesome_nested_set/spec/fixtures/departments.yml created 644 0 0

	1	NO CONTENT: new file 100644			NO CONTENT: new file 100644
The requested commit or file is too big and content was truncated. Show full diff

vendor/plugins/awesome_nested_set/spec/fixtures/notes.yml created 644 0 0

	1	NO CONTENT: new file 100644			NO CONTENT: new file 100644
The requested commit or file is too big and content was truncated. Show full diff

vendor/plugins/awesome_nested_set/spec/fixtures/things.yml created 644 0 0

	1	NO CONTENT: new file 100644			NO CONTENT: new file 100644
The requested commit or file is too big and content was truncated. Show full diff

vendor/plugins/awesome_nested_set/spec/spec_helper.rb created 644 0 0

	1	NO CONTENT: new file 100644			NO CONTENT: new file 100644
The requested commit or file is too big and content was truncated. Show full diff

vendor/plugins/awesome_nested_set/spec/support/models.rb created 644 0 0

	1	NO CONTENT: new file 100644			NO CONTENT: new file 100644
The requested commit or file is too big and content was truncated. Show full diff

vendor/plugins/prototype_legacy_helper/README.markdown created 644 0 0

	1	NO CONTENT: new file 100644			NO CONTENT: new file 100644
The requested commit or file is too big and content was truncated. Show full diff

vendor/plugins/prototype_legacy_helper/init.rb created 644 0 0

	1	NO CONTENT: new file 100644			NO CONTENT: new file 100644
The requested commit or file is too big and content was truncated. Show full diff

vendor/plugins/prototype_legacy_helper/lib/prototype_legacy_helper.rb created 644 0 0

	1	NO CONTENT: new file 100644			NO CONTENT: new file 100644
The requested commit or file is too big and content was truncated. Show full diff

vendor/plugins/prototype_legacy_helper/test/test_prototype_helper.rb created 644 0 0

	1	NO CONTENT: new file 100644			NO CONTENT: new file 100644
The requested commit or file is too big and content was truncated. Show full diff

.gitignore +1 0

             /.project
             /.loadpath
             /config/additional_environment.rb
             /config/configuration.yml
             /config/database.yml
             /config/email.yml
             /config/initializers/session_store.rb
+            /config/initializers/secret_token.rb
             /coverage
             /db/*.db
             /db/*.sqlite3
             /db/schema.rb
             /files/*
             /lib/redmine/scm/adapters/mercurial/redminehelper.pyc
             /lib/redmine/scm/adapters/mercurial/redminehelper.pyo
             /log/*.log*
             /log/mongrel_debug
             /public/dispatch.*
             /public/plugin_assets
             /tmp/*
             /tmp/cache/*
             /tmp/sessions/*
             /tmp/sockets/*
             /tmp/test/*
             /vendor/cache
             /vendor/rails
             *.rbc
             /.bundle
             /Gemfile.lock
             /Gemfile.local

.hgignore +1 0

             syntax: glob
             .project
             .loadpath
             config/additional_environment.rb
             config/configuration.yml
             config/database.yml
             config/email.yml
             config/initializers/session_store.rb
+            config/initializers/secret_token.rb
             coverage
             db/*.db
             db/*.sqlite3
             db/schema.rb
             files/*
             lib/redmine/scm/adapters/mercurial/redminehelper.pyc
             lib/redmine/scm/adapters/mercurial/redminehelper.pyo
             log/*.log*
             log/mongrel_debug
             public/dispatch.*
             public/plugin_assets
             tmp/*
             tmp/cache/*
             tmp/sessions/*
             tmp/sockets/*
             tmp/test/*
             vendor/cache
             vendor/rails
             *.rbc
             .svn/
             .git/
             .bundle
             Gemfile.lock
             Gemfile.local

Gemfile +9 -5

-            source :rubygems
+            source 'http://rubygems.org'
-            gem "rails", "2.3.14"
+            gem 'rails', '3.2.3'
-            gem "i18n", "~> 0.4.2"
+            gem 'prototype-rails', '3.2.1'
+            gem "i18n", "~> 0.6.0"
             gem "coderay", "~> 1.0.6"
             gem "fastercsv", "~> 1.5.0", :platforms => [:mri_18, :mingw_18, :jruby]
             gem "tzinfo", "~> 0.3.31"
+            gem "builder"
             # Optional gem for LDAP authentication
             group :ldap do
               gem "net-ldap", "~> 0.3.1"
             end
             # Optional gem for OpenID authentication
             group :openid do
               gem "ruby-openid", "~> 2.1.4", :require => "openid"
+              gem "rack-openid"
             end
             # Optional gem for exporting the gantt to a PNG file, not supported with jruby
             platforms :mri, :mingw do
               group :rmagick do
                 # RMagick 2 supports ruby 1.9
                 # RMagick 1 would be fine for ruby 1.8 but Bundler does not support
                 # different requirements for the same gem on different platforms
                 gem "rmagick", ">= 2.0.0"
               end
             end
             # Database gems
             platforms :mri, :mingw do
               group :postgresql do
                 gem "pg", ">= 0.11.0"
               end
               group :sqlite do
                 gem "sqlite3"
               end
             end
             platforms :mri_18, :mingw_18 do
               group :mysql do
                 gem "mysql"
               end
             end
             platforms :mri_19, :mingw_19 do
               group :mysql do
-                gem "mysql2", "~> 0.2.7"
+                gem "mysql2", "~> 0.3.11"
               end
             end
             platforms :jruby do
               gem "jruby-openssl"
               group :mysql do
                 gem "activerecord-jdbcmysql-adapter"
               end
               group :postgresql do
                 gem "activerecord-jdbcpostgresql-adapter"
               end
               group :sqlite do
                 gem "activerecord-jdbcsqlite3-adapter"
               end
             end
             group :development do
               gem "rdoc", ">= 2.4.2"
             end
             group :test do
-              gem "shoulda", "~> 2.10.3"
+              gem "shoulda"
               gem "mocha"
             end
             local_gemfile = File.join(File.dirname(__FILE__), "Gemfile.local")
             if File.exists?(local_gemfile)
               puts "Loading Gemfile.local ..." if $DEBUG # `ruby -d` or `bundle -v`
               instance_eval File.read(local_gemfile)
             end
             # Load plugins' Gemfiles
             Dir.glob File.expand_path("../vendor/plugins/*/Gemfile", __FILE__) do |file|
               puts "Loading #{file} ..." if $DEBUG # `ruby -d` or `bundle -v`
               instance_eval File.read(file)
             end

Rakefile +4 -12

@@ -1,15 +1,7
		1	#!/usr/bin/env rake
1	# Add your own tasks in files placed in lib/tasks ending in .rake,	2	# Add your own tasks in files placed in lib/tasks ending in .rake,
2	# for example lib/tasks/~~switchtower~~.rake, and they will automatically be available to Rake.	3	# for example lib/tasks/capistrano.rake, and they will automatically be available to Rake.
3		4
4	require(File.join(File.dirname(__FILE__), 'config', 'boot'))	5	require File.expand_path('../config/application', __FILE__)
5		6
6	require 'rake'	7	RedmineApp::Application.load_tasks
7	require 'rake/testtask'
8
9	begin
10	require 'rdoc/task'
11	rescue LoadError
12	# RDoc is not available
13	end
14
15	require 'tasks/rails'

app/controllers/application_controller.rb +14 -30

             # Redmine - project management software
             # Copyright (C) 2006-2011  Jean-Philippe Lang
             #
             # This program is free software; you can redistribute it and/or
             # modify it under the terms of the GNU General Public License
             # as published by the Free Software Foundation; either version 2
             # of the License, or (at your option) any later version.
             #
             # This program is distributed in the hope that it will be useful,
             # but WITHOUT ANY WARRANTY; without even the implied warranty of
             # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
             # GNU General Public License for more details.
             #
             # You should have received a copy of the GNU General Public License
             # along with this program; if not, write to the Free Software
             # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
             require 'uri'
             require 'cgi'
             class Unauthorized < Exception; end
             class ApplicationController < ActionController::Base
               include Redmine::I18n
+              class_attribute :accept_api_auth_actions
+              class_attribute :accept_rss_auth_actions
+              class_attribute :model_object
               layout 'base'
-              exempt_from_layout 'builder', 'rsb'
               protect_from_forgery
               def handle_unverified_request
                 super
                 cookies.delete(:autologin)
               end
               # Remove broken cookie after upgrade from 0.8.x (#4292)
               # See https://rails.lighthouseapp.com/projects/8994/tickets/3360
               # TODO: remove it when Rails is fixed
               before_filter :delete_broken_cookies
               def delete_broken_cookies
                 if cookies['_redmine_session'] && cookies['_redmine_session'] !~ /--/
                   cookies.delete '_redmine_session'
                   redirect_to home_path
                   return false
                 end
               end
               # FIXME: Remove this when all of Rack and Rails have learned how to
               # properly use encodings
               before_filter :params_filter
               def params_filter
                 if RUBY_VERSION >= '1.9' && defined?(Rails) && Rails::VERSION::MAJOR < 3
                   self.utf8nize!(params)
                 end
               end
               def utf8nize!(obj)
                 if obj.frozen?
                   obj
                 elsif obj.is_a? String
                   obj.respond_to?(:force_encoding) ? obj.force_encoding("UTF-8") : obj
                 elsif obj.is_a? Hash
                   obj.each {|k, v| obj[k] = self.utf8nize!(v)}
                 elsif obj.is_a? Array
                   obj.each {|v| self.utf8nize!(v)}
                 else
                   obj
                 end
               end
               before_filter :user_setup, :check_if_login_required, :set_localization
-              filter_parameter_logging :password
               rescue_from ActionController::InvalidAuthenticityToken, :with => :invalid_authenticity_token
               rescue_from ::Unauthorized, :with => :deny_access
               include Redmine::Search::Controller
               include Redmine::MenuManager::MenuController
               helper Redmine::MenuManager::MenuHelper
-              Redmine::Scm::Base.all.each do |scm|
-                require_dependency "repository/#{scm.underscore}"
-              end
               def user_setup
                 # Check the settings cache for each request
                 Setting.check_cache
                 # Find the current user
                 User.current = find_current_user
               end
               # Returns the current user or nil if no user is logged in
               # and starts a session if needed
               def find_current_user
                 if session[:user_id]
                   # existing session
                   (User.active.find(session[:user_id]) rescue nil)
                 elsif cookies[:autologin] && Setting.autologin?
                   # auto-login feature starts a new session
                   user = User.try_to_autologin(cookies[:autologin])
                   session[:user_id] = user.id if user
                   user
                 elsif params[:format] == 'atom' && params[:key] && request.get? && accept_rss_auth?
                   # RSS key authentication does not start a session
                   User.find_by_rss_key(params[:key])
                 elsif Setting.rest_api_enabled? && accept_api_auth?
                   if (key = api_key_from_request)
                     # Use API key
                     User.find_by_api_key(key)
                   else
                     # HTTP Basic, either username/password or API key/random
                     authenticate_with_http_basic do |username, password|
                       User.try_to_login(username, password) || User.find_by_api_key(username)
                     end
                   end
                 end
               end
               # Sets the logged in user
               def logged_user=(user)
                 reset_session
                 if user && user.is_a?(User)
                   User.current = user
                   session[:user_id] = user.id
                 else
                   User.current = User.anonymous
                 end
               end
               # Logs out current user
               def logout_user
                 if User.current.logged?
                   cookies.delete :autologin
                   Token.delete_all(["user_id = ? AND action = ?", User.current.id, 'autologin'])
                   self.logged_user = nil
                 end
               end
               # check if login is globally required to access the application
               def check_if_login_required
                 # no check needed if user is already logged in
                 return true if User.current.logged?
                 require_login if Setting.login_required?
               end
               def set_localization
                 lang = nil
                 if User.current.logged?
                   lang = find_language(User.current.language)
                 end
                 if lang.nil? && request.env['HTTP_ACCEPT_LANGUAGE']
                   accept_lang = parse_qvalues(request.env['HTTP_ACCEPT_LANGUAGE']).first
                   if !accept_lang.blank?
                     accept_lang = accept_lang.downcase
                     lang = find_language(accept_lang) || find_language(accept_lang.split('-').first)
                   end
                 end
                 lang ||= Setting.default_language
                 set_language_if_valid(lang)
               end
               def require_login
                 if !User.current.logged?
                   # Extract only the basic url parameters on non-GET requests
                   if request.get?
                     url = url_for(params)
                   else
                     url = url_for(:controller => params[:controller], :action => params[:action], :id => params[:id], :project_id => params[:project_id])
                   end
                   respond_to do |format|
                     format.html { redirect_to :controller => "account", :action => "login", :back_url => url }
                     format.atom { redirect_to :controller => "account", :action => "login", :back_url => url }
                     format.xml  { head :unauthorized, 'WWW-Authenticate' => 'Basic realm="Redmine API"' }
                     format.js   { head :unauthorized, 'WWW-Authenticate' => 'Basic realm="Redmine API"' }
                     format.json { head :unauthorized, 'WWW-Authenticate' => 'Basic realm="Redmine API"' }
                   end
                   return false
                 end
                 true
               end
               def require_admin
                 return unless require_login
                 if !User.current.admin?
                   render_403
                   return false
                 end
                 true
               end
               def deny_access
                 User.current.logged? ? render_403 : require_login
               end
               # Authorize the user for the requested action
               def authorize(ctrl = params[:controller], action = params[:action], global = false)
                 allowed = User.current.allowed_to?({:controller => ctrl, :action => action}, @project || @projects, :global => global)
                 if allowed
                   true
                 else
                   if @project && @project.archived?
                     render_403 :message => :notice_not_authorized_archived_project
                   else
                     deny_access
                   end
                 end
               end
               # Authorize the user for the requested action outside a project
               def authorize_global(ctrl = params[:controller], action = params[:action], global = true)
                 authorize(ctrl, action, global)
               end
               # Find project of id params[:id]
               def find_project
                 @project = Project.find(params[:id])
               rescue ActiveRecord::RecordNotFound
                 render_404
               end
               # Find project of id params[:project_id]
               def find_project_by_project_id
                 @project = Project.find(params[:project_id])
               rescue ActiveRecord::RecordNotFound
                 render_404
               end
               # Find a project based on params[:project_id]
               # TODO: some subclasses override this, see about merging their logic
               def find_optional_project
                 @project = Project.find(params[:project_id]) unless params[:project_id].blank?
                 allowed = User.current.allowed_to?({:controller => params[:controller], :action => params[:action]}, @project, :global => true)
                 allowed ? true : deny_access
               rescue ActiveRecord::RecordNotFound
                 render_404
               end
               # Finds and sets @project based on @object.project
               def find_project_from_association
                 render_404 unless @object.present?
                 @project = @object.project
               end
               def find_model_object
-                model = self.class.read_inheritable_attribute('model_object')
+                model = self.class.model_object
                 if model
                   @object = model.find(params[:id])
                   self.instance_variable_set('@' + controller_name.singularize, @object) if @object
                 end
               rescue ActiveRecord::RecordNotFound
                 render_404
               end
               def self.model_object(model)
-                write_inheritable_attribute('model_object', model)
+                self.model_object = model
               end
               # Filter for bulk issue operations
               def find_issues
                 @issues = Issue.find_all_by_id(params[:id] || params[:ids])
                 raise ActiveRecord::RecordNotFound if @issues.empty?
                 if @issues.detect {|issue| !issue.visible?}
                   deny_access
                   return
                 end
                 @projects = @issues.collect(&:project).compact.uniq
                 @project = @projects.first if @projects.size == 1
               rescue ActiveRecord::RecordNotFound
                 render_404
               end
               # make sure that the user is a member of the project (or admin) if project is private
               # used as a before_filter for actions that do not require any particular permission on the project
               def check_project_privacy
                 if @project && @project.active?
                   if @project.visible?
                     true
                   else
                     deny_access
                   end
                 else
                   @project = nil
                   render_404
                   false
                 end
               end
               def back_url
                 params[:back_url] || request.env['HTTP_REFERER']
               end
               def redirect_back_or_default(default)
                 back_url = CGI.unescape(params[:back_url].to_s)
                 if !back_url.blank?
                   begin
                     uri = URI.parse(back_url)
                     # do not redirect user to another host or to the login or register page
                     if (uri.relative? || (uri.host == request.host)) && !uri.path.match(%r{/(login|account/register)})
                       redirect_to(back_url)
                       return
                     end
                   rescue URI::InvalidURIError
                     # redirect to default
                   end
                 end
                 redirect_to default
                 false
               end
               # Redirects to the request referer if present, redirects to args or call block otherwise.
               def redirect_to_referer_or(*args, &block)
                 redirect_to :back
               rescue ::ActionController::RedirectBackError
                 if args.any?
                   redirect_to *args
                 elsif block_given?
                   block.call
                 else
                   raise "#redirect_to_referer_or takes arguments or a block"
                 end
               end
               def render_403(options={})
                 @project = nil
                 render_error({:message => :notice_not_authorized, :status => 403}.merge(options))
                 return false
               end
               def render_404(options={})
                 render_error({:message => :notice_file_not_found, :status => 404}.merge(options))
                 return false
               end
               # Renders an error response
               def render_error(arg)
                 arg = {:message => arg} unless arg.is_a?(Hash)
                 @message = arg[:message]
                 @message = l(@message) if @message.is_a?(Symbol)
                 @status = arg[:status] || 500
                 respond_to do |format|
                   format.html {
                     render :template => 'common/error', :layout => use_layout, :status => @status
                   }
                   format.atom { head @status }
                   format.xml { head @status }
                   format.js { head @status }
                   format.json { head @status }
                 end
               end
               # Filter for actions that provide an API response
               # but have no HTML representation for non admin users
               def require_admin_or_api_request
                 return true if api_request?
                 if User.current.admin?
                   true
                 elsif User.current.logged?
                   render_error(:status => 406)
                 else
                   deny_access
                 end
               end
               # Picks which layout to use based on the request
               #
               # @return [boolean, string] name of the layout to use or false for no layout
               def use_layout
                 request.xhr? ? false : 'base'
               end
               def invalid_authenticity_token
                 if api_request?
                   logger.error "Form authenticity token is missing or is invalid. API calls must include a proper Content-type header (text/xml or text/json)."
                 end
                 render_error "Invalid form authenticity token."
               end
               def render_feed(items, options={})
                 @items = items || []
                 @items.sort! {|x,y| y.event_datetime <=> x.event_datetime }
                 @items = @items.slice(0, Setting.feeds_limit.to_i)
                 @title = options[:title] || Setting.app_title
                 render :template => "common/feed.atom", :layout => false,
                        :content_type => 'application/atom+xml'
               end
               def self.accept_rss_auth(*actions)
                 if actions.any?
-                  write_inheritable_attribute('accept_rss_auth_actions', actions)
+                  self.accept_rss_auth_actions = actions
                 else
-                  read_inheritable_attribute('accept_rss_auth_actions') || []
+                  self.accept_rss_auth_actions || []
                 end
               end
               def accept_rss_auth?(action=action_name)
                 self.class.accept_rss_auth.include?(action.to_sym)
               end
               def self.accept_api_auth(*actions)
                 if actions.any?
-                  write_inheritable_attribute('accept_api_auth_actions', actions)
+                  self.accept_api_auth_actions = actions
                 else
-                  read_inheritable_attribute('accept_api_auth_actions') || []
+                  self.accept_api_auth_actions || []
                 end
               end
               def accept_api_auth?(action=action_name)
                 self.class.accept_api_auth.include?(action.to_sym)
               end
               # Returns the number of objects that should be displayed
               # on the paginated list
               def per_page_option
                 per_page = nil
                 if params[:per_page] && Setting.per_page_options_array.include?(params[:per_page].to_s.to_i)
                   per_page = params[:per_page].to_s.to_i
                   session[:per_page] = per_page
                 elsif session[:per_page]
                   per_page = session[:per_page]
                 else
                   per_page = Setting.per_page_options_array.first || 25
                 end
                 per_page
               end
               # Returns offset and limit used to retrieve objects
               # for an API response based on offset, limit and page parameters
               def api_offset_and_limit(options=params)
                 if options[:offset].present?
                   offset = options[:offset].to_i
                   if offset < 0
                     offset = 0
                   end
                 end
                 limit = options[:limit].to_i
                 if limit < 1
                   limit = 25
                 elsif limit > 100
                   limit = 100
                 end
                 if offset.nil? && options[:page].present?
                   offset = (options[:page].to_i - 1) * limit
                   offset = 0 if offset < 0
                 end
                 offset ||= 0
                 [offset, limit]
               end
               # qvalues http header parser
               # code taken from webrick
               def parse_qvalues(value)
                 tmp = []
                 if value
                   parts = value.split(/,\s*/)
                   parts.each {|part|
                     if m = %r{^([^\s,]+?)(?:;\s*q=(\d+(?:\.\d+)?))?$}.match(part)
                       val = m[1]
                       q = (m[2] or 1).to_f
                       tmp.push([val, q])
                     end
                   }
                   tmp = tmp.sort_by{|val, q| -q}
                   tmp.collect!{|val, q| val}
                 end
                 return tmp
               rescue
                 nil
               end
               # Returns a string that can be used as filename value in Content-Disposition header
               def filename_for_content_disposition(name)
                 request.env['HTTP_USER_AGENT'] =~ %r{MSIE} ? ERB::Util.url_encode(name) : name
               end
               def api_request?
                 %w(xml json).include? params[:format]
               end
               # Returns the API key present in the request
               def api_key_from_request
                 if params[:key].present?
                   params[:key]
                 elsif request.headers["X-Redmine-API-Key"].present?
                   request.headers["X-Redmine-API-Key"]
                 end
               end
               # Renders a warning flash if obj has unsaved attachments
               def render_attachment_warning_if_needed(obj)
                 flash[:warning] = l(:warning_attachments_not_saved, obj.unsaved_attachments.size) if obj.unsaved_attachments.present?
               end
               # Sets the `flash` notice or error based the number of issues that did not save
               #
               # @param [Array, Issue] issues all of the saved and unsaved Issues
               # @param [Array, Integer] unsaved_issue_ids the issue ids that were not saved
               def set_flash_from_bulk_issue_save(issues, unsaved_issue_ids)
                 if unsaved_issue_ids.empty?
                   flash[:notice] = l(:notice_successful_update) unless issues.empty?
                 else
                   flash[:error] = l(:notice_failed_to_save_issues,
                                     :count => unsaved_issue_ids.size,
                                     :total => issues.size,
                                     :ids => '#' + unsaved_issue_ids.join(', #'))
                 end
               end
               # Rescues an invalid query statement. Just in case...
               def query_statement_invalid(exception)
                 logger.error "Query::StatementInvalid: #{exception.message}" if logger
                 session.delete(:query)
                 sort_clear if respond_to?(:sort_clear)
                 render_error "An error occurred while executing the query and has been logged. Please report this error to your Redmine administrator."
               end
               # Renders API response on validation failure
               def render_validation_errors(objects)
                 if objects.is_a?(Array)
                   @error_messages = objects.map {|object| object.errors.full_messages}.flatten
                 else
                   @error_messages = objects.errors.full_messages
                 end
-                render :template => 'common/error_messages.api', :status => :unprocessable_entity, :layout => false
+                render :template => 'common/error_messages.api', :status => :unprocessable_entity, :layout => nil
-              end
-              # Overrides #default_template so that the api template
-              # is used automatically if it exists
-              def default_template(action_name = self.action_name)
-                if api_request?
-                  begin
-                    return self.view_paths.find_template(default_template_name(action_name), 'api')
-                  rescue ::ActionView::MissingTemplate
-                    # the api template was not found
-                    # fallback to the default behaviour
-                  end
-                end
-                super
               end
-              # Overrides #pick_layout so that #render with no arguments
+              # Overrides #_include_layout? so that #render with no arguments
               # doesn't use the layout for api requests
-              def pick_layout(*args)
+              def _include_layout?(*args)
-                api_request? ? nil : super
+                api_request? ? false : super
               end
             end

app/controllers/messages_controller.rb +2 -1

             # Redmine - project management software
             # Copyright (C) 2006-2011  Jean-Philippe Lang
             #
             # This program is free software; you can redistribute it and/or
             # modify it under the terms of the GNU General Public License
             # as published by the Free Software Foundation; either version 2
             # of the License, or (at your option) any later version.
             #
             # This program is distributed in the hope that it will be useful,
             # but WITHOUT ANY WARRANTY; without even the implied warranty of
             # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
             # GNU General Public License for more details.
             #
             # You should have received a copy of the GNU General Public License
             # along with this program; if not, write to the Free Software
             # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
             class MessagesController < ApplicationController
               menu_item :boards
               default_search_scope :messages
               before_filter :find_board, :only => [:new, :preview]
               before_filter :find_message, :except => [:new, :preview]
               before_filter :authorize, :except => [:preview, :edit, :destroy]
               helper :watchers
               helper :attachments
               include AttachmentsHelper
               REPLIES_PER_PAGE = 25 unless const_defined?(:REPLIES_PER_PAGE)
               # Show a topic and its replies
               def show
                 page = params[:page]
                 # Find the page of the requested reply
                 if params[:r] && page.nil?
                   offset = @topic.children.count(:conditions => ["#{Message.table_name}.id < ?", params[:r].to_i])
                   page = 1 + offset / REPLIES_PER_PAGE
                 end
                 @reply_count = @topic.children.count
                 @reply_pages = Paginator.new self, @reply_count, REPLIES_PER_PAGE, page
                 @replies =  @topic.children.find(:all, :include => [:author, :attachments, {:board => :project}],
                                                        :order => "#{Message.table_name}.created_on ASC",
                                                        :limit => @reply_pages.items_per_page,
                                                        :offset => @reply_pages.current.offset)
                 @reply = Message.new(:subject => "RE: #{@message.subject}")
                 render :action => "show", :layout => false if request.xhr?
               end
               # Create a new topic
               def new
                 @message = Message.new
                 @message.author = User.current
                 @message.board = @board
                 @message.safe_attributes = params[:message]
                 if request.post?
                   @message.save_attachments(params[:attachments])
                   if @message.save
                     call_hook(:controller_messages_new_after_save, { :params => params, :message => @message})
                     render_attachment_warning_if_needed(@message)
                     redirect_to :action => 'show', :id => @message
                   end
                 end
               end
               # Reply to a topic
               def reply
                 @reply = Message.new
                 @reply.author = User.current
                 @reply.board = @board
                 @reply.safe_attributes = params[:reply]
                 @topic.children << @reply
                 if !@reply.new_record?
                   call_hook(:controller_messages_reply_after_save, { :params => params, :message => @reply})
                   attachments = Attachment.attach_files(@reply, params[:attachments])
                   render_attachment_warning_if_needed(@reply)
                 end
                 redirect_to :action => 'show', :id => @topic, :r => @reply
               end
               # Edit a message
               def edit
                 (render_403; return false) unless @message.editable_by?(User.current)
                 @message.safe_attributes = params[:message]
                 if request.post? && @message.save
                   attachments = Attachment.attach_files(@message, params[:attachments])
                   render_attachment_warning_if_needed(@message)
                   flash[:notice] = l(:notice_successful_update)
                   @message.reload
                   redirect_to :action => 'show', :board_id => @message.board, :id => @message.root, :r => (@message.parent_id && @message.id)
                 end
               end
               # Delete a messages
               def destroy
                 (render_403; return false) unless @message.destroyable_by?(User.current)
+                r = @message.to_param
                 @message.destroy
                 redirect_to @message.parent.nil? ?
                   { :controller => 'boards', :action => 'show', :project_id => @project, :id => @board } :
-                  { :action => 'show', :id => @message.parent, :r => @message }
+                  { :action => 'show', :id => @message.parent, :r => r }
               end
               def quote
                 user = @message.author
                 text = @message.content
                 subject = @message.subject.gsub('"', '\"')
                 subject = "RE: #{subject}" unless subject.starts_with?('RE:')
                 content = "#{ll(Setting.default_language, :text_user_wrote, user)}\\n> "
                 content << text.to_s.strip.gsub(%r{<pre>((.|\s)*?)</pre>}m, '[...]').gsub('"', '\"').gsub(/(\r?\n|\r\n?)/, "\\n> ") + "\\n\\n"
                 render(:update) { |page|
                   page << "$('message_subject').value = \"#{subject}\";"
                   page.<< "$('message_content').value = \"#{content}\";"
                   page.show 'reply'
                   page << "Form.Element.focus('message_content');"
                   page << "Element.scrollTo('reply');"
                   page << "$('message_content').scrollTop = $('message_content').scrollHeight - $('message_content').clientHeight;"
                 }
               end
               def preview
                 message = @board.messages.find_by_id(params[:id])
                 @attachements = message.attachments if message
                 @text = (params[:message] || params[:reply])[:content]
                 render :partial => 'common/preview'
               end
             private
               def find_message
                 find_board
                 @message = @board.messages.find(params[:id], :include => :parent)
                 @topic = @message.root
               rescue ActiveRecord::RecordNotFound
                 render_404
               end
               def find_board
                 @board = Board.find(params[:board_id], :include => :project)
                 @project = @board.project
               rescue ActiveRecord::RecordNotFound
                 render_404
               end
             end

app/controllers/repositories_controller.rb +9 -9

             # Redmine - project management software
             # Copyright (C) 2006-2012  Jean-Philippe Lang
             #
             # This program is free software; you can redistribute it and/or
             # modify it under the terms of the GNU General Public License
             # as published by the Free Software Foundation; either version 2
             # of the License, or (at your option) any later version.
             #
             # This program is distributed in the hope that it will be useful,
             # but WITHOUT ANY WARRANTY; without even the implied warranty of
             # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
             # GNU General Public License for more details.
             #
             # You should have received a copy of the GNU General Public License
             # along with this program; if not, write to the Free Software
             # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
             require 'SVG/Graph/Bar'
             require 'SVG/Graph/BarHorizontal'
             require 'digest/sha1'
+            require 'redmine/scm/adapters/abstract_adapter'
             class ChangesetNotFound < Exception; end
             class InvalidRevisionParam < Exception; end
             class RepositoriesController < ApplicationController
               menu_item :repository
               menu_item :settings, :only => [:new, :create, :edit, :update, :destroy, :committers]
               default_search_scope :changesets
               before_filter :find_project_by_project_id, :only => [:new, :create]
               before_filter :find_repository, :only => [:edit, :update, :destroy, :committers]
               before_filter :find_project_repository, :except => [:new, :create, :edit, :update, :destroy, :committers]
               before_filter :find_changeset, :only => [:revision, :add_related_issue, :remove_related_issue]
               before_filter :authorize
               accept_rss_auth :revisions
               rescue_from Redmine::Scm::Adapters::CommandFailed, :with => :show_error_command_failed
               def new
                 scm = params[:repository_scm] || (Redmine::Scm::Base.all & Setting.enabled_scm).first
                 @repository = Repository.factory(scm)
                 @repository.is_default = @project.repository.nil?
                 @repository.project = @project
                 render :layout => !request.xhr?
               end
               def create
                 @repository = Repository.factory(params[:repository_scm], params[:repository])
                 @repository.project = @project
                 if request.post? && @repository.save
                   redirect_to settings_project_path(@project, :tab => 'repositories')
                 else
                   render :action => 'new'
                 end
               end
               def edit
               end
               def update
                 @repository.attributes = params[:repository]
                 @repository.project = @project
                 if request.put? && @repository.save
                   redirect_to settings_project_path(@project, :tab => 'repositories')
                 else
                   render :action => 'edit'
                 end
               end
               def committers
                 @committers = @repository.committers
                 @users = @project.users
                 additional_user_ids = @committers.collect(&:last).collect(&:to_i) - @users.collect(&:id)
                 @users += User.find_all_by_id(additional_user_ids) unless additional_user_ids.empty?
                 @users.compact!
                 @users.sort!
                 if request.post? && params[:committers].is_a?(Hash)
                   # Build a hash with repository usernames as keys and corresponding user ids as values
                   @repository.committer_ids = params[:committers].values.inject({}) {|h, c| h[c.first] = c.last; h}
                   flash[:notice] = l(:notice_successful_update)
                   redirect_to settings_project_path(@project, :tab => 'repositories')
                 end
               end
               def destroy
                 @repository.destroy if request.delete?
                 redirect_to settings_project_path(@project, :tab => 'repositories')
               end
               def show
                 @repository.fetch_changesets if Setting.autofetch_changesets? && @path.empty?
                 @entries = @repository.entries(@path, @rev)
                 @changeset = @repository.find_changeset_by_name(@rev)
                 if request.xhr?
                   @entries ? render(:partial => 'dir_list_content') : render(:nothing => true)
                 else
                   (show_error_not_found; return) unless @entries
                   @changesets = @repository.latest_changesets(@path, @rev)
                   @properties = @repository.properties(@path, @rev)
                   @repositories = @project.repositories
                   render :action => 'show'
                 end
               end
               alias_method :browse, :show
               def changes
                 @entry = @repository.entry(@path, @rev)
                 (show_error_not_found; return) unless @entry
                 @changesets = @repository.latest_changesets(@path, @rev, Setting.repository_log_display_limit.to_i)
                 @properties = @repository.properties(@path, @rev)
                 @changeset = @repository.find_changeset_by_name(@rev)
               end
               def revisions
                 @changeset_count = @repository.changesets.count
                 @changeset_pages = Paginator.new self, @changeset_count,
                                                  per_page_option,
                                                  params['page']
                 @changesets = @repository.changesets.find(:all,
                                    :limit  =>  @changeset_pages.items_per_page,
                                    :offset =>  @changeset_pages.current.offset,
                                    :include => [:user, :repository, :parents])
                 respond_to do |format|
                   format.html { render :layout => false if request.xhr? }
                   format.atom { render_feed(@changesets, :title => "#{@project.name}: #{l(:label_revision_plural)}") }
                 end
               end
               def entry
                 @entry = @repository.entry(@path, @rev)
                 (show_error_not_found; return) unless @entry
                 # If the entry is a dir, show the browser
                 (show; return) if @entry.is_dir?
                 @content = @repository.cat(@path, @rev)
                 (show_error_not_found; return) unless @content
                 if 'raw' == params[:format] ||
                      (@content.size && @content.size > Setting.file_max_size_displayed.to_i.kilobyte) ||
                      ! is_entry_text_data?(@content, @path)
                   # Force the download
                   send_opt = { :filename => filename_for_content_disposition(@path.split('/').last) }
                   send_type = Redmine::MimeType.of(@path)
                   send_opt[:type] = send_type.to_s if send_type
                   send_data @content, send_opt
                 else
                   # Prevent empty lines when displaying a file with Windows style eol
                   # TODO: UTF-16
                   # Is this needs? AttachmentsController reads file simply.
                   @content.gsub!("\r\n", "\n")
                   @changeset = @repository.find_changeset_by_name(@rev)
                 end
               end
               def is_entry_text_data?(ent, path)
                 # UTF-16 contains "\x00".
                 # It is very strict that file contains less than 30% of ascii symbols
                 # in non Western Europe.
                 return true if Redmine::MimeType.is_type?('text', path)
                 # Ruby 1.8.6 has a bug of integer divisions.
                 # http://apidock.com/ruby/v1_8_6_287/String/is_binary_data%3F
                 return false if ent.is_binary_data?
                 true
               end
               private :is_entry_text_data?
               def annotate
                 @entry = @repository.entry(@path, @rev)
                 (show_error_not_found; return) unless @entry
                 @annotate = @repository.scm.annotate(@path, @rev)
                 if @annotate.nil? || @annotate.empty?
                   (render_error l(:error_scm_annotate); return)
                 end
                 ann_buf_size = 0
                 @annotate.lines.each do |buf|
                   ann_buf_size += buf.size
                 end
                 if ann_buf_size > Setting.file_max_size_displayed.to_i.kilobyte
                   (render_error l(:error_scm_annotate_big_text_file); return)
                 end
                 @changeset = @repository.find_changeset_by_name(@rev)
               end
               def revision
                 respond_to do |format|
                   format.html
                   format.js {render :layout => false}
                 end
               end
               # Adds a related issue to a changeset
               # POST /projects/:project_id/repository/(:repository_id/)revisions/:rev/issues
               def add_related_issue
                 @issue = @changeset.find_referenced_issue_by_id(params[:issue_id])
                 if @issue && (!@issue.visible? || @changeset.issues.include?(@issue))
                   @issue = nil
                 end
                 if @issue
                   @changeset.issues << @issue
                   respond_to do |format|
                     format.js {
                       render :update do |page|
                         page.replace_html "related-issues", :partial => "related_issues"
                         page.visual_effect :highlight, "related-issue-#{@issue.id}"
                       end
                     }
                   end
                 else
                   respond_to do |format|
                     format.js {
                       render :update do |page|
                         page.alert(l(:label_issue) + ' ' + l('activerecord.errors.messages.invalid'))
                       end
                     }
                   end
                 end
               end
               # Removes a related issue from a changeset
               # DELETE /projects/:project_id/repository/(:repository_id/)revisions/:rev/issues/:issue_id
               def remove_related_issue
                 @issue = Issue.visible.find_by_id(params[:issue_id])
                 if @issue
                   @changeset.issues.delete(@issue)
                 end
                 respond_to do |format|
                   format.js {
                     render :update do |page|
                       page.remove "related-issue-#{@issue.id}"
                     end if @issue
                   }
                 end
               end
               def diff
                 if params[:format] == 'diff'
                   @diff = @repository.diff(@path, @rev, @rev_to)
                   (show_error_not_found; return) unless @diff
                   filename = "changeset_r#{@rev}"
                   filename << "_r#{@rev_to}" if @rev_to
                   send_data @diff.join, :filename => "#{filename}.diff",
                                         :type => 'text/x-patch',
                                         :disposition => 'attachment'
                 else
                   @diff_type = params[:type] || User.current.pref[:diff_type] || 'inline'
                   @diff_type = 'inline' unless %w(inline sbs).include?(@diff_type)
                   # Save diff type as user preference
                   if User.current.logged? && @diff_type != User.current.pref[:diff_type]
                     User.current.pref[:diff_type] = @diff_type
                     User.current.preference.save
                   end
                   @cache_key = "repositories/diff/#{@repository.id}/" +
                                   Digest::MD5.hexdigest("#{@path}-#{@rev}-#{@rev_to}-#{@diff_type}-#{current_language}")
                   unless read_fragment(@cache_key)
                     @diff = @repository.diff(@path, @rev, @rev_to)
                     show_error_not_found unless @diff
                   end
                   @changeset = @repository.find_changeset_by_name(@rev)
                   @changeset_to = @rev_to ? @repository.find_changeset_by_name(@rev_to) : nil
                   @diff_format_revisions = @repository.diff_format_revisions(@changeset, @changeset_to)
                 end
               end
               def stats
               end
               def graph
                 data = nil
                 case params[:graph]
                 when "commits_per_month"
                   data = graph_commits_per_month(@repository)
                 when "commits_per_author"
                   data = graph_commits_per_author(@repository)
                 end
                 if data
                   headers["Content-Type"] = "image/svg+xml"
                   send_data(data, :type => "image/svg+xml", :disposition => "inline")
                 else
                   render_404
                 end
               end
               private
               def find_repository
                 @repository = Repository.find(params[:id])
                 @project = @repository.project
               rescue ActiveRecord::RecordNotFound
                 render_404
               end
               REV_PARAM_RE = %r{\A[a-f0-9]*\Z}i
               def find_project_repository
                 @project = Project.find(params[:id])
                 if params[:repository_id].present?
                   @repository = @project.repositories.find_by_identifier_param(params[:repository_id])
                 else
                   @repository = @project.repository
                 end
                 (render_404; return false) unless @repository
-                @path = params[:path].join('/') unless params[:path].nil?
+                @path = params[:path].is_a?(Array) ? params[:path].join('/') : params[:path].to_s
-                @path ||= ''
                 @rev = params[:rev].blank? ? @repository.default_branch : params[:rev].to_s.strip
                 @rev_to = params[:rev_to]
                 unless @rev.to_s.match(REV_PARAM_RE) && @rev_to.to_s.match(REV_PARAM_RE)
                   if @repository.branches.blank?
                     raise InvalidRevisionParam
                   end
                 end
               rescue ActiveRecord::RecordNotFound
                 render_404
               rescue InvalidRevisionParam
                 show_error_not_found
               end
               def find_changeset
                 if @rev.present?
                   @changeset = @repository.find_changeset_by_name(@rev)
                 end
                 show_error_not_found unless @changeset
               end
               def show_error_not_found
                 render_error :message => l(:error_scm_not_found), :status => 404
               end
               # Handler for Redmine::Scm::Adapters::CommandFailed exception
               def show_error_command_failed(exception)
                 render_error l(:error_scm_command_failed, exception.message)
               end
               def graph_commits_per_month(repository)
                 @date_to = Date.today
                 @date_from = @date_to << 11
                 @date_from = Date.civil(@date_from.year, @date_from.month, 1)
-                commits_by_day = repository.changesets.count(
+                commits_by_day = Changeset.count(
                                       :all, :group => :commit_date,
-                                      :conditions => ["commit_date BETWEEN ? AND ?", @date_from, @date_to])
+                                      :conditions => ["repository_id = ? AND commit_date BETWEEN ? AND ?", repository.id, @date_from, @date_to])
                 commits_by_month = [0] * 12
                 commits_by_day.each {|c| commits_by_month[c.first.to_date.months_ago] += c.last }
-                changes_by_day = repository.changes.count(
+                changes_by_day = Change.count(
-                                      :all, :group => :commit_date,
+                                      :all, :group => :commit_date, :include => :changeset,
-                                      :conditions => ["commit_date BETWEEN ? AND ?", @date_from, @date_to])
+                                      :conditions => ["#{Changeset.table_name}.repository_id = ? AND #{Changeset.table_name}.commit_date BETWEEN ? AND ?", repository.id, @date_from, @date_to])
                 changes_by_month = [0] * 12
                 changes_by_day.each {|c| changes_by_month[c.first.to_date.months_ago] += c.last }
                 fields = []
 .times {|m| fields << month_name(((Date.today.month - 1 - m) % 12) + 1)}
                 graph = SVG::Graph::Bar.new(
                   :height => 300,
                   :width => 800,
                   :fields => fields.reverse,
                   :stack => :side,
                   :scale_integers => true,
                   :step_x_labels => 2,
                   :show_data_values => false,
                   :graph_title => l(:label_commits_per_month),
                   :show_graph_title => true
                 )
                 graph.add_data(
                   :data => commits_by_month[0..11].reverse,
                   :title => l(:label_revision_plural)
                 )
                 graph.add_data(
                   :data => changes_by_month[0..11].reverse,
                   :title => l(:label_change_plural)
                 )
                 graph.burn
               end
               def graph_commits_per_author(repository)
-                commits_by_author = repository.changesets.count(:all, :group => :committer)
+                commits_by_author = Changeset.count(:all, :group => :committer, :conditions => ["repository_id = ?", repository.id])
                 commits_by_author.to_a.sort! {|x, y| x.last <=> y.last}
-                changes_by_author = repository.changes.count(:all, :group => :committer)
+                changes_by_author = Change.count(:all, :group => :committer, :include => :changeset, :conditions => ["#{Changeset.table_name}.repository_id = ?", repository.id])
                 h = changes_by_author.inject({}) {|o, i| o[i.first] = i.last; o}
                 fields = commits_by_author.collect {|r| r.first}
                 commits_data = commits_by_author.collect {|r| r.last}
                 changes_data = commits_by_author.collect {|r| h[r.first] || 0}
                 fields = fields + [""]*(10 - fields.length) if fields.length<10
                 commits_data = commits_data + [0]*(10 - commits_data.length) if commits_data.length<10
                 changes_data = changes_data + [0]*(10 - changes_data.length) if changes_data.length<10
                 # Remove email adress in usernames
                 fields = fields.collect {|c| c.gsub(%r{<.+@.+>}, '') }
                 graph = SVG::Graph::BarHorizontal.new(
                   :height => 400,
                   :width => 800,
                   :fields => fields,
                   :stack => :side,
                   :scale_integers => true,
                   :show_data_values => false,
                   :rotate_y_labels => false,
                   :graph_title => l(:label_commits_per_author),
                   :show_graph_title => true
                 )
                 graph.add_data(
                   :data => commits_data,
                   :title => l(:label_revision_plural)
                 )
                 graph.add_data(
                   :data => changes_data,
                   :title => l(:label_change_plural)
                 )
                 graph.burn
               end
             end

app/controllers/watchers_controller.rb +1 -1

             # Redmine - project management software
             # Copyright (C) 2006-2011  Jean-Philippe Lang
             #
             # This program is free software; you can redistribute it and/or
             # modify it under the terms of the GNU General Public License
             # as published by the Free Software Foundation; either version 2
             # of the License, or (at your option) any later version.
             #
             # This program is distributed in the hope that it will be useful,
             # but WITHOUT ANY WARRANTY; without even the implied warranty of
             # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
             # GNU General Public License for more details.
             #
             # You should have received a copy of the GNU General Public License
             # along with this program; if not, write to the Free Software
             # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
             class WatchersController < ApplicationController
               before_filter :find_project
               before_filter :require_login, :check_project_privacy, :only => [:watch, :unwatch]
               before_filter :authorize, :only => [:new, :destroy]
               def watch
                 if @watched.respond_to?(:visible?) && !@watched.visible?(User.current)
                   render_403
                 else
                   set_watcher(User.current, true)
                 end
               end
               def unwatch
                 set_watcher(User.current, false)
               end
               def new
                 respond_to do |format|
                   format.js do
                     render :update do |page|
                       page.replace_html 'ajax-modal', :partial => 'watchers/new', :locals => {:watched => @watched}
                       page << "showModal('ajax-modal', '400px');"
                       page << "$('ajax-modal').addClassName('new-watcher');"
                     end
                   end
                 end
               end
               def create
                 if params[:watcher].is_a?(Hash) && request.post?
                   user_ids = params[:watcher][:user_ids] || [params[:watcher][:user_id]]
                   user_ids.each do |user_id|
                     Watcher.create(:watchable => @watched, :user_id => user_id)
                   end
                 end
                 respond_to do |format|
                   format.html { redirect_to_referer_or {render :text => 'Watcher added.', :layout => true}}
                   format.js do
                     render :update do |page|
                       page.replace_html 'ajax-modal', :partial => 'watchers/new', :locals => {:watched => @watched}
                       page.replace_html 'watchers', :partial => 'watchers/watchers', :locals => {:watched => @watched}
                     end
                   end
                 end
               end
               def append
                 if params[:watcher].is_a?(Hash)
                   user_ids = params[:watcher][:user_ids] || [params[:watcher][:user_id]]
                   users = User.active.find_all_by_id(user_ids)
                   respond_to do |format|
                     format.js do
                       render :update do |page|
                         users.each do |user|
                           page.select("#issue_watcher_user_ids_#{user.id}").each do |item|
                             page.remove item
                           end
                         end
                         page.insert_html :bottom, 'watchers_inputs', :text => watchers_checkboxes(nil, users, true)
                       end
                     end
                   end
                 end
               end
               def destroy
                 @watched.set_watcher(User.find(params[:user_id]), false) if request.post?
                 respond_to do |format|
                   format.html { redirect_to :back }
                   format.js do
                     render :update do |page|
                       page.replace_html 'watchers', :partial => 'watchers/watchers', :locals => {:watched => @watched}
                     end
                   end
                 end
               end
               def autocomplete_for_user
                 @users = User.active.like(params[:q]).find(:all, :limit => 100)
                 if @watched
                   @users -= @watched.watcher_users
                 end
                 render :layout => false
               end
             private
               def find_project
                 if params[:object_type] && params[:object_id]
                   klass = Object.const_get(params[:object_type].camelcase)
                   return false unless klass.respond_to?('watched_by')
                   @watched = klass.find(params[:object_id])
                   @project = @watched.project
                 elsif params[:project_id]
-                  @project = Project.visible.find(params[:project_id])
+                  @project = Project.visible.find_by_param(params[:project_id])
                 end
               rescue
                 render_404
               end
               def set_watcher(user, watching)
                 @watched.set_watcher(user, watching)
                 respond_to do |format|
                   format.html { redirect_to_referer_or {render :text => (watching ? 'Watcher added.' : 'Watcher removed.'), :layout => true}}
                   format.js do
                     render(:update) do |page|
                       c = watcher_css(@watched)
                       page.select(".#{c}").each do |item|
                         page.replace_html item, watcher_link(@watched, user)
                       end
                     end
                   end
                 end
               end
             end

app/controllers/wiki_controller.rb +2 0

             # Redmine - project management software
             # Copyright (C) 2006-2011  Jean-Philippe Lang
             #
             # This program is free software; you can redistribute it and/or
             # modify it under the terms of the GNU General Public License
             # as published by the Free Software Foundation; either version 2
             # of the License, or (at your option) any later version.
             #
             # This program is distributed in the hope that it will be useful,
             # but WITHOUT ANY WARRANTY; without even the implied warranty of
             # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
             # GNU General Public License for more details.
             #
             # You should have received a copy of the GNU General Public License
             # along with this program; if not, write to the Free Software
             # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
             require 'diff'
             # The WikiController follows the Rails REST controller pattern but with
             # a few differences
             #
             # * index - shows a list of WikiPages grouped by page or date
             # * new - not used
             # * create - not used
             # * show - will also show the form for creating a new wiki page
             # * edit - used to edit an existing or new page
             # * update - used to save a wiki page update to the database, including new pages
             # * destroy - normal
             #
             # Other member and collection methods are also used
             #
             # TODO: still being worked on
             class WikiController < ApplicationController
               default_search_scope :wiki_pages
               before_filter :find_wiki, :authorize
               before_filter :find_existing_or_new_page, :only => [:show, :edit, :update]
               before_filter :find_existing_page, :only => [:rename, :protect, :history, :diff, :annotate, :add_attachment, :destroy]
               helper :attachments
               include AttachmentsHelper
               helper :watchers
               include Redmine::Export::PDF
               # List of pages, sorted alphabetically and by parent (hierarchy)
               def index
                 load_pages_for_index
                 @pages_by_parent_id = @pages.group_by(&:parent_id)
               end
               # List of page, by last update
               def date_index
                 load_pages_for_index
                 @pages_by_date = @pages.group_by {|p| p.updated_on.to_date}
               end
               # display a page (in editing mode if it doesn't exist)
               def show
                 if @page.new_record?
                   if User.current.allowed_to?(:edit_wiki_pages, @project) && editable?
                     edit
                     render :action => 'edit'
                   else
                     render_404
                   end
                   return
                 end
                 if params[:version] && !User.current.allowed_to?(:view_wiki_edits, @project)
                   # Redirects user to the current version if he's not allowed to view previous versions
                   redirect_to :version => nil
                   return
                 end
                 @content = @page.content_for_version(params[:version])
                 if User.current.allowed_to?(:export_wiki_pages, @project)
                   if params[:format] == 'pdf'
                     send_data(wiki_page_to_pdf(@page, @project), :type => 'application/pdf', :filename => "#{@page.title}.pdf")
                     return
                   elsif params[:format] == 'html'
                     export = render_to_string :action => 'export', :layout => false
                     send_data(export, :type => 'text/html', :filename => "#{@page.title}.html")
                     return
                   elsif params[:format] == 'txt'
                     send_data(@content.text, :type => 'text/plain', :filename => "#{@page.title}.txt")
                     return
                   end
                 end
                 @editable = editable?
                 @sections_editable = @editable && User.current.allowed_to?(:edit_wiki_pages, @page.project) &&
                   @content.current_version? &&
                   Redmine::WikiFormatting.supports_section_edit?
                 render :action => 'show'
               end
               # edit an existing page or a new one
               def edit
                 return render_403 unless editable?
                 if @page.new_record?
                   @page.content = WikiContent.new(:page => @page)
                   if params[:parent].present?
                     @page.parent = @page.wiki.find_page(params[:parent].to_s)
                   end
                 end
                 @content = @page.content_for_version(params[:version])
                 @content.text = initial_page_content(@page) if @content.text.blank?
                 # don't keep previous comment
                 @content.comments = nil
                 # To prevent StaleObjectError exception when reverting to a previous version
                 @content.version = @page.content.version
                 @text = @content.text
                 if params[:section].present? && Redmine::WikiFormatting.supports_section_edit?
                   @section = params[:section].to_i
                   @text, @section_hash = Redmine::WikiFormatting.formatter.new(@text).get_section(@section)
                   render_404 if @text.blank?
                 end
               end
               # Creates a new page or updates an existing one
               def update
                 return render_403 unless editable?
                 @page.content = WikiContent.new(:page => @page) if @page.new_record?
                 @page.safe_attributes = params[:wiki_page]
                 @content = @page.content_for_version(params[:version])
                 @content.text = initial_page_content(@page) if @content.text.blank?
                 # don't keep previous comment
                 @content.comments = nil
                 if !@page.new_record? && params[:content].present? && @content.text == params[:content][:text]
                   attachments = Attachment.attach_files(@page, params[:attachments])
                   render_attachment_warning_if_needed(@page)
                   # don't save content if text wasn't changed
                   @page.save
                   redirect_to :action => 'show', :project_id => @project, :id => @page.title
                   return
                 end
                 @content.comments = params[:content][:comments]
                 @text = params[:content][:text]
                 if params[:section].present? && Redmine::WikiFormatting.supports_section_edit?
                   @section = params[:section].to_i
                   @section_hash = params[:section_hash]
                   @content.text = Redmine::WikiFormatting.formatter.new(@content.text).update_section(params[:section].to_i, @text, @section_hash)
                 else
                   @content.version = params[:content][:version]
                   @content.text = @text
                 end
                 @content.author = User.current
                 @page.content = @content
                 if @page.save
                   attachments = Attachment.attach_files(@page, params[:attachments])
                   render_attachment_warning_if_needed(@page)
                   call_hook(:controller_wiki_edit_after_save, { :params => params, :page => @page})
                   redirect_to :action => 'show', :project_id => @project, :id => @page.title
                 else
                   render :action => 'edit'
                 end
               rescue ActiveRecord::StaleObjectError, Redmine::WikiFormatting::StaleSectionError
                 # Optimistic locking exception
                 flash.now[:error] = l(:notice_locking_conflict)
                 render :action => 'edit'
+              rescue ActiveRecord::RecordNotSaved
+                render :action => 'edit'
               end
               # rename a page
               def rename
                 return render_403 unless editable?
                 @page.redirect_existing_links = true
                 # used to display the *original* title if some AR validation errors occur
                 @original_title = @page.pretty_title
                 if request.post? && @page.update_attributes(params[:wiki_page])
                   flash[:notice] = l(:notice_successful_update)
                   redirect_to :action => 'show', :project_id => @project, :id => @page.title
                 end
               end
               def protect
                 @page.update_attribute :protected, params[:protected]
                 redirect_to :action => 'show', :project_id => @project, :id => @page.title
               end
               # show page history
               def history
                 @version_count = @page.content.versions.count
                 @version_pages = Paginator.new self, @version_count, per_page_option, params['p']
                 # don't load text
                 @versions = @page.content.versions.find :all,
                                                         :select => "id, author_id, comments, updated_on, version",
                                                         :order => 'version DESC',
                                                         :limit  =>  @version_pages.items_per_page + 1,
                                                         :offset =>  @version_pages.current.offset
                 render :layout => false if request.xhr?
               end
               def diff
                 @diff = @page.diff(params[:version], params[:version_from])
                 render_404 unless @diff
               end
               def annotate
                 @annotate = @page.annotate(params[:version])
                 render_404 unless @annotate
               end
               # Removes a wiki page and its history
               # Children can be either set as root pages, removed or reassigned to another parent page
               def destroy
                 return render_403 unless editable?
                 @descendants_count = @page.descendants.size
                 if @descendants_count > 0
                   case params[:todo]
                   when 'nullify'
                     # Nothing to do
                   when 'destroy'
                     # Removes all its descendants
                     @page.descendants.each(&:destroy)
                   when 'reassign'
                     # Reassign children to another parent page
                     reassign_to = @wiki.pages.find_by_id(params[:reassign_to_id].to_i)
                     return unless reassign_to
                     @page.children.each do |child|
                       child.update_attribute(:parent, reassign_to)
                     end
                   else
                     @reassignable_to = @wiki.pages - @page.self_and_descendants
                     return
                   end
                 end
                 @page.destroy
                 redirect_to :action => 'index', :project_id => @project
               end
               # Export wiki to a single pdf or html file
               def export
                 @pages = @wiki.pages.all(:order => 'title', :include => [:content, :attachments], :limit => 75)
                 respond_to do |format|
                   format.html {
                     export = render_to_string :action => 'export_multiple', :layout => false
                     send_data(export, :type => 'text/html', :filename => "wiki.html")
                   }
                   format.pdf {
                     send_data(wiki_pages_to_pdf(@pages, @project), :type => 'application/pdf', :filename => "#{@project.identifier}.pdf")
                   }
                 end
               end
               def preview
                 page = @wiki.find_page(params[:id])
                 # page is nil when previewing a new page
                 return render_403 unless page.nil? || editable?(page)
                 if page
                   @attachements = page.attachments
                   @previewed = page.content
                 end
                 @text = params[:content][:text]
                 render :partial => 'common/preview'
               end
               def add_attachment
                 return render_403 unless editable?
                 attachments = Attachment.attach_files(@page, params[:attachments])
                 render_attachment_warning_if_needed(@page)
                 redirect_to :action => 'show', :id => @page.title, :project_id => @project
               end
             private
               def find_wiki
                 @project = Project.find(params[:project_id])
                 @wiki = @project.wiki
                 render_404 unless @wiki
               rescue ActiveRecord::RecordNotFound
                 render_404
               end
               # Finds the requested page or a new page if it doesn't exist
               def find_existing_or_new_page
                 @page = @wiki.find_or_new_page(params[:id])
                 if @wiki.page_found_with_redirect?
                   redirect_to params.update(:id => @page.title)
                 end
               end
               # Finds the requested page and returns a 404 error if it doesn't exist
               def find_existing_page
                 @page = @wiki.find_page(params[:id])
                 if @page.nil?
                   render_404
                   return
                 end
                 if @wiki.page_found_with_redirect?
                   redirect_to params.update(:id => @page.title)
                 end
               end
               # Returns true if the current user is allowed to edit the page, otherwise false
               def editable?(page = @page)
                 page.editable_by?(User.current)
               end
               # Returns the default content of a new wiki page
               def initial_page_content(page)
                 helper = Redmine::WikiFormatting.helper_for(Setting.text_formatting)
                 extend helper unless self.instance_of?(helper)
                 helper.instance_method(:initial_page_content).bind(self).call(page)
               end
               def load_pages_for_index
                 @pages = @wiki.pages.with_updated_on.all(:order => 'title', :include => {:wiki => :project})
               end
             end

app/helpers/application_helper.rb +5 -2

             # encoding: utf-8
             #
             # Redmine - project management software
             # Copyright (C) 2006-2011  Jean-Philippe Lang
             #
             # This program is free software; you can redistribute it and/or
             # modify it under the terms of the GNU General Public License
             # as published by the Free Software Foundation; either version 2
             # of the License, or (at your option) any later version.
             #
             # This program is distributed in the hope that it will be useful,
             # but WITHOUT ANY WARRANTY; without even the implied warranty of
             # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
             # GNU General Public License for more details.
             #
             # You should have received a copy of the GNU General Public License
             # along with this program; if not, write to the Free Software
             # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
             require 'forwardable'
             require 'cgi'
             module ApplicationHelper
               include Redmine::WikiFormatting::Macros::Definitions
               include Redmine::I18n
               include GravatarHelper::PublicMethods
               extend Forwardable
               def_delegators :wiki_helper, :wikitoolbar_for, :heads_for_wiki_formatter
               # Return true if user is authorized for controller/action, otherwise false
               def authorize_for(controller, action)
                 User.current.allowed_to?({:controller => controller, :action => action}, @project)
               end
               # Display a link if user is authorized
               #
               # @param [String] name Anchor text (passed to link_to)
               # @param [Hash] options Hash params. This will checked by authorize_for to see if the user is authorized
               # @param [optional, Hash] html_options Options passed to link_to
               # @param [optional, Hash] parameters_for_method_reference Extra parameters for link_to
               def link_to_if_authorized(name, options = {}, html_options = nil, *parameters_for_method_reference)
                 link_to(name, options, html_options, *parameters_for_method_reference) if authorize_for(options[:controller] || params[:controller], options[:action])
               end
               # Display a link to remote if user is authorized
               def link_to_remote_if_authorized(name, options = {}, html_options = nil)
                 url = options[:url] || {}
                 link_to_remote(name, options, html_options) if authorize_for(url[:controller] || params[:controller], url[:action])
               end
               # Displays a link to user's account page if active
               def link_to_user(user, options={})
                 if user.is_a?(User)
                   name = h(user.name(options[:format]))
                   if user.active?
                     link_to name, :controller => 'users', :action => 'show', :id => user
                   else
                     name
                   end
                 else
                   h(user.to_s)
                 end
               end
               # Displays a link to +issue+ with its subject.
               # Examples:
               #
               #   link_to_issue(issue)                        # => Defect #6: This is the subject
               #   link_to_issue(issue, :truncate => 6)        # => Defect #6: This i...
               #   link_to_issue(issue, :subject => false)     # => Defect #6
               #   link_to_issue(issue, :project => true)      # => Foo - Defect #6
               #
               def link_to_issue(issue, options={})
                 title = nil
                 subject = nil
                 if options[:subject] == false
                   title = truncate(issue.subject, :length => 60)
                 else
                   subject = issue.subject
                   if options[:truncate]
                     subject = truncate(subject, :length => options[:truncate])
                   end
                 end
                 s = link_to "#{h(issue.tracker)} ##{issue.id}", {:controller => "issues", :action => "show", :id => issue},
                                                              :class => issue.css_classes,
                                                              :title => title
                 s << h(": #{subject}") if subject
                 s = h("#{issue.project} - ") + s if options[:project]
                 s
               end
               # Generates a link to an attachment.
               # Options:
               # * :text - Link text (default to attachment filename)
               # * :download - Force download (default: false)
               def link_to_attachment(attachment, options={})
                 text = options.delete(:text) || attachment.filename
                 action = options.delete(:download) ? 'download' : 'show'
                 opt_only_path = {}
                 opt_only_path[:only_path] = (options[:only_path] == false ? false : true)
                 options.delete(:only_path)
                 link_to(h(text),
                        {:controller => 'attachments', :action => action,
                         :id => attachment, :filename => attachment.filename}.merge(opt_only_path),
                        options)
               end
               # Generates a link to a SCM revision
               # Options:
               # * :text - Link text (default to the formatted revision)
               def link_to_revision(revision, repository, options={})
                 if repository.is_a?(Project)
                   repository = repository.repository
                 end
                 text = options.delete(:text) || format_revision(revision)
                 rev = revision.respond_to?(:identifier) ? revision.identifier : revision
                 link_to(
                     h(text),
                     {:controller => 'repositories', :action => 'revision', :id => repository.project, :repository_id => repository.identifier_param, :rev => rev},
                     :title => l(:label_revision_id, format_revision(revision))
                   )
               end
               # Generates a link to a message
               def link_to_message(message, options={}, html_options = nil)
                 link_to(
                   h(truncate(message.subject, :length => 60)),
                   { :controller => 'messages', :action => 'show',
                     :board_id => message.board_id,
                     :id => message.root,
                     :r => (message.parent_id && message.id),
                     :anchor => (message.parent_id ? "message-#{message.id}" : nil)
                   }.merge(options),
                   html_options
                 )
               end
               # Generates a link to a project if active
               # Examples:
               #
               #   link_to_project(project)                          # => link to the specified project overview
               #   link_to_project(project, :action=>'settings')     # => link to project settings
               #   link_to_project(project, {:only_path => false}, :class => "project") # => 3rd arg adds html options
               #   link_to_project(project, {}, :class => "project") # => html options with default url (project overview)
               #
               def link_to_project(project, options={}, html_options = nil)
                 if project.active?
                   url = {:controller => 'projects', :action => 'show', :id => project}.merge(options)
                   link_to(h(project), url, html_options)
                 else
                   h(project)
                 end
               end
               def toggle_link(name, id, options={})
                 onclick = "Element.toggle('#{id}'); "
                 onclick << (options[:focus] ? "Form.Element.focus('#{options[:focus]}'); " : "this.blur(); ")
                 onclick << "return false;"
                 link_to(name, "#", :onclick => onclick)
               end
               def image_to_function(name, function, html_options = {})
                 html_options.symbolize_keys!
                 tag(:input, html_options.merge({
                     :type => "image", :src => image_path(name),
                     :onclick => (html_options[:onclick] ? "#{html_options[:onclick]}; " : "") + "#{function};"
                     }))
               end
               def prompt_to_remote(name, text, param, url, html_options = {})
                 html_options[:onclick] = "promptToRemote('#{text}', '#{param}', '#{url_for(url)}'); return false;"
                 link_to name, {}, html_options
               end
               def format_activity_title(text)
                 h(truncate_single_line(text, :length => 100))
               end
               def format_activity_day(date)
                 date == Date.today ? l(:label_today).titleize : format_date(date)
               end
               def format_activity_description(text)
                 h(truncate(text.to_s, :length => 120).gsub(%r{[\r\n]*<(pre|code)>.*$}m, '...')
                    ).gsub(/[\r\n]+/, "<br />").html_safe
               end
               def format_version_name(version)
                 if version.project == @project
                 	h(version)
                 else
                   h("#{version.project} - #{version}")
                 end
               end
               def due_date_distance_in_words(date)
                 if date
                   l((date < Date.today ? :label_roadmap_overdue : :label_roadmap_due_in), distance_of_date_in_words(Date.today, date))
                 end
               end
               def render_page_hierarchy(pages, node=nil, options={})
                 content = ''
                 if pages[node]
                   content << "<ul class=\"pages-hierarchy\">\n"
                   pages[node].each do |page|
                     content << "<li>"
                     content << link_to(h(page.pretty_title), {:controller => 'wiki', :action => 'show', :project_id => page.project, :id => page.title},
                                        :title => (options[:timestamp] && page.updated_on ? l(:label_updated_time, distance_of_time_in_words(Time.now, page.updated_on)) : nil))
                     content << "\n" + render_page_hierarchy(pages, page.id, options) if pages[page.id]
                     content << "</li>\n"
                   end
                   content << "</ul>\n"
                 end
                 content.html_safe
               end
               # Renders flash messages
               def render_flash_messages
                 s = ''
                 flash.each do |k,v|
                   s << (content_tag('div', v.html_safe, :class => "flash #{k}"))
                 end
                 s.html_safe
               end
               # Renders tabs and their content
               def render_tabs(tabs)
                 if tabs.any?
                   render :partial => 'common/tabs', :locals => {:tabs => tabs}
                 else
                   content_tag 'p', l(:label_no_data), :class => "nodata"
                 end
               end
               # Renders the project quick-jump box
               def render_project_jump_box
                 return unless User.current.logged?
                 projects = User.current.memberships.collect(&:project).compact.uniq
                 if projects.any?
                   s = '<select onchange="if (this.value != \'\') { window.location = this.value; }">' +
                         "<option value=''>#{ l(:label_jump_to_a_project) }</option>" +
                         '<option value="" disabled="disabled">---</option>'
                   s << project_tree_options_for_select(projects, :selected => @project) do |p|
                     { :value => url_for(:controller => 'projects', :action => 'show', :id => p, :jump => current_menu_item) }
                   end
                   s << '</select>'
                   s.html_safe
                 end
               end
               def project_tree_options_for_select(projects, options = {})
                 s = ''
                 project_tree(projects) do |project, level|
                   name_prefix = (level > 0 ? ('&nbsp;' * 2 * level + '&#187; ').html_safe : '')
                   tag_options = {:value => project.id}
                   if project == options[:selected] || (options[:selected].respond_to?(:include?) && options[:selected].include?(project))
                     tag_options[:selected] = 'selected'
                   else
                     tag_options[:selected] = nil
                   end
                   tag_options.merge!(yield(project)) if block_given?
                   s << content_tag('option', name_prefix + h(project), tag_options)
                 end
                 s.html_safe
               end
               # Yields the given block for each project with its level in the tree
               #
               # Wrapper for Project#project_tree
               def project_tree(projects, &block)
                 Project.project_tree(projects, &block)
               end
               def project_nested_ul(projects, &block)
                 s = ''
                 if projects.any?
                   ancestors = []
                   projects.sort_by(&:lft).each do |project|
                     if (ancestors.empty? || project.is_descendant_of?(ancestors.last))
                       s << "<ul>\n"
                     else
                       ancestors.pop
                       s << "</li>"
                       while (ancestors.any? && !project.is_descendant_of?(ancestors.last))
                         ancestors.pop
                         s << "</ul></li>\n"
                       end
                     end
                     s << "<li>"
                     s << yield(project).to_s
                     ancestors << project
                   end
                   s << ("</li></ul>\n" * ancestors.size)
                 end
                 s.html_safe
               end
               def principals_check_box_tags(name, principals)
                 s = ''
                 principals.sort.each do |principal|
                   s << "<label>#{ check_box_tag name, principal.id, false } #{h principal}</label>\n"
                 end
                 s.html_safe
               end
               # Returns a string for users/groups option tags
               def principals_options_for_select(collection, selected=nil)
                 s = ''
                 if collection.include?(User.current)
                   s << content_tag('option', "<< #{l(:label_me)} >>".html_safe, :value => User.current.id)
                 end
                 groups = ''
                 collection.sort.each do |element|
                   selected_attribute = ' selected="selected"' if option_value_selected?(element, selected)
                   (element.is_a?(Group) ? groups : s) << %(<option value="#{element.id}"#{selected_attribute}>#{h element.name}</option>)
                 end
                 unless groups.empty?
                   s << %(<optgroup label="#{h(l(:label_group_plural))}">#{groups}</optgroup>)
                 end
                 s.html_safe
               end
               # Truncates and returns the string as a single line
               def truncate_single_line(string, *args)
                 truncate(string.to_s, *args).gsub(%r{[\r\n]+}m, ' ')
               end
               # Truncates at line break after 250 characters or options[:length]
               def truncate_lines(string, options={})
                 length = options[:length] || 250
                 if string.to_s =~ /\A(.{#{length}}.*?)$/m
                   "#{$1}..."
                 else
                   string
                 end
               end
               def anchor(text)
                 text.to_s.gsub(' ', '_')
               end
               def html_hours(text)
                 text.gsub(%r{(\d+)\.(\d+)}, '<span class="hours hours-int">\1</span><span class="hours hours-dec">.\2</span>').html_safe
               end
               def authoring(created, author, options={})
                 l(options[:label] || :label_added_time_by, :author => link_to_user(author), :age => time_tag(created)).html_safe
               end
               def time_tag(time)
                 text = distance_of_time_in_words(Time.now, time)
                 if @project
                   link_to(text, {:controller => 'activities', :action => 'index', :id => @project, :from => time.to_date}, :title => format_time(time))
                 else
                   content_tag('acronym', text, :title => format_time(time))
                 end
               end
               def syntax_highlight_lines(name, content)
                 lines = []
                 syntax_highlight(name, content).each_line { |line| lines << line }
                 lines
               end
               def syntax_highlight(name, content)
                 Redmine::SyntaxHighlighting.highlight_by_filename(content, name)
               end
               def to_path_param(path)
                 path.to_s.split(%r{[/\\]}).select {|p| !p.blank?}
               end
               def pagination_links_full(paginator, count=nil, options={})
                 page_param = options.delete(:page_param) || :page
                 per_page_links = options.delete(:per_page_links)
                 url_param = params.dup
                 html = ''
                 if paginator.current.previous
                   # \xc2\xab(utf-8) = &#171;
                   html << link_to_content_update(
                                "\xc2\xab " + l(:label_previous),
                                url_param.merge(page_param => paginator.current.previous)) + ' '
                 end
                 html << (pagination_links_each(paginator, options) do |n|
                   link_to_content_update(n.to_s, url_param.merge(page_param => n))
                 end || '')
                 if paginator.current.next
                   # \xc2\xbb(utf-8) = &#187;
                   html << ' ' + link_to_content_update(
                                   (l(:label_next) + " \xc2\xbb"),
                                   url_param.merge(page_param => paginator.current.next))
                 end
                 unless count.nil?
                   html << " (#{paginator.current.first_item}-#{paginator.current.last_item}/#{count})"
                   if per_page_links != false && links = per_page_links(paginator.items_per_page)
             	      html << " | #{links}"
                   end
                 end
                 html.html_safe
               end
               def per_page_links(selected=nil)
                 links = Setting.per_page_options_array.collect do |n|
                   n == selected ? n : link_to_content_update(n, params.merge(:per_page => n))
                 end
                 links.size > 1 ? l(:label_display_per_page, links.join(', ')) : nil
               end
               def reorder_links(name, url, method = :post)
                 link_to(image_tag('2uparrow.png', :alt => l(:label_sort_highest)),
                         url.merge({"#{name}[move_to]" => 'highest'}),
                         :method => method, :title => l(:label_sort_highest)) +
                 link_to(image_tag('1uparrow.png',   :alt => l(:label_sort_higher)),
                         url.merge({"#{name}[move_to]" => 'higher'}),
                        :method => method, :title => l(:label_sort_higher)) +
                 link_to(image_tag('1downarrow.png', :alt => l(:label_sort_lower)),
                         url.merge({"#{name}[move_to]" => 'lower'}),
                         :method => method, :title => l(:label_sort_lower)) +
                 link_to(image_tag('2downarrow.png', :alt => l(:label_sort_lowest)),
                         url.merge({"#{name}[move_to]" => 'lowest'}),
                        :method => method, :title => l(:label_sort_lowest))
               end
               def breadcrumb(*args)
                 elements = args.flatten
                 elements.any? ? content_tag('p', (args.join(" \xc2\xbb ") + " \xc2\xbb ").html_safe, :class => 'breadcrumb') : nil
               end
               def other_formats_links(&block)
                 concat('<p class="other-formats">'.html_safe + l(:label_export_to))
                 yield Redmine::Views::OtherFormatsBuilder.new(self)
                 concat('</p>'.html_safe)
               end
               def page_header_title
                 if @project.nil? || @project.new_record?
                   h(Setting.app_title)
                 else
                   b = []
                   ancestors = (@project.root? ? [] : @project.ancestors.visible.all)
                   if ancestors.any?
                     root = ancestors.shift
                     b << link_to_project(root, {:jump => current_menu_item}, :class => 'root')
                     if ancestors.size > 2
                       b << "\xe2\x80\xa6"
                       ancestors = ancestors[-2, 2]
                     end
                     b += ancestors.collect {|p| link_to_project(p, {:jump => current_menu_item}, :class => 'ancestor') }
                   end
                   b << h(@project)
                   b.join(" \xc2\xbb ").html_safe
                 end
               end
               def html_title(*args)
                 if args.empty?
                   title = @html_title || []
                   title << @project.name if @project
                   title << Setting.app_title unless Setting.app_title == title.last
                   title.select {|t| !t.blank? }.join(' - ')
                 else
                   @html_title ||= []
                   @html_title += args
                 end
               end
               # Returns the theme, controller name, and action as css classes for the
               # HTML body.
               def body_css_classes
                 css = []
                 if theme = Redmine::Themes.theme(Setting.ui_theme)
                   css << 'theme-' + theme.name
                 end
                 css << 'controller-' + controller_name
                 css << 'action-' + action_name
                 css.join(' ')
               end
               def accesskey(s)
                 Redmine::AccessKeys.key_for s
               end
               # Formats text according to system settings.
               # 2 ways to call this method:
               # * with a String: textilizable(text, options)
               # * with an object and one of its attribute: textilizable(issue, :description, options)
               def textilizable(*args)
                 options = args.last.is_a?(Hash) ? args.pop : {}
                 case args.size
                 when 1
                   obj = options[:object]
                   text = args.shift
                 when 2
                   obj = args.shift
                   attr = args.shift
                   text = obj.send(attr).to_s
                 else
                   raise ArgumentError, 'invalid arguments to textilizable'
                 end
                 return '' if text.blank?
                 project = options[:project] || @project || (obj && obj.respond_to?(:project) ? obj.project : nil)
                 only_path = options.delete(:only_path) == false ? false : true
                 text = Redmine::WikiFormatting.to_html(Setting.text_formatting, text, :object => obj, :attribute => attr)
                 @parsed_headings = []
                 @heading_anchors = {}
                 @current_section = 0 if options[:edit_section_links]
                 parse_sections(text, project, obj, attr, only_path, options)
                 text = parse_non_pre_blocks(text) do |text|
                   [:parse_inline_attachments, :parse_wiki_links, :parse_redmine_links, :parse_macros].each do |method_name|
                     send method_name, text, project, obj, attr, only_path, options
                   end
                 end
                 parse_headings(text, project, obj, attr, only_path, options)
                 if @parsed_headings.any?
                   replace_toc(text, @parsed_headings)
                 end
                 text.html_safe
               end
               def parse_non_pre_blocks(text)
                 s = StringScanner.new(text)
                 tags = []
                 parsed = ''
                 while !s.eos?
                   s.scan(/(.*?)(<(\/)?(pre|code)(.*?)>|\z)/im)
                   text, full_tag, closing, tag = s[1], s[2], s[3], s[4]
                   if tags.empty?
                     yield text
                   end
                   parsed << text
                   if tag
                     if closing
                       if tags.last == tag.downcase
                         tags.pop
                       end
                     else
                       tags << tag.downcase
                     end
                     parsed << full_tag
                   end
                 end
                 # Close any non closing tags
                 while tag = tags.pop
                   parsed << "</#{tag}>"
                 end
                 parsed
               end
               def parse_inline_attachments(text, project, obj, attr, only_path, options)
                 # when using an image link, try to use an attachment, if possible
                 if options[:attachments] || (obj && obj.respond_to?(:attachments))
                   attachments = options[:attachments] || obj.attachments
                   text.gsub!(/src="([^\/"]+\.(bmp|gif|jpg|jpe|jpeg|png))"(\s+alt="([^"]*)")?/i) do |m|
                     filename, ext, alt, alttext = $1.downcase, $2, $3, $4
                     # search for the picture in attachments
                     if found = Attachment.latest_attach(attachments, filename)
                       image_url = url_for :only_path => only_path, :controller => 'attachments',
                                           :action => 'download', :id => found
                       desc = found.description.to_s.gsub('"', '')
                       if !desc.blank? && alttext.blank?
                         alt = " title=\"#{desc}\" alt=\"#{desc}\""
                       end
                       "src=\"#{image_url}\"#{alt}"
                     else
                       m
                     end
                   end
                 end
               end
               # Wiki links
               #
               # Examples:
               #   [[mypage]]
               #   [[mypage|mytext]]
               # wiki links can refer other project wikis, using project name or identifier:
               #   [[project:]] -> wiki starting page
               #   [[project:|mytext]]
               #   [[project:mypage]]
               #   [[project:mypage|mytext]]
               def parse_wiki_links(text, project, obj, attr, only_path, options)
                 text.gsub!(/(!)?(\[\[([^\]\n\|]+)(\|([^\]\n\|]+))?\]\])/) do |m|
                   link_project = project
                   esc, all, page, title = $1, $2, $3, $5
                   if esc.nil?
                     if page =~ /^([^\:]+)\:(.*)$/
                       link_project = Project.find_by_identifier($1) || Project.find_by_name($1)
                       page = $2
                       title ||= $1 if page.blank?
                     end
                     if link_project && link_project.wiki
                       # extract anchor
                       anchor = nil
                       if page =~ /^(.+?)\#(.+)$/
                         page, anchor = $1, $2
                       end
                       anchor = sanitize_anchor_name(anchor) if anchor.present?
                       # check if page exists
                       wiki_page = link_project.wiki.find_page(page)
                       url = if anchor.present? && wiki_page.present? && (obj.is_a?(WikiContent) || obj.is_a?(WikiContent::Version)) && obj.page == wiki_page
                         "##{anchor}"
                       else
                         case options[:wiki_links]
                         when :local; "#{page.present? ? Wiki.titleize(page) : ''}.html" + (anchor.present? ? "##{anchor}" : '')
                         when :anchor; "##{page.present? ? Wiki.titleize(page) : title}" + (anchor.present? ? "_#{anchor}" : '') # used for single-file wiki export
                         else
                           wiki_page_id = page.present? ? Wiki.titleize(page) : nil
                           parent = wiki_page.nil? && obj.is_a?(WikiContent) && obj.page && project == link_project ? obj.page.title : nil
                           url_for(:only_path => only_path, :controller => 'wiki', :action => 'show', :project_id => link_project,
                            :id => wiki_page_id, :anchor => anchor, :parent => parent)
                         end
                       end
                       link_to(title.present? ? title.html_safe : h(page), url, :class => ('wiki-page' + (wiki_page ? '' : ' new')))
                     else
                       # project or wiki doesn't exist
                       all
                     end
                   else
                     all
                   end
                 end
               end
               # Redmine links
               #
               # Examples:
               #   Issues:
               #     #52 -> Link to issue #52
               #   Changesets:
               #     r52 -> Link to revision 52
               #     commit:a85130f -> Link to scmid starting with a85130f
               #   Documents:
               #     document#17 -> Link to document with id 17
               #     document:Greetings -> Link to the document with title "Greetings"
               #     document:"Some document" -> Link to the document with title "Some document"
               #   Versions:
               #     version#3 -> Link to version with id 3
               #     version:1.0.0 -> Link to version named "1.0.0"
               #     version:"1.0 beta 2" -> Link to version named "1.0 beta 2"
               #   Attachments:
               #     attachment:file.zip -> Link to the attachment of the current object named file.zip
               #   Source files:
               #     source:some/file -> Link to the file located at /some/file in the project's repository
               #     source:some/file@52 -> Link to the file's revision 52
               #     source:some/file#L120 -> Link to line 120 of the file
               #     source:some/file@52#L120 -> Link to line 120 of the file's revision 52
               #     export:some/file -> Force the download of the file
               #   Forum messages:
               #     message#1218 -> Link to message with id 1218
               #
               #   Links can refer other objects from other projects, using project identifier:
               #     identifier:r52
               #     identifier:document:"Some document"
               #     identifier:version:1.0.0
               #     identifier:source:some/file
               def parse_redmine_links(text, project, obj, attr, only_path, options)
                 text.gsub!(%r{([\s\(,\-\[\>]|^)(!)?(([a-z0-9\-_]+):)?(attachment|document|version|forum|news|message|project|commit|source|export)?(((#)|((([a-z0-9\-]+)\|)?(r)))((\d+)((#note)?-(\d+))?)|(:)([^"\s<>][^\s<>]*?|"[^"]+?"))(?=(?=[[:punct:]][^A-Za-z0-9_/])|,|\s|\]|<|$)}) do |m|
                   leading, esc, project_prefix, project_identifier, prefix, repo_prefix, repo_identifier, sep, identifier, comment_suffix, comment_id = $1, $2, $3, $4, $5, $10, $11, $8 || $12 || $18, $14 || $19, $15, $17
                   link = nil
                   if project_identifier
                     project = Project.visible.find_by_identifier(project_identifier)
                   end
                   if esc.nil?
                     if prefix.nil? && sep == 'r'
                       if project
                         repository = nil
                         if repo_identifier
                           repository = project.repositories.detect {|repo| repo.identifier == repo_identifier}
                         else
                           repository = project.repository
                         end
                         # project.changesets.visible raises an SQL error because of a double join on repositories
                         if repository && (changeset = Changeset.visible.find_by_repository_id_and_revision(repository.id, identifier))
                           link = link_to(h("#{project_prefix}#{repo_prefix}r#{identifier}"), {:only_path => only_path, :controller => 'repositories', :action => 'revision', :id => project, :repository_id => repository.identifier_param, :rev => changeset.revision},
                                                     :class => 'changeset',
                                                     :title => truncate_single_line(changeset.comments, :length => 100))
                         end
                       end
                     elsif sep == '#'
                       oid = identifier.to_i
                       case prefix
                       when nil
                         if issue = Issue.visible.find_by_id(oid, :include => :status)
                           anchor = comment_id ? "note-#{comment_id}" : nil
                           link = link_to("##{oid}", {:only_path => only_path, :controller => 'issues', :action => 'show', :id => oid, :anchor => anchor},
                                                     :class => issue.css_classes,
                                                     :title => "#{truncate(issue.subject, :length => 100)} (#{issue.status.name})")
                         end
                       when 'document'
                         if document = Document.visible.find_by_id(oid)
                           link = link_to h(document.title), {:only_path => only_path, :controller => 'documents', :action => 'show', :id => document},
                                                             :class => 'document'
                         end
                       when 'version'
                         if version = Version.visible.find_by_id(oid)
                           link = link_to h(version.name), {:only_path => only_path, :controller => 'versions', :action => 'show', :id => version},
                                                           :class => 'version'
                         end
                       when 'message'
                         if message = Message.visible.find_by_id(oid, :include => :parent)
                           link = link_to_message(message, {:only_path => only_path}, :class => 'message')
                         end
                       when 'forum'
                         if board = Board.visible.find_by_id(oid)
                           link = link_to h(board.name), {:only_path => only_path, :controller => 'boards', :action => 'show', :id => board, :project_id => board.project},
                                                          :class => 'board'
                         end
                       when 'news'
                         if news = News.visible.find_by_id(oid)
                           link = link_to h(news.title), {:only_path => only_path, :controller => 'news', :action => 'show', :id => news},
                                                         :class => 'news'
                         end
                       when 'project'
                         if p = Project.visible.find_by_id(oid)
                           link = link_to_project(p, {:only_path => only_path}, :class => 'project')
                         end
                       end
                     elsif sep == ':'
                       # removes the double quotes if any
                       name = identifier.gsub(%r{^"(.*)"$}, "\\1")
                       case prefix
                       when 'document'
                         if project && document = project.documents.visible.find_by_title(name)
                           link = link_to h(document.title), {:only_path => only_path, :controller => 'documents', :action => 'show', :id => document},
                                                             :class => 'document'
                         end
                       when 'version'
                         if project && version = project.versions.visible.find_by_name(name)
                           link = link_to h(version.name), {:only_path => only_path, :controller => 'versions', :action => 'show', :id => version},
                                                           :class => 'version'
                         end
                       when 'forum'
                         if project && board = project.boards.visible.find_by_name(name)
                           link = link_to h(board.name), {:only_path => only_path, :controller => 'boards', :action => 'show', :id => board, :project_id => board.project},
                                                          :class => 'board'
                         end
                       when 'news'
                         if project && news = project.news.visible.find_by_title(name)
                           link = link_to h(news.title), {:only_path => only_path, :controller => 'news', :action => 'show', :id => news},
                                                         :class => 'news'
                         end
                       when 'commit', 'source', 'export'
                         if project
                           repository = nil
                           if name =~ %r{^(([a-z0-9\-]+)\|)(.+)$}
                             repo_prefix, repo_identifier, name = $1, $2, $3
                             repository = project.repositories.detect {|repo| repo.identifier == repo_identifier}
                           else
                             repository = project.repository
                           end
                           if prefix == 'commit'
                             if repository && (changeset = Changeset.visible.find(:first, :conditions => ["repository_id = ? AND scmid LIKE ?", repository.id, "#{name}%"]))
                               link = link_to h("#{project_prefix}#{repo_prefix}#{name}"), {:only_path => only_path, :controller => 'repositories', :action => 'revision', :id => project, :repository_id => repository.identifier_param, :rev => changeset.identifier},
                                                            :class => 'changeset',
                                                            :title => truncate_single_line(h(changeset.comments), :length => 100)
                             end
                           else
                             if repository && User.current.allowed_to?(:browse_repository, project)
                               name =~ %r{^[/\\]*(.*?)(@([0-9a-f]+))?(#(L\d+))?$}
                               path, rev, anchor = $1, $3, $5
                               link = link_to h("#{project_prefix}#{prefix}:#{repo_prefix}#{name}"), {:controller => 'repositories', :action => 'entry', :id => project, :repository_id => repository.identifier_param,
                                                                       :path => to_path_param(path),
                                                                       :rev => rev,
                                                                       :anchor => anchor,
                                                                       :format => (prefix == 'export' ? 'raw' : nil)},
                                                                      :class => (prefix == 'export' ? 'source download' : 'source')
                             end
                           end
                           repo_prefix = nil
                         end
                       when 'attachment'
                         attachments = options[:attachments] || (obj && obj.respond_to?(:attachments) ? obj.attachments : nil)
                         if attachments && attachment = attachments.detect {|a| a.filename == name }
                           link = link_to h(attachment.filename), {:only_path => only_path, :controller => 'attachments', :action => 'download', :id => attachment},
                                                                  :class => 'attachment'
                         end
                       when 'project'
                         if p = Project.visible.find(:first, :conditions => ["identifier = :s OR LOWER(name) = :s", {:s => name.downcase}])
                           link = link_to_project(p, {:only_path => only_path}, :class => 'project')
                         end
                       end
                     end
                   end
                   (leading + (link || "#{project_prefix}#{prefix}#{repo_prefix}#{sep}#{identifier}#{comment_suffix}"))
                 end
               end
               HEADING_RE = /(<h(1|2|3|4)( [^>]+)?>(.+?)<\/h(1|2|3|4)>)/i unless const_defined?(:HEADING_RE)
               def parse_sections(text, project, obj, attr, only_path, options)
                 return unless options[:edit_section_links]
                 text.gsub!(HEADING_RE) do
                   heading = $1
                   @current_section += 1
                   if @current_section > 1
                     content_tag('div',
                       link_to(image_tag('edit.png'), options[:edit_section_links].merge(:section => @current_section)),
                       :class => 'contextual',
                       :title => l(:button_edit_section)) + heading.html_safe
                   else
                     heading
                   end
                 end
               end
               # Headings and TOC
               # Adds ids and links to headings unless options[:headings] is set to false
               def parse_headings(text, project, obj, attr, only_path, options)
                 return if options[:headings] == false
                 text.gsub!(HEADING_RE) do
                   level, attrs, content = $2.to_i, $3, $4
                   item = strip_tags(content).strip
                   anchor = sanitize_anchor_name(item)
                   # used for single-file wiki export
                   anchor = "#{obj.page.title}_#{anchor}" if options[:wiki_links] == :anchor && (obj.is_a?(WikiContent) || obj.is_a?(WikiContent::Version))
                   @heading_anchors[anchor] ||= 0
                   idx = (@heading_anchors[anchor] += 1)
                   if idx > 1
                     anchor = "#{anchor}-#{idx}"
                   end
                   @parsed_headings << [level, anchor, item]
                   "<a name=\"#{anchor}\"></a>\n<h#{level} #{attrs}>#{content}<a href=\"##{anchor}\" class=\"wiki-anchor\">&para;</a></h#{level}>"
                 end
               end
               MACROS_RE = /
                             (!)?                        # escaping
                             (
                             \{\{                        # opening tag
                             ([\w]+)                     # macro name
                             (\(([^\}]*)\))?             # optional arguments
                             \}\}                        # closing tag
                             )
                           /x unless const_defined?(:MACROS_RE)
               # Macros substitution
               def parse_macros(text, project, obj, attr, only_path, options)
                 text.gsub!(MACROS_RE) do
                   esc, all, macro = $1, $2, $3.downcase
                   args = ($5 || '').split(',').each(&:strip)
                   if esc.nil?
                     begin
                       exec_macro(macro, obj, args)
                     rescue => e
                       "<div class=\"flash error\">Error executing the <strong>#{macro}</strong> macro (#{e})</div>"
                     end || all
                   else
                     all
                   end
                 end
               end
               TOC_RE = /<p>\{\{([<>]?)toc\}\}<\/p>/i unless const_defined?(:TOC_RE)
               # Renders the TOC with given headings
               def replace_toc(text, headings)
                 text.gsub!(TOC_RE) do
                   if headings.empty?
                     ''
                   else
                     div_class = 'toc'
                     div_class << ' right' if $1 == '>'
                     div_class << ' left' if $1 == '<'
                     out = "<ul class=\"#{div_class}\"><li>"
                     root = headings.map(&:first).min
                     current = root
                     started = false
                     headings.each do |level, anchor, item|
                       if level > current
                         out << '<ul><li>' * (level - current)
                       elsif level < current
                         out << "</li></ul>\n" * (current - level) + "</li><li>"
                       elsif started
                         out << '</li><li>'
                       end
                       out << "<a href=\"##{anchor}\">#{item}</a>"
                       current = level
                       started = true
                     end
                     out << '</li></ul>' * (current - root)
                     out << '</li></ul>'
                   end
                 end
               end
               # Same as Rails' simple_format helper without using paragraphs
               def simple_format_without_paragraph(text)
                 text.to_s.
                   gsub(/\r\n?/, "\n").                    # \r\n and \r -> \n
                   gsub(/\n\n+/, "<br /><br />").          # 2+ newline  -> 2 br
                   gsub(/([^\n]\n)(?=[^\n])/, '\1<br />'). # 1 newline   -> br
                   html_safe
               end
               def lang_options_for_select(blank=true)
                 (blank ? [["(auto)", ""]] : []) +
                   valid_languages.collect{|lang| [ ll(lang.to_s, :general_lang_name), lang.to_s]}.sort{|x,y| x.last <=> y.last }
               end
               def label_tag_for(name, option_tags = nil, options = {})
                 label_text = l(("field_"+field.to_s.gsub(/\_id$/, "")).to_sym) + (options.delete(:required) ? @template.content_tag("span", " *", :class => "required"): "")
                 content_tag("label", label_text)
               end
               def labelled_tabular_form_for(*args, &proc)
                 ActiveSupport::Deprecation.warn "ApplicationHelper#labelled_tabular_form_for is deprecated and will be removed in Redmine 1.5. Use #labelled_form_for instead."
                 args << {} unless args.last.is_a?(Hash)
                 options = args.last
                 options[:html] ||= {}
                 options[:html][:class] = 'tabular' unless options[:html].has_key?(:class)
                 options.merge!({:builder => Redmine::Views::LabelledFormBuilder})
                 form_for(*args, &proc)
               end
               def labelled_form_for(*args, &proc)
                 args << {} unless args.last.is_a?(Hash)
                 options = args.last
+                if args.first.is_a?(Symbol)
+                  options.merge!(:as => args.shift)
+                end
                 options.merge!({:builder => Redmine::Views::LabelledFormBuilder})
                 form_for(*args, &proc)
               end
               def labelled_fields_for(*args, &proc)
                 args << {} unless args.last.is_a?(Hash)
                 options = args.last
                 options.merge!({:builder => Redmine::Views::LabelledFormBuilder})
                 fields_for(*args, &proc)
               end
               def labelled_remote_form_for(*args, &proc)
                 args << {} unless args.last.is_a?(Hash)
                 options = args.last
                 options.merge!({:builder => Redmine::Views::LabelledFormBuilder})
                 remote_form_for(*args, &proc)
               end
               def error_messages_for(*objects)
                 html = ""
                 objects = objects.map {|o| o.is_a?(String) ? instance_variable_get("@#{o}") : o}.compact
                 errors = objects.map {|o| o.errors.full_messages}.flatten
                 if errors.any?
                   html << "<div id='errorExplanation'><ul>\n"
                   errors.each do |error|
                     html << "<li>#{h error}</li>\n"
                   end
                   html << "</ul></div>\n"
                 end
                 html.html_safe
               end
               def back_url_hidden_field_tag
                 back_url = params[:back_url] || request.env['HTTP_REFERER']
                 back_url = CGI.unescape(back_url.to_s)
                 hidden_field_tag('back_url', CGI.escape(back_url), :id => nil) unless back_url.blank?
               end
               def check_all_links(form_name)
                 link_to_function(l(:button_check_all), "checkAll('#{form_name}', true)") +
                 " | ".html_safe +
                 link_to_function(l(:button_uncheck_all), "checkAll('#{form_name}', false)")
               end
               def progress_bar(pcts, options={})
                 pcts = [pcts, pcts] unless pcts.is_a?(Array)
                 pcts = pcts.collect(&:round)
                 pcts[1] = pcts[1] - pcts[0]
                 pcts << (100 - pcts[1] - pcts[0])
                 width = options[:width] || '100px;'
                 legend = options[:legend] || ''
                 content_tag('table',
                   content_tag('tr',
                     (pcts[0] > 0 ? content_tag('td', '', :style => "width: #{pcts[0]}%;", :class => 'closed') : ''.html_safe) +
                     (pcts[1] > 0 ? content_tag('td', '', :style => "width: #{pcts[1]}%;", :class => 'done') : ''.html_safe) +
                     (pcts[2] > 0 ? content_tag('td', '', :style => "width: #{pcts[2]}%;", :class => 'todo') : ''.html_safe)
                   ), :class => 'progress', :style => "width: #{width};").html_safe +
                   content_tag('p', legend, :class => 'pourcent').html_safe
               end
               def checked_image(checked=true)
                 if checked
                   image_tag 'toggle_check.png'
                 end
               end
               def context_menu(url)
                 unless @context_menu_included
                   content_for :header_tags do
                     javascript_include_tag('context_menu') +
                       stylesheet_link_tag('context_menu')
                   end
                   if l(:direction) == 'rtl'
                     content_for :header_tags do
                       stylesheet_link_tag('context_menu_rtl')
                     end
                   end
                   @context_menu_included = true
                 end
                 javascript_tag "new ContextMenu('#{ url_for(url) }')"
               end
               def calendar_for(field_id)
                 include_calendar_headers_tags
                 image_tag("calendar.png", {:id => "#{field_id}_trigger",:class => "calendar-trigger"}) +
                 javascript_tag("Calendar.setup({inputField : '#{field_id}', ifFormat : '%Y-%m-%d', button : '#{field_id}_trigger' });")
               end
               def include_calendar_headers_tags
                 unless @calendar_headers_tags_included
                   @calendar_headers_tags_included = true
                   content_for :header_tags do
                     start_of_week = case Setting.start_of_week.to_i
                     when 1
                       'Calendar._FD = 1;' # Monday
                     when 7
                       'Calendar._FD = 0;' # Sunday
                     when 6
                       'Calendar._FD = 6;' # Saturday
                     else
                       '' # use language
                     end
                     javascript_include_tag('calendar/calendar') +
                     javascript_include_tag("calendar/lang/calendar-#{current_language.to_s.downcase}.js") +
                     javascript_tag(start_of_week) +
                     javascript_include_tag('calendar/calendar-setup') +
                     stylesheet_link_tag('calendar')
                   end
                 end
               end
               def content_for(name, content = nil, &block)
                 @has_content ||= {}
                 @has_content[name] = true
                 super(name, content, &block)
               end
               def has_content?(name)
                 (@has_content && @has_content[name]) || false
               end
               def email_delivery_enabled?
                 !!ActionMailer::Base.perform_deliveries
               end
               # Returns the avatar image tag for the given +user+ if avatars are enabled
               # +user+ can be a User or a string that will be scanned for an email address (eg. 'joe <joe@foo.bar>')
               def avatar(user, options = { })
                 if Setting.gravatar_enabled?
-                  options.merge!({:ssl => (defined?(request) && request.ssl?), :default => Setting.gravatar_default})
+                  options.merge!({:ssl => (request && request.ssl?), :default => Setting.gravatar_default})
                   email = nil
                   if user.respond_to?(:mail)
                     email = user.mail
                   elsif user.to_s =~ %r{<(.+?)>}
                     email = $1
                   end
                   return gravatar(email.to_s.downcase, options) unless email.blank? rescue nil
                 else
                   ''
                 end
               end
               def sanitize_anchor_name(anchor)
                 anchor.gsub(%r{[^\w\s\-]}, '').gsub(%r{\s+(\-+\s*)?}, '-')
               end
               # Returns the javascript tags that are included in the html layout head
               def javascript_heads
-                tags = javascript_include_tag(:defaults)
+                tags = javascript_include_tag('prototype', 'effects', 'dragdrop', 'controls', 'rails', 'application')
                 unless User.current.pref.warn_on_leaving_unsaved == '0'
                   tags << "\n".html_safe + javascript_tag("Event.observe(window, 'load', function(){ new WarnLeavingUnsaved('#{escape_javascript( l(:text_warn_on_leaving_unsaved) )}'); });")
                 end
                 tags
               end
               def favicon
                 "<link rel='shortcut icon' href='#{image_path('/favicon.ico')}' />".html_safe
               end
               def robot_exclusion_tag
                 '<meta name="robots" content="noindex,follow,noarchive" />'.html_safe
               end
               # Returns true if arg is expected in the API response
               def include_in_api_response?(arg)
                 unless @included_in_api_response
                   param = params[:include]
                   @included_in_api_response = param.is_a?(Array) ? param.collect(&:to_s) : param.to_s.split(',')
                   @included_in_api_response.collect!(&:strip)
                 end
                 @included_in_api_response.include?(arg.to_s)
               end
               # Returns options or nil if nometa param or X-Redmine-Nometa header
               # was set in the request
               def api_meta(options)
                 if params[:nometa].present? || request.headers['X-Redmine-Nometa']
                   # compatibility mode for activeresource clients that raise
                   # an error when unserializing an array with attributes
                   nil
                 else
                   options
                 end
               end
               private
               def wiki_helper
                 helper = Redmine::WikiFormatting.helper_for(Setting.text_formatting)
                 extend helper
                 return self
               end
               def link_to_content_update(text, url_params = {}, html_options = {})
                 link_to(text, url_params, html_options)
               end
             end

app/helpers/wiki_helper.rb +3 -3

             # encoding: utf-8
             #
             # Redmine - project management software
             # Copyright (C) 2006-2011  Jean-Philippe Lang
             #
             # This program is free software; you can redistribute it and/or
             # modify it under the terms of the GNU General Public License
             # as published by the Free Software Foundation; either version 2
             # of the License, or (at your option) any later version.
             #
             # This program is distributed in the hope that it will be useful,
             # but WITHOUT ANY WARRANTY; without even the implied warranty of
             # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
             # GNU General Public License for more details.
             #
             # You should have received a copy of the GNU General Public License
             # along with this program; if not, write to the Free Software
             # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
             module WikiHelper
               def wiki_page_options_for_select(pages, selected = nil, parent = nil, level = 0)
                 pages = pages.group_by(&:parent) unless pages.is_a?(Hash)
-                s = ''
+                s = ''.html_safe
                 if pages.has_key?(parent)
                   pages[parent].each do |page|
                     attrs = "value='#{page.id}'"
                     attrs << " selected='selected'" if selected == page
-                    indent = (level > 0) ? ('&nbsp;' * level * 2 + '&#187; ') : nil
+                    indent = (level > 0) ? ('&nbsp;' * level * 2 + '&#187; ') : ''
-                    s << "<option #{attrs}>#{indent}#{h page.pretty_title}</option>\n" +
+                    s << content_tag('option', (indent + h(page.pretty_title)).html_safe, :value => page.id.to_s, :selected => selected == page) +
                            wiki_page_options_for_select(pages, selected, page, level + 1)
                   end
                 end
                 s
               end
               def wiki_page_breadcrumb(page)
                 breadcrumb(page.ancestors.reverse.collect {|parent|
                   link_to(h(parent.pretty_title), {:controller => 'wiki', :action => 'show', :id => parent.title, :project_id => parent.project})
                 })
               end
             end

app/models/custom_field.rb +9 -13

             # Redmine - project management software
             # Copyright (C) 2006-2012  Jean-Philippe Lang
             #
             # This program is free software; you can redistribute it and/or
             # modify it under the terms of the GNU General Public License
             # as published by the Free Software Foundation; either version 2
             # of the License, or (at your option) any later version.
             #
             # This program is distributed in the hope that it will be useful,
             # but WITHOUT ANY WARRANTY; without even the implied warranty of
             # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
             # GNU General Public License for more details.
             #
             # You should have received a copy of the GNU General Public License
             # along with this program; if not, write to the Free Software
             # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
             class CustomField < ActiveRecord::Base
               include Redmine::SubclassFactory
               has_many :custom_values, :dependent => :delete_all
               acts_as_list :scope => 'type = \'#{self.class}\''
               serialize :possible_values
               validates_presence_of :name, :field_format
               validates_uniqueness_of :name, :scope => :type
               validates_length_of :name, :maximum => 30
               validates_inclusion_of :field_format, :in => Redmine::CustomFieldFormat.available_formats
               validate :validate_custom_field
               before_validation :set_searchable
               def initialize(attributes=nil, *args)
                 super
                 self.possible_values ||= []
               end
               def set_searchable
                 # make sure these fields are not searchable
                 self.searchable = false if %w(int float date bool).include?(field_format)
                 # make sure only these fields can have multiple values
                 self.multiple = false unless %w(list user version).include?(field_format)
                 true
               end
               def validate_custom_field
                 if self.field_format == "list"
                   errors.add(:possible_values, :blank) if self.possible_values.nil? || self.possible_values.empty?
                   errors.add(:possible_values, :invalid) unless self.possible_values.is_a? Array
                 end
                 if regexp.present?
                   begin
                     Regexp.new(regexp)
                   rescue
                     errors.add(:regexp, :invalid)
                   end
                 end
                 if default_value.present? && !valid_field_value?(default_value)
                   errors.add(:default_value, :invalid)
                 end
               end
               def possible_values_options(obj=nil)
                 case field_format
                 when 'user', 'version'
                   if obj.respond_to?(:project) && obj.project
                     case field_format
                     when 'user'
                       obj.project.users.sort.collect {|u| [u.to_s, u.id.to_s]}
                     when 'version'
                       obj.project.shared_versions.sort.collect {|u| [u.to_s, u.id.to_s]}
                     end
                   elsif obj.is_a?(Array)
                     obj.collect {|o| possible_values_options(o)}.reduce(:&)
                   else
                     []
                   end
                 when 'bool'
                   [[l(:general_text_Yes), '1'], [l(:general_text_No), '0']]
                 else
-                  read_possible_values_utf8_encoded || []
+                  possible_values || []
                 end
               end
               def possible_values(obj=nil)
                 case field_format
                 when 'user', 'version'
                   possible_values_options(obj).collect(&:last)
                 when 'bool'
                   ['1', '0']
                 else
-                  read_possible_values_utf8_encoded
+                  values = super()
+                  if values.is_a?(Array)
+                    values.each do |value|
+                      value.force_encoding('UTF-8') if value.respond_to?(:force_encoding)
+                    end
+                  end
+                  values
                 end
               end
               # Makes possible_values accept a multiline string
               def possible_values=(arg)
                 if arg.is_a?(Array)
-                  write_attribute(:possible_values, arg.compact.collect(&:strip).select {|v| !v.blank?})
+                  super(arg.compact.collect(&:strip).select {|v| !v.blank?})
                 else
                   self.possible_values = arg.to_s.split(/[\n\r]+/)
                 end
               end
               def cast_value(value)
                 casted = nil
                 unless value.blank?
                   case field_format
                   when 'string', 'text', 'list'
                     casted = value
                   when 'date'
                     casted = begin; value.to_date; rescue; nil end
                   when 'bool'
                     casted = (value == '1' ? true : false)
                   when 'int'
                     casted = value.to_i
                   when 'float'
                     casted = value.to_f
                   when 'user', 'version'
                     casted = (value.blank? ? nil : field_format.classify.constantize.find_by_id(value.to_i))
                   end
                 end
                 casted
               end
               # Returns a ORDER BY clause that can used to sort customized
               # objects by their value of the custom field.
               # Returns false, if the custom field can not be used for sorting.
               def order_statement
                 return nil if multiple?
                 case field_format
                   when 'string', 'text', 'list', 'date', 'bool'
                     # COALESCE is here to make sure that blank and NULL values are sorted equally
                     "COALESCE((SELECT cv_sort.value FROM #{CustomValue.table_name} cv_sort" +
                       " WHERE cv_sort.customized_type='#{self.class.customized_class.name}'" +
                       " AND cv_sort.customized_id=#{self.class.customized_class.table_name}.id" +
                       " AND cv_sort.custom_field_id=#{id} LIMIT 1), '')"
                   when 'int', 'float'
                     # Make the database cast values into numeric
                     # Postgresql will raise an error if a value can not be casted!
                     # CustomValue validations should ensure that it doesn't occur
                     "(SELECT CAST(cv_sort.value AS decimal(60,3)) FROM #{CustomValue.table_name} cv_sort" +
                       " WHERE cv_sort.customized_type='#{self.class.customized_class.name}'" +
                       " AND cv_sort.customized_id=#{self.class.customized_class.table_name}.id" +
                       " AND cv_sort.custom_field_id=#{id} AND cv_sort.value <> '' AND cv_sort.value IS NOT NULL LIMIT 1)"
                   else
                     nil
                 end
               end
               def <=>(field)
                 position <=> field.position
               end
               def self.customized_class
                 self.name =~ /^(.+)CustomField$/
                 begin; $1.constantize; rescue nil; end
               end
               # to move in project_custom_field
               def self.for_all
                 find(:all, :conditions => ["is_for_all=?", true], :order => 'position')
               end
               def type_name
                 nil
               end
               # Returns the error messages for the given value
               # or an empty array if value is a valid value for the custom field
               def validate_field_value(value)
                 errs = []
                 if value.is_a?(Array)
                   if !multiple?
                     errs << ::I18n.t('activerecord.errors.messages.invalid')
                   end
                   if is_required? && value.detect(&:present?).nil?
                     errs << ::I18n.t('activerecord.errors.messages.blank')
                   end
                   value.each {|v| errs += validate_field_value_format(v)}
                 else
                   if is_required? && value.blank?
                     errs << ::I18n.t('activerecord.errors.messages.blank')
                   end
                   errs += validate_field_value_format(value)
                 end
                 errs
               end
               # Returns true if value is a valid value for the custom field
               def valid_field_value?(value)
                 validate_field_value(value).empty?
               end
               protected
               # Returns the error message for the given value regarding its format
               def validate_field_value_format(value)
                 errs = []
                 if value.present?
                   errs << ::I18n.t('activerecord.errors.messages.invalid') unless regexp.blank? or value =~ Regexp.new(regexp)
                   errs << ::I18n.t('activerecord.errors.messages.too_short', :count => min_length) if min_length > 0 and value.length < min_length
                   errs << ::I18n.t('activerecord.errors.messages.too_long', :count => max_length) if max_length > 0 and value.length > max_length
                   # Format specific validations
                   case field_format
                   when 'int'
                     errs << ::I18n.t('activerecord.errors.messages.not_a_number') unless value =~ /^[+-]?\d+$/
                   when 'float'
                     begin; Kernel.Float(value); rescue; errs << ::I18n.t('activerecord.errors.messages.invalid') end
                   when 'date'
                     errs << ::I18n.t('activerecord.errors.messages.not_a_date') unless value =~ /^\d{4}-\d{2}-\d{2}$/ && begin; value.to_date; rescue; false end
                   when 'list'
                     errs << ::I18n.t('activerecord.errors.messages.inclusion') unless possible_values.include?(value)
                   end
                 end
                 errs
               end
-              def read_possible_values_utf8_encoded
-                values = read_attribute(:possible_values)
-                if values.is_a?(Array)
-                  values.each do |value|
-                    value.force_encoding('UTF-8') if value.respond_to?(:force_encoding)
-                  end
-                end
-                values
-              end
             end

app/models/issue.rb +6 -6

             # Redmine - project management software
             # Copyright (C) 2006-2011  Jean-Philippe Lang
             #
             # This program is free software; you can redistribute it and/or
             # modify it under the terms of the GNU General Public License
             # as published by the Free Software Foundation; either version 2
             # of the License, or (at your option) any later version.
             #
             # This program is distributed in the hope that it will be useful,
             # but WITHOUT ANY WARRANTY; without even the implied warranty of
             # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
             # GNU General Public License for more details.
             #
             # You should have received a copy of the GNU General Public License
             # along with this program; if not, write to the Free Software
             # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
             class Issue < ActiveRecord::Base
               include Redmine::SafeAttributes
               belongs_to :project
               belongs_to :tracker
               belongs_to :status, :class_name => 'IssueStatus', :foreign_key => 'status_id'
               belongs_to :author, :class_name => 'User', :foreign_key => 'author_id'
               belongs_to :assigned_to, :class_name => 'Principal', :foreign_key => 'assigned_to_id'
               belongs_to :fixed_version, :class_name => 'Version', :foreign_key => 'fixed_version_id'
               belongs_to :priority, :class_name => 'IssuePriority', :foreign_key => 'priority_id'
               belongs_to :category, :class_name => 'IssueCategory', :foreign_key => 'category_id'
               has_many :journals, :as => :journalized, :dependent => :destroy
               has_many :time_entries, :dependent => :delete_all
               has_and_belongs_to_many :changesets, :order => "#{Changeset.table_name}.committed_on ASC, #{Changeset.table_name}.id ASC"
               has_many :relations_from, :class_name => 'IssueRelation', :foreign_key => 'issue_from_id', :dependent => :delete_all
               has_many :relations_to, :class_name => 'IssueRelation', :foreign_key => 'issue_to_id', :dependent => :delete_all
               acts_as_nested_set :scope => 'root_id', :dependent => :destroy
               acts_as_attachable :after_add => :attachment_added, :after_remove => :attachment_removed
               acts_as_customizable
               acts_as_watchable
               acts_as_searchable :columns => ['subject', "#{table_name}.description", "#{Journal.table_name}.notes"],
                                  :include => [:project, :journals],
                                  # sort by id so that limited eager loading doesn't break with postgresql
                                  :order_column => "#{table_name}.id"
               acts_as_event :title => Proc.new {|o| "#{o.tracker.name} ##{o.id} (#{o.status}): #{o.subject}"},
                             :url => Proc.new {|o| {:controller => 'issues', :action => 'show', :id => o.id}},
                             :type => Proc.new {|o| 'issue' + (o.closed? ? ' closed' : '') }
               acts_as_activity_provider :find_options => {:include => [:project, :author, :tracker]},
                                         :author_key => :author_id
               DONE_RATIO_OPTIONS = %w(issue_field issue_status)
               attr_reader :current_journal
               validates_presence_of :subject, :priority, :project, :tracker, :author, :status
               validates_length_of :subject, :maximum => 255
               validates_inclusion_of :done_ratio, :in => 0..100
               validates_numericality_of :estimated_hours, :allow_nil => true
               validate :validate_issue
               named_scope :visible, lambda {|*args| { :include => :project,
                                                       :conditions => Issue.visible_condition(args.shift || User.current, *args) } }
               named_scope :open, lambda {|*args|
                 is_closed = args.size > 0 ? !args.first : false
                 {:conditions => ["#{IssueStatus.table_name}.is_closed = ?", is_closed], :include => :status}
               }
               named_scope :recently_updated, :order => "#{Issue.table_name}.updated_on DESC"
               named_scope :with_limit, lambda { |limit| { :limit => limit} }
               named_scope :on_active_project, :include => [:status, :project, :tracker],
                                               :conditions => ["#{Project.table_name}.status=#{Project::STATUS_ACTIVE}"]
               before_create :default_assign
               before_save :close_duplicates, :update_done_ratio_from_issue_status
               after_save {|issue| issue.send :after_project_change if !issue.id_changed? && issue.project_id_changed?}
               after_save :reschedule_following_issues, :update_nested_set_attributes, :update_parent_attributes, :create_journal
               after_destroy :update_parent_attributes
               # Returns a SQL conditions string used to find all issues visible by the specified user
               def self.visible_condition(user, options={})
                 Project.allowed_to_condition(user, :view_issues, options) do |role, user|
                   case role.issues_visibility
                   when 'all'
                     nil
                   when 'default'
                     user_ids = [user.id] + user.groups.map(&:id)
                     "(#{table_name}.is_private = #{connection.quoted_false} OR #{table_name}.author_id = #{user.id} OR #{table_name}.assigned_to_id IN (#{user_ids.join(',')}))"
                   when 'own'
                     user_ids = [user.id] + user.groups.map(&:id)
                     "(#{table_name}.author_id = #{user.id} OR #{table_name}.assigned_to_id IN (#{user_ids.join(',')}))"
                   else
                     '1=0'
                   end
                 end
               end
               # Returns true if usr or current user is allowed to view the issue
               def visible?(usr=nil)
                 (usr || User.current).allowed_to?(:view_issues, self.project) do |role, user|
                   case role.issues_visibility
                   when 'all'
                     true
                   when 'default'
                     !self.is_private? || self.author == user || user.is_or_belongs_to?(assigned_to)
                   when 'own'
                     self.author == user || user.is_or_belongs_to?(assigned_to)
                   else
                     false
                   end
                 end
               end
               def initialize(attributes=nil, *args)
                 super
                 if new_record?
                   # set default values for new records only
                   self.status ||= IssueStatus.default
                   self.priority ||= IssuePriority.default
                   self.watcher_user_ids = []
                 end
               end
               # Overrides Redmine::Acts::Customizable::InstanceMethods#available_custom_fields
               def available_custom_fields
                 (project && tracker) ? (project.all_issue_custom_fields & tracker.custom_fields.all) : []
               end
               # Copies attributes from another issue, arg can be an id or an Issue
               def copy_from(arg, options={})
                 issue = arg.is_a?(Issue) ? arg : Issue.visible.find(arg)
                 self.attributes = issue.attributes.dup.except("id", "root_id", "parent_id", "lft", "rgt", "created_on", "updated_on")
                 self.custom_field_values = issue.custom_field_values.inject({}) {|h,v| h[v.custom_field_id] = v.value; h}
                 self.status = issue.status
                 self.author = User.current
                 unless options[:attachments] == false
                   self.attachments = issue.attachments.map do |attachement|
                     attachement.copy(:container => self)
                   end
                 end
                 @copied_from = issue
                 self
               end
               # Returns an unsaved copy of the issue
               def copy(attributes=nil, copy_options={})
                 copy = self.class.new.copy_from(self, copy_options)
                 copy.attributes = attributes if attributes
                 copy
               end
               # Returns true if the issue is a copy
               def copy?
                 @copied_from.present?
               end
               # Moves/copies an issue to a new project and tracker
               # Returns the moved/copied issue on success, false on failure
               def move_to_project(new_project, new_tracker=nil, options={})
                 ActiveSupport::Deprecation.warn "Issue#move_to_project is deprecated, use #project= instead."
                 if options[:copy]
                   issue = self.copy
                 else
                   issue = self
                 end
                 issue.init_journal(User.current, options[:notes])
                 # Preserve previous behaviour
                 # #move_to_project doesn't change tracker automatically
                 issue.send :project=, new_project, true
                 if new_tracker
                   issue.tracker = new_tracker
                 end
                 # Allow bulk setting of attributes on the issue
                 if options[:attributes]
                   issue.attributes = options[:attributes]
                 end
                 issue.save ? issue : false
               end
               def status_id=(sid)
                 self.status = nil
                 write_attribute(:status_id, sid)
               end
               def priority_id=(pid)
                 self.priority = nil
                 write_attribute(:priority_id, pid)
               end
               def category_id=(cid)
                 self.category = nil
                 write_attribute(:category_id, cid)
               end
               def fixed_version_id=(vid)
                 self.fixed_version = nil
                 write_attribute(:fixed_version_id, vid)
               end
               def tracker_id=(tid)
                 self.tracker = nil
                 result = write_attribute(:tracker_id, tid)
                 @custom_field_values = nil
                 result
               end
               def project_id=(project_id)
                 if project_id.to_s != self.project_id.to_s
                   self.project = (project_id.present? ? Project.find_by_id(project_id) : nil)
                 end
               end
               def project=(project, keep_tracker=false)
                 project_was = self.project
                 write_attribute(:project_id, project ? project.id : nil)
                 association_instance_set('project', project)
                 if project_was && project && project_was != project
                   unless keep_tracker || project.trackers.include?(tracker)
                     self.tracker = project.trackers.first
                   end
                   # Reassign to the category with same name if any
                   if category
                     self.category = project.issue_categories.find_by_name(category.name)
                   end
                   # Keep the fixed_version if it's still valid in the new_project
                   if fixed_version && fixed_version.project != project && !project.shared_versions.include?(fixed_version)
                     self.fixed_version = nil
                   end
                   if parent && parent.project_id != project_id
                     self.parent_issue_id = nil
                   end
                   @custom_field_values = nil
                 end
               end
               def description=(arg)
                 if arg.is_a?(String)
                   arg = arg.gsub(/(\r\n|\n|\r)/, "\r\n")
                 end
                 write_attribute(:description, arg)
               end
-              # Overrides attributes= so that project and tracker get assigned first
+              # Overrides assign_attributes so that project and tracker get assigned first
-              def attributes_with_project_and_tracker_first=(new_attributes, *args)
+              def assign_attributes_with_project_and_tracker_first(new_attributes, *args)
                 return if new_attributes.nil?
                 attrs = new_attributes.dup
                 attrs.stringify_keys!
                 %w(project project_id tracker tracker_id).each do |attr|
                   if attrs.has_key?(attr)
                     send "#{attr}=", attrs.delete(attr)
                   end
                 end
-                send :attributes_without_project_and_tracker_first=, attrs, *args
+                send :assign_attributes_without_project_and_tracker_first, attrs, *args
               end
               # Do not redefine alias chain on reload (see #4838)
-              alias_method_chain(:attributes=, :project_and_tracker_first) unless method_defined?(:attributes_without_project_and_tracker_first=)
+              alias_method_chain(:assign_attributes, :project_and_tracker_first) unless method_defined?(:assign_attributes_without_project_and_tracker_first)
               def estimated_hours=(h)
                 write_attribute :estimated_hours, (h.is_a?(String) ? h.to_hours : h)
               end
               safe_attributes 'project_id',
                 :if => lambda {|issue, user|
                   if issue.new_record?
                     issue.copy?
                   elsif user.allowed_to?(:move_issues, issue.project)
                     projects = Issue.allowed_target_projects_on_move(user)
                     projects.include?(issue.project) && projects.size > 1
                   end
                 }
               safe_attributes 'tracker_id',
                 'status_id',
                 'category_id',
                 'assigned_to_id',
                 'priority_id',
                 'fixed_version_id',
                 'subject',
                 'description',
                 'start_date',
                 'due_date',
                 'done_ratio',
                 'estimated_hours',
                 'custom_field_values',
                 'custom_fields',
                 'lock_version',
                 :if => lambda {|issue, user| issue.new_record? || user.allowed_to?(:edit_issues, issue.project) }
               safe_attributes 'status_id',
                 'assigned_to_id',
                 'fixed_version_id',
                 'done_ratio',
                 'lock_version',
                 :if => lambda {|issue, user| issue.new_statuses_allowed_to(user).any? }
               safe_attributes 'watcher_user_ids',
                 :if => lambda {|issue, user| issue.new_record? && user.allowed_to?(:add_issue_watchers, issue.project)}
               safe_attributes 'is_private',
                 :if => lambda {|issue, user|
                   user.allowed_to?(:set_issues_private, issue.project) ||
                     (issue.author == user && user.allowed_to?(:set_own_issues_private, issue.project))
                 }
               safe_attributes 'parent_issue_id',
                 :if => lambda {|issue, user| (issue.new_record? || user.allowed_to?(:edit_issues, issue.project)) &&
                   user.allowed_to?(:manage_subtasks, issue.project)}
               # Safely sets attributes
               # Should be called from controllers instead of #attributes=
               # attr_accessible is too rough because we still want things like
               # Issue.new(:project => foo) to work
               def safe_attributes=(attrs, user=User.current)
                 return unless attrs.is_a?(Hash)
                 # User can change issue attributes only if he has :edit permission or if a workflow transition is allowed
                 attrs = delete_unsafe_attributes(attrs, user)
                 return if attrs.empty?
                 # Project and Tracker must be set before since new_statuses_allowed_to depends on it.
                 if p = attrs.delete('project_id')
                   if allowed_target_projects(user).collect(&:id).include?(p.to_i)
                     self.project_id = p
                   end
                 end
                 if t = attrs.delete('tracker_id')
                   self.tracker_id = t
                 end
                 if attrs['status_id']
                   unless new_statuses_allowed_to(user).collect(&:id).include?(attrs['status_id'].to_i)
                     attrs.delete('status_id')
                   end
                 end
                 unless leaf?
                   attrs.reject! {|k,v| %w(priority_id done_ratio start_date due_date estimated_hours).include?(k)}
                 end
                 if attrs['parent_issue_id'].present?
                   attrs.delete('parent_issue_id') unless Issue.visible(user).exists?(attrs['parent_issue_id'].to_i)
                 end
                 # mass-assignment security bypass
-                self.send :attributes=, attrs, false
+                assign_attributes attrs, :without_protection => true
               end
               def done_ratio
                 if Issue.use_status_for_done_ratio? && status && status.default_done_ratio
                   status.default_done_ratio
                 else
                   read_attribute(:done_ratio)
                 end
               end
               def self.use_status_for_done_ratio?
                 Setting.issue_done_ratio == 'issue_status'
               end
               def self.use_field_for_done_ratio?
                 Setting.issue_done_ratio == 'issue_field'
               end
               def validate_issue
                 if self.due_date.nil? && @attributes['due_date'] && !@attributes['due_date'].empty?
                   errors.add :due_date, :not_a_date
                 end
                 if self.due_date and self.start_date and self.due_date < self.start_date
                   errors.add :due_date, :greater_than_start_date
                 end
                 if start_date && soonest_start && start_date < soonest_start
                   errors.add :start_date, :invalid
                 end
                 if fixed_version
                   if !assignable_versions.include?(fixed_version)
                     errors.add :fixed_version_id, :inclusion
                   elsif reopened? && fixed_version.closed?
                     errors.add :base, I18n.t(:error_can_not_reopen_issue_on_closed_version)
                   end
                 end
                 # Checks that the issue can not be added/moved to a disabled tracker
                 if project && (tracker_id_changed? || project_id_changed?)
                   unless project.trackers.include?(tracker)
                     errors.add :tracker_id, :inclusion
                   end
                 end
                 # Checks parent issue assignment
                 if @parent_issue
                   if @parent_issue.project_id != project_id
                     errors.add :parent_issue_id, :not_same_project
                   elsif !new_record?
                     # moving an existing issue
                     if @parent_issue.root_id != root_id
                       # we can always move to another tree
                     elsif move_possible?(@parent_issue)
                       # move accepted inside tree
                     else
                       errors.add :parent_issue_id, :not_a_valid_parent
                     end
                   end
                 end
               end
               # Set the done_ratio using the status if that setting is set.  This will keep the done_ratios
               # even if the user turns off the setting later
               def update_done_ratio_from_issue_status
                 if Issue.use_status_for_done_ratio? && status && status.default_done_ratio
                   self.done_ratio = status.default_done_ratio
                 end
               end
               def init_journal(user, notes = "")
                 @current_journal ||= Journal.new(:journalized => self, :user => user, :notes => notes)
                 if new_record?
                   @current_journal.notify = false
                 else
                   @attributes_before_change = attributes.dup
                   @custom_values_before_change = {}
                   self.custom_field_values.each {|c| @custom_values_before_change.store c.custom_field_id, c.value }
                 end
                 # Make sure updated_on is updated when adding a note.
                 updated_on_will_change!
                 @current_journal
               end
               # Returns the id of the last journal or nil
               def last_journal_id
                 if new_record?
                   nil
                 else
                   journals.first(:order => "#{Journal.table_name}.id DESC").try(:id)
                 end
               end
               # Return true if the issue is closed, otherwise false
               def closed?
                 self.status.is_closed?
               end
               # Return true if the issue is being reopened
               def reopened?
                 if !new_record? && status_id_changed?
                   status_was = IssueStatus.find_by_id(status_id_was)
                   status_new = IssueStatus.find_by_id(status_id)
                   if status_was && status_new && status_was.is_closed? && !status_new.is_closed?
                     return true
                   end
                 end
                 false
               end
               # Return true if the issue is being closed
               def closing?
                 if !new_record? && status_id_changed?
                   status_was = IssueStatus.find_by_id(status_id_was)
                   status_new = IssueStatus.find_by_id(status_id)
                   if status_was && status_new && !status_was.is_closed? && status_new.is_closed?
                     return true
                   end
                 end
                 false
               end
               # Returns true if the issue is overdue
               def overdue?
                 !due_date.nil? && (due_date < Date.today) && !status.is_closed?
               end
               # Is the amount of work done less than it should for the due date
               def behind_schedule?
                 return false if start_date.nil? || due_date.nil?
                 done_date = start_date + ((due_date - start_date+1)* done_ratio/100).floor
                 return done_date <= Date.today
               end
               # Does this issue have children?
               def children?
                 !leaf?
               end
               # Users the issue can be assigned to
               def assignable_users
                 users = project.assignable_users
                 users << author if author
                 users << assigned_to if assigned_to
                 users.uniq.sort
               end
               # Versions that the issue can be assigned to
               def assignable_versions
                 @assignable_versions ||= (project.shared_versions.open + [Version.find_by_id(fixed_version_id_was)]).compact.uniq.sort
               end
               # Returns true if this issue is blocked by another issue that is still open
               def blocked?
                 !relations_to.detect {|ir| ir.relation_type == 'blocks' && !ir.issue_from.closed?}.nil?
               end
               # Returns an array of statuses that user is able to apply
               def new_statuses_allowed_to(user=User.current, include_default=false)
                 if new_record? && @copied_from
                   [IssueStatus.default, @copied_from.status].compact.uniq.sort
                 else
                   initial_status = nil
                   if new_record?
                     initial_status = IssueStatus.default
                   elsif status_id_was
                     initial_status = IssueStatus.find_by_id(status_id_was)
                   end
                   initial_status ||= status
                   statuses = initial_status.find_new_statuses_allowed_to(
                     user.admin ? Role.all : user.roles_for_project(project),
                     tracker,
                     author == user,
                     assigned_to_id_changed? ? assigned_to_id_was == user.id : assigned_to_id == user.id
                     )
                   statuses << initial_status unless statuses.empty?
                   statuses << IssueStatus.default if include_default
                   statuses = statuses.compact.uniq.sort
                   blocked? ? statuses.reject {|s| s.is_closed?} : statuses
                 end
               end
               def assigned_to_was
                 if assigned_to_id_changed? && assigned_to_id_was.present?
                   @assigned_to_was ||= User.find_by_id(assigned_to_id_was)
                 end
               end
               # Returns the mail adresses of users that should be notified
               def recipients
                 notified = []
                 # Author and assignee are always notified unless they have been
                 # locked or don't want to be notified
                 notified << author if author
                 if assigned_to
                   notified += (assigned_to.is_a?(Group) ? assigned_to.users : [assigned_to])
                 end
                 if assigned_to_was
                   notified += (assigned_to_was.is_a?(Group) ? assigned_to_was.users : [assigned_to_was])
                 end
                 notified = notified.select {|u| u.active? && u.notify_about?(self)}
                 notified += project.notified_users
                 notified.uniq!
                 # Remove users that can not view the issue
                 notified.reject! {|user| !visible?(user)}
                 notified.collect(&:mail)
               end
               # Returns the number of hours spent on this issue
               def spent_hours
                 @spent_hours ||= time_entries.sum(:hours) || 0
               end
               # Returns the total number of hours spent on this issue and its descendants
               #
               # Example:
               #   spent_hours => 0.0
               #   spent_hours => 50.2
               def total_spent_hours
                 @total_spent_hours ||= self_and_descendants.sum("#{TimeEntry.table_name}.hours",
                   :joins => "LEFT JOIN #{TimeEntry.table_name} ON #{TimeEntry.table_name}.issue_id = #{Issue.table_name}.id").to_f || 0.0
               end
               def relations
                 @relations ||= (relations_from + relations_to).sort
               end
               # Preloads relations for a collection of issues
               def self.load_relations(issues)
                 if issues.any?
                   relations = IssueRelation.all(:conditions => ["issue_from_id IN (:ids) OR issue_to_id IN (:ids)", {:ids => issues.map(&:id)}])
                   issues.each do |issue|
                     issue.instance_variable_set "@relations", relations.select {|r| r.issue_from_id == issue.id || r.issue_to_id == issue.id}
                   end
                 end
               end
               # Preloads visible spent time for a collection of issues
               def self.load_visible_spent_hours(issues, user=User.current)
                 if issues.any?
                   hours_by_issue_id = TimeEntry.visible(user).sum(:hours, :group => :issue_id)
                   issues.each do |issue|
                     issue.instance_variable_set "@spent_hours", (hours_by_issue_id[issue.id] || 0)
                   end
                 end
               end
               # Finds an issue relation given its id.
               def find_relation(relation_id)
                 IssueRelation.find(relation_id, :conditions => ["issue_to_id = ? OR issue_from_id = ?", id, id])
               end
               def all_dependent_issues(except=[])
                 except << self
                 dependencies = []
                 relations_from.each do |relation|
                   if relation.issue_to && !except.include?(relation.issue_to)
                     dependencies << relation.issue_to
                     dependencies += relation.issue_to.all_dependent_issues(except)
                   end
                 end
                 dependencies
               end
               # Returns an array of issues that duplicate this one
               def duplicates
                 relations_to.select {|r| r.relation_type == IssueRelation::TYPE_DUPLICATES}.collect {|r| r.issue_from}
               end
               # Returns the due date or the target due date if any
               # Used on gantt chart
               def due_before
                 due_date || (fixed_version ? fixed_version.effective_date : nil)
               end
               # Returns the time scheduled for this issue.
               #
               # Example:
               #   Start Date: 2/26/09, End Date: 3/04/09
               #   duration => 6
               def duration
                 (start_date && due_date) ? due_date - start_date : 0
               end
               def soonest_start
                 @soonest_start ||= (
                     relations_to.collect{|relation| relation.successor_soonest_start} +
                     ancestors.collect(&:soonest_start)
                   ).compact.max
               end
               def reschedule_after(date)
                 return if date.nil?
                 if leaf?
                   if start_date.nil? || start_date < date
                     self.start_date, self.due_date = date, date + duration
                     begin
                       save
                     rescue ActiveRecord::StaleObjectError
                       reload
                       self.start_date, self.due_date = date, date + duration
                       save
                     end
                   end
                 else
                   leaves.each do |leaf|
                     leaf.reschedule_after(date)
                   end
                 end
               end
               def <=>(issue)
                 if issue.nil?
                   -1
                 elsif root_id != issue.root_id
                   (root_id || 0) <=> (issue.root_id || 0)
                 else
                   (lft || 0) <=> (issue.lft || 0)
                 end
               end
               def to_s
                 "#{tracker} ##{id}: #{subject}"
               end
               # Returns a string of css classes that apply to the issue
               def css_classes
                 s = "issue status-#{status.position} priority-#{priority.position}"
                 s << ' closed' if closed?
                 s << ' overdue' if overdue?
                 s << ' child' if child?
                 s << ' parent' unless leaf?
                 s << ' private' if is_private?
                 s << ' created-by-me' if User.current.logged? && author_id == User.current.id
                 s << ' assigned-to-me' if User.current.logged? && assigned_to_id == User.current.id
                 s
               end
               # Saves an issue and a time_entry from the parameters
               def save_issue_with_child_records(params, existing_time_entry=nil)
                 Issue.transaction do
                   if params[:time_entry] && (params[:time_entry][:hours].present? || params[:time_entry][:comments].present?) && User.current.allowed_to?(:log_time, project)
                     @time_entry = existing_time_entry || TimeEntry.new
                     @time_entry.project = project
                     @time_entry.issue = self
                     @time_entry.user = User.current
                     @time_entry.spent_on = User.current.today
                     @time_entry.attributes = params[:time_entry]
                     self.time_entries << @time_entry
                   end
                   # TODO: Rename hook
                   Redmine::Hook.call_hook(:controller_issues_edit_before_save, { :params => params, :issue => self, :time_entry => @time_entry, :journal => @current_journal})
                   if save
                     # TODO: Rename hook
                     Redmine::Hook.call_hook(:controller_issues_edit_after_save, { :params => params, :issue => self, :time_entry => @time_entry, :journal => @current_journal})
                   else
                     raise ActiveRecord::Rollback
                   end
                 end
               end
               # Unassigns issues from +version+ if it's no longer shared with issue's project
               def self.update_versions_from_sharing_change(version)
                 # Update issues assigned to the version
                 update_versions(["#{Issue.table_name}.fixed_version_id = ?", version.id])
               end
               # Unassigns issues from versions that are no longer shared
               # after +project+ was moved
               def self.update_versions_from_hierarchy_change(project)
                 moved_project_ids = project.self_and_descendants.reload.collect(&:id)
                 # Update issues of the moved projects and issues assigned to a version of a moved project
                 Issue.update_versions(["#{Version.table_name}.project_id IN (?) OR #{Issue.table_name}.project_id IN (?)", moved_project_ids, moved_project_ids])
               end
               def parent_issue_id=(arg)
                 parent_issue_id = arg.blank? ? nil : arg.to_i
                 if parent_issue_id && @parent_issue = Issue.find_by_id(parent_issue_id)
                   @parent_issue.id
                 else
                   @parent_issue = nil
                   nil
                 end
               end
               def parent_issue_id
                 if instance_variable_defined? :@parent_issue
                   @parent_issue.nil? ? nil : @parent_issue.id
                 else
                   parent_id
                 end
               end
               # Extracted from the ReportsController.
               def self.by_tracker(project)
                 count_and_group_by(:project => project,
                                    :field => 'tracker_id',
                                    :joins => Tracker.table_name)
               end
               def self.by_version(project)
                 count_and_group_by(:project => project,
                                    :field => 'fixed_version_id',
                                    :joins => Version.table_name)
               end
               def self.by_priority(project)
                 count_and_group_by(:project => project,
                                    :field => 'priority_id',
                                    :joins => IssuePriority.table_name)
               end
               def self.by_category(project)
                 count_and_group_by(:project => project,
                                    :field => 'category_id',
                                    :joins => IssueCategory.table_name)
               end
               def self.by_assigned_to(project)
                 count_and_group_by(:project => project,
                                    :field => 'assigned_to_id',
                                    :joins => User.table_name)
               end
               def self.by_author(project)
                 count_and_group_by(:project => project,
                                    :field => 'author_id',
                                    :joins => User.table_name)
               end
               def self.by_subproject(project)
                 ActiveRecord::Base.connection.select_all("select    s.id as status_id,
                                                             s.is_closed as closed,
                                                             #{Issue.table_name}.project_id as project_id,
                                                             count(#{Issue.table_name}.id) as total
                                                           from
                                                             #{Issue.table_name}, #{Project.table_name}, #{IssueStatus.table_name} s
                                                           where
                                                             #{Issue.table_name}.status_id=s.id
                                                             and #{Issue.table_name}.project_id = #{Project.table_name}.id
                                                             and #{visible_condition(User.current, :project => project, :with_subprojects => true)}
                                                             and #{Issue.table_name}.project_id <> #{project.id}
                                                           group by s.id, s.is_closed, #{Issue.table_name}.project_id") if project.descendants.active.any?
               end
               # End ReportsController extraction
               # Returns an array of projects that user can assign the issue to
               def allowed_target_projects(user=User.current)
                 if new_record?
                   Project.all(:conditions => Project.allowed_to_condition(user, :add_issues))
                 else
                   self.class.allowed_target_projects_on_move(user)
                 end
               end
               # Returns an array of projects that user can move issues to
               def self.allowed_target_projects_on_move(user=User.current)
                 Project.all(:conditions => Project.allowed_to_condition(user, :move_issues))
               end
               private
               def after_project_change
                 # Update project_id on related time entries
                 TimeEntry.update_all(["project_id = ?", project_id], {:issue_id => id})
                 # Delete issue relations
                 unless Setting.cross_project_issue_relations?
                   relations_from.clear
                   relations_to.clear
                 end
                 # Move subtasks
                 children.each do |child|
                   # Change project and keep project
                   child.send :project=, project, true
                   unless child.save
                     raise ActiveRecord::Rollback
                   end
                 end
               end
               def update_nested_set_attributes
                 if root_id.nil?
                   # issue was just created
                   self.root_id = (@parent_issue.nil? ? id : @parent_issue.root_id)
                   set_default_left_and_right
                   Issue.update_all("root_id = #{root_id}, lft = #{lft}, rgt = #{rgt}", ["id = ?", id])
                   if @parent_issue
                     move_to_child_of(@parent_issue)
                   end
                   reload
                 elsif parent_issue_id != parent_id
                   former_parent_id = parent_id
                   # moving an existing issue
                   if @parent_issue && @parent_issue.root_id == root_id
                     # inside the same tree
                     move_to_child_of(@parent_issue)
                   else
                     # to another tree
                     unless root?
                       move_to_right_of(root)
                       reload
                     end
                     old_root_id = root_id
                     self.root_id = (@parent_issue.nil? ? id : @parent_issue.root_id )
                     target_maxright = nested_set_scope.maximum(right_column_name) || 0
                     offset = target_maxright + 1 - lft
                     Issue.update_all("root_id = #{root_id}, lft = lft + #{offset}, rgt = rgt + #{offset}",
                                       ["root_id = ? AND lft >= ? AND rgt <= ? ", old_root_id, lft, rgt])
                     self[left_column_name] = lft + offset
                     self[right_column_name] = rgt + offset
                     if @parent_issue
                       move_to_child_of(@parent_issue)
                     end
                   end
                   reload
                   # delete invalid relations of all descendants
                   self_and_descendants.each do |issue|
                     issue.relations.each do |relation|
                       relation.destroy unless relation.valid?
                     end
                   end
                   # update former parent
                   recalculate_attributes_for(former_parent_id) if former_parent_id
                 end
                 remove_instance_variable(:@parent_issue) if instance_variable_defined?(:@parent_issue)
               end
               def update_parent_attributes
                 recalculate_attributes_for(parent_id) if parent_id
               end
               def recalculate_attributes_for(issue_id)
                 if issue_id && p = Issue.find_by_id(issue_id)
                   # priority = highest priority of children
                   if priority_position = p.children.maximum("#{IssuePriority.table_name}.position", :joins => :priority)
                     p.priority = IssuePriority.find_by_position(priority_position)
                   end
                   # start/due dates = lowest/highest dates of children
                   p.start_date = p.children.minimum(:start_date)
                   p.due_date = p.children.maximum(:due_date)
                   if p.start_date && p.due_date && p.due_date < p.start_date
                     p.start_date, p.due_date = p.due_date, p.start_date
                   end
                   # done ratio = weighted average ratio of leaves
                   unless Issue.use_status_for_done_ratio? && p.status && p.status.default_done_ratio
                     leaves_count = p.leaves.count
                     if leaves_count > 0
                       average = p.leaves.average(:estimated_hours).to_f
                       if average == 0
                         average = 1
                       end
                       done = p.leaves.sum("COALESCE(estimated_hours, #{average}) * (CASE WHEN is_closed = #{connection.quoted_true} THEN 100 ELSE COALESCE(done_ratio, 0) END)", :joins => :status).to_f
                       progress = done / (average * leaves_count)
                       p.done_ratio = progress.round
                     end
                   end
                   # estimate = sum of leaves estimates
                   p.estimated_hours = p.leaves.sum(:estimated_hours).to_f
                   p.estimated_hours = nil if p.estimated_hours == 0.0
                   # ancestors will be recursively updated
-                  p.save(false)
+                  p.save(:validate => false)
                 end
               end
               # Update issues so their versions are not pointing to a
               # fixed_version that is not shared with the issue's project
               def self.update_versions(conditions=nil)
                 # Only need to update issues with a fixed_version from
                 # a different project and that is not systemwide shared
                 Issue.scoped(:conditions => conditions).all(
                   :conditions => "#{Issue.table_name}.fixed_version_id IS NOT NULL" +
                     " AND #{Issue.table_name}.project_id <> #{Version.table_name}.project_id" +
                     " AND #{Version.table_name}.sharing <> 'system'",
                   :include => [:project, :fixed_version]
                 ).each do |issue|
                   next if issue.project.nil? || issue.fixed_version.nil?
                   unless issue.project.shared_versions.include?(issue.fixed_version)
                     issue.init_journal(User.current)
                     issue.fixed_version = nil
                     issue.save
                   end
                 end
               end
               # Callback on attachment deletion
               def attachment_added(obj)
                 if @current_journal && !obj.new_record?
                   @current_journal.details << JournalDetail.new(:property => 'attachment', :prop_key => obj.id, :value => obj.filename)
                 end
               end
               # Callback on attachment deletion
               def attachment_removed(obj)
                 if @current_journal && !obj.new_record?
                   @current_journal.details << JournalDetail.new(:property => 'attachment', :prop_key => obj.id, :old_value => obj.filename)
                   @current_journal.save
                 end
               end
               # Default assignment based on category
               def default_assign
                 if assigned_to.nil? && category && category.assigned_to
                   self.assigned_to = category.assigned_to
                 end
               end
               # Updates start/due dates of following issues
               def reschedule_following_issues
                 if start_date_changed? || due_date_changed?
                   relations_from.each do |relation|
                     relation.set_issue_to_dates
                   end
                 end
               end
               # Closes duplicates if the issue is being closed
               def close_duplicates
                 if closing?
                   duplicates.each do |duplicate|
                     # Reload is need in case the duplicate was updated by a previous duplicate
                     duplicate.reload
                     # Don't re-close it if it's already closed
                     next if duplicate.closed?
                     # Same user and notes
                     if @current_journal
                       duplicate.init_journal(@current_journal.user, @current_journal.notes)
                     end
                     duplicate.update_attribute :status, self.status
                   end
                 end
               end
               # Saves the changes in a Journal
               # Called after_save
               def create_journal
                 if @current_journal
                   # attributes changes
                   if @attributes_before_change
                     (Issue.column_names - %w(id root_id lft rgt lock_version created_on updated_on)).each {|c|
                       before = @attributes_before_change[c]
                       after = send(c)
                       next if before == after || (before.blank? && after.blank?)
                       @current_journal.details << JournalDetail.new(:property => 'attr',
                                                                     :prop_key => c,
                                                                     :old_value => before,
                                                                     :value => after)
                     }
                   end
                   if @custom_values_before_change
                     # custom fields changes
                     custom_field_values.each {|c|
                       before = @custom_values_before_change[c.custom_field_id]
                       after = c.value
                       next if before == after || (before.blank? && after.blank?)
                       if before.is_a?(Array) || after.is_a?(Array)
                         before = [before] unless before.is_a?(Array)
                         after = [after] unless after.is_a?(Array)
                         # values removed
                         (before - after).reject(&:blank?).each do |value|
                           @current_journal.details << JournalDetail.new(:property => 'cf',
                                                                         :prop_key => c.custom_field_id,
                                                                         :old_value => value,
                                                                         :value => nil)
                         end
                         # values added
                         (after - before).reject(&:blank?).each do |value|
                           @current_journal.details << JournalDetail.new(:property => 'cf',
                                                                         :prop_key => c.custom_field_id,
                                                                         :old_value => nil,
                                                                         :value => value)
                         end
                       else
                         @current_journal.details << JournalDetail.new(:property => 'cf',
                                                                       :prop_key => c.custom_field_id,
                                                                       :old_value => before,
                                                                       :value => after)
                       end
                     }
                   end
                   @current_journal.save
                   # reset current journal
                   init_journal @current_journal.user, @current_journal.notes
                 end
               end
               # Query generator for selecting groups of issue counts for a project
               # based on specific criteria
               #
               # Options
               # * project - Project to search in.
               # * field - String. Issue field to key off of in the grouping.
               # * joins - String. The table name to join against.
               def self.count_and_group_by(options)
                 project = options.delete(:project)
                 select_field = options.delete(:field)
                 joins = options.delete(:joins)
                 where = "#{Issue.table_name}.#{select_field}=j.id"
                 ActiveRecord::Base.connection.select_all("select    s.id as status_id,
                                                             s.is_closed as closed,
                                                             j.id as #{select_field},
                                                             count(#{Issue.table_name}.id) as total
                                                           from
                                                               #{Issue.table_name}, #{Project.table_name}, #{IssueStatus.table_name} s, #{joins} j
                                                           where
                                                             #{Issue.table_name}.status_id=s.id
                                                             and #{where}
                                                             and #{Issue.table_name}.project_id=#{Project.table_name}.id
                                                             and #{visible_condition(User.current, :project => project)}
                                                           group by s.id, s.is_closed, j.id")
               end
             end

app/models/mail_handler.rb +11 -2

             # Redmine - project management software
             # Copyright (C) 2006-2011  Jean-Philippe Lang
             #
             # This program is free software; you can redistribute it and/or
             # modify it under the terms of the GNU General Public License
             # as published by the Free Software Foundation; either version 2
             # of the License, or (at your option) any later version.
             #
             # This program is distributed in the hope that it will be useful,
             # but WITHOUT ANY WARRANTY; without even the implied warranty of
             # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
             # GNU General Public License for more details.
             #
             # You should have received a copy of the GNU General Public License
             # along with this program; if not, write to the Free Software
             # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-            class MailHandler < ActionMailer::Base
+            require 'vendor/tmail'
+            class MailHandler
               include ActionView::Helpers::SanitizeHelper
               include Redmine::I18n
               class UnauthorizedAction < StandardError; end
               class MissingInformation < StandardError; end
               attr_reader :email, :user
               def self.receive(email, options={})
                 @@handler_options = options.dup
                 @@handler_options[:issue] ||= {}
                 if @@handler_options[:allow_override].is_a?(String)
                   @@handler_options[:allow_override] = @@handler_options[:allow_override].split(',').collect(&:strip)
                 end
                 @@handler_options[:allow_override] ||= []
                 # Project needs to be overridable if not specified
                 @@handler_options[:allow_override] << 'project' unless @@handler_options[:issue].has_key?(:project)
                 # Status overridable by default
                 @@handler_options[:allow_override] << 'status' unless @@handler_options[:issue].has_key?(:status)
                 @@handler_options[:no_permission_check] = (@@handler_options[:no_permission_check].to_s == '1' ? true : false)
-                super email
+                mail = TMail::Mail.parse(email)
+                mail.base64_decode
+                new.receive(mail)
+              end
+              def logger
+                Rails.logger
               end
               cattr_accessor :ignored_emails_headers
               @@ignored_emails_headers = {
                 'X-Auto-Response-Suppress' => 'OOF',
                 'Auto-Submitted' => 'auto-replied'
               }
               # Processes incoming emails
               # Returns the created object (eg. an issue, a message) or false
               def receive(email)
                 @email = email
                 sender_email = email.from.to_a.first.to_s.strip
                 # Ignore emails received from the application emission address to avoid hell cycles
                 if sender_email.downcase == Setting.mail_from.to_s.strip.downcase
                   if logger && logger.info
                     logger.info  "MailHandler: ignoring email from Redmine emission address [#{sender_email}]"
                   end
                   return false
                 end
                 # Ignore auto generated emails
                 self.class.ignored_emails_headers.each do |key, ignored_value|
                   value = email.header_string(key)
                   if value && value.to_s.downcase == ignored_value.downcase
                     if logger && logger.info
                       logger.info "MailHandler: ignoring email with #{key}:#{value} header"
                     end
                     return false
                   end
                 end
                 @user = User.find_by_mail(sender_email) if sender_email.present?
                 if @user && !@user.active?
                   if logger && logger.info
                     logger.info  "MailHandler: ignoring email from non-active user [#{@user.login}]"
                   end
                   return false
                 end
                 if @user.nil?
                   # Email was submitted by an unknown user
                   case @@handler_options[:unknown_user]
                   when 'accept'
                     @user = User.anonymous
                   when 'create'
                     @user = create_user_from_email
                     if @user
                       if logger && logger.info
                         logger.info "MailHandler: [#{@user.login}] account created"
                       end
                       Mailer.deliver_account_information(@user, @user.password)
                     else
                       if logger && logger.error
                         logger.error "MailHandler: could not create account for [#{sender_email}]"
                       end
                       return false
                     end
                   else
                     # Default behaviour, emails from unknown users are ignored
                     if logger && logger.info
                       logger.info  "MailHandler: ignoring email from unknown user [#{sender_email}]"
                     end
                     return false
                   end
                 end
                 User.current = @user
                 dispatch
               end
               private
               MESSAGE_ID_RE = %r{^<redmine\.([a-z0-9_]+)\-(\d+)\.\d+@}
               ISSUE_REPLY_SUBJECT_RE = %r{\[[^\]]*#(\d+)\]}
               MESSAGE_REPLY_SUBJECT_RE = %r{\[[^\]]*msg(\d+)\]}
               def dispatch
                 headers = [email.in_reply_to, email.references].flatten.compact
                 if headers.detect {|h| h.to_s =~ MESSAGE_ID_RE}
                   klass, object_id = $1, $2.to_i
                   method_name = "receive_#{klass}_reply"
                   if self.class.private_instance_methods.collect(&:to_s).include?(method_name)
                     send method_name, object_id
                   else
                     # ignoring it
                   end
                 elsif m = email.subject.match(ISSUE_REPLY_SUBJECT_RE)
                   receive_issue_reply(m[1].to_i)
                 elsif m = email.subject.match(MESSAGE_REPLY_SUBJECT_RE)
                   receive_message_reply(m[1].to_i)
                 else
                   dispatch_to_default
                 end
               rescue ActiveRecord::RecordInvalid => e
                 # TODO: send a email to the user
                 logger.error e.message if logger
                 false
               rescue MissingInformation => e
                 logger.error "MailHandler: missing information from #{user}: #{e.message}" if logger
                 false
               rescue UnauthorizedAction => e
                 logger.error "MailHandler: unauthorized attempt from #{user}" if logger
                 false
               end
               def dispatch_to_default
                 receive_issue
               end
               # Creates a new issue
               def receive_issue
                 project = target_project
                 # check permission
                 unless @@handler_options[:no_permission_check]
                   raise UnauthorizedAction unless user.allowed_to?(:add_issues, project)
                 end
                 issue = Issue.new(:author => user, :project => project)
                 issue.safe_attributes = issue_attributes_from_keywords(issue)
                 issue.safe_attributes = {'custom_field_values' => custom_field_values_from_keywords(issue)}
                 issue.subject = email.subject.to_s.chomp[0,255]
                 if issue.subject.blank?
                   issue.subject = '(no subject)'
                 end
                 issue.description = cleaned_up_text_body
                 # add To and Cc as watchers before saving so the watchers can reply to Redmine
                 add_watchers(issue)
                 issue.save!
                 add_attachments(issue)
                 logger.info "MailHandler: issue ##{issue.id} created by #{user}" if logger && logger.info
                 issue
               end
               # Adds a note to an existing issue
               def receive_issue_reply(issue_id)
                 issue = Issue.find_by_id(issue_id)
                 return unless issue
                 # check permission
                 unless @@handler_options[:no_permission_check]
                   unless user.allowed_to?(:add_issue_notes, issue.project) ||
                            user.allowed_to?(:edit_issues, issue.project)
                     raise UnauthorizedAction
                   end
                 end
                 # ignore CLI-supplied defaults for new issues
                 @@handler_options[:issue].clear
                 journal = issue.init_journal(user)
                 issue.safe_attributes = issue_attributes_from_keywords(issue)
                 issue.safe_attributes = {'custom_field_values' => custom_field_values_from_keywords(issue)}
                 journal.notes = cleaned_up_text_body
                 add_attachments(issue)
                 issue.save!
                 if logger && logger.info
                   logger.info "MailHandler: issue ##{issue.id} updated by #{user}"
                 end
                 journal
               end
               # Reply will be added to the issue
               def receive_journal_reply(journal_id)
                 journal = Journal.find_by_id(journal_id)
                 if journal && journal.journalized_type == 'Issue'
                   receive_issue_reply(journal.journalized_id)
                 end
               end
               # Receives a reply to a forum message
               def receive_message_reply(message_id)
                 message = Message.find_by_id(message_id)
                 if message
                   message = message.root
                   unless @@handler_options[:no_permission_check]
                     raise UnauthorizedAction unless user.allowed_to?(:add_messages, message.project)
                   end
                   if !message.locked?
                     reply = Message.new(:subject => email.subject.gsub(%r{^.*msg\d+\]}, '').strip,
                                         :content => cleaned_up_text_body)
                     reply.author = user
                     reply.board = message.board
                     message.children << reply
                     add_attachments(reply)
                     reply
                   else
                     if logger && logger.info
                       logger.info "MailHandler: ignoring reply from [#{sender_email}] to a locked topic"
                     end
                   end
                 end
               end
               def add_attachments(obj)
                 if email.attachments && email.attachments.any?
                   email.attachments.each do |attachment|
                     obj.attachments << Attachment.create(:container => obj,
                                       :file => attachment,
                                       :author => user,
                                       :content_type => attachment.content_type)
                   end
                 end
               end
               # Adds To and Cc as watchers of the given object if the sender has the
               # appropriate permission
               def add_watchers(obj)
                 if user.allowed_to?("add_#{obj.class.name.underscore}_watchers".to_sym, obj.project)
                   addresses = [email.to, email.cc].flatten.compact.uniq.collect {|a| a.strip.downcase}
                   unless addresses.empty?
                     watchers = User.active.find(:all, :conditions => ['LOWER(mail) IN (?)', addresses])
                     watchers.each {|w| obj.add_watcher(w)}
                   end
                 end
               end
               def get_keyword(attr, options={})
                 @keywords ||= {}
                 if @keywords.has_key?(attr)
                   @keywords[attr]
                 else
                   @keywords[attr] = begin
                     if (options[:override] || @@handler_options[:allow_override].include?(attr.to_s)) &&
                           (v = extract_keyword!(plain_text_body, attr, options[:format]))
                       v
                     elsif !@@handler_options[:issue][attr].blank?
                       @@handler_options[:issue][attr]
                     end
                   end
                 end
               end
               # Destructively extracts the value for +attr+ in +text+
               # Returns nil if no matching keyword found
               def extract_keyword!(text, attr, format=nil)
                 keys = [attr.to_s.humanize]
                 if attr.is_a?(Symbol)
                   if user && user.language.present?
                     keys << l("field_#{attr}", :default => '', :locale =>  user.language)
                   end
                   if Setting.default_language.present?
                     keys << l("field_#{attr}", :default => '', :locale =>  Setting.default_language)
                   end
                 end
                 keys.reject! {|k| k.blank?}
                 keys.collect! {|k| Regexp.escape(k)}
                 format ||= '.+'
                 text.gsub!(/^(#{keys.join('|')})[ \t]*:[ \t]*(#{format})\s*$/i, '')
                 $2 && $2.strip
               end
               def target_project
                 # TODO: other ways to specify project:
                 # * parse the email To field
                 # * specific project (eg. Setting.mail_handler_target_project)
                 target = Project.find_by_identifier(get_keyword(:project))
                 raise MissingInformation.new('Unable to determine target project') if target.nil?
                 target
               end
               # Returns a Hash of issue attributes extracted from keywords in the email body
               def issue_attributes_from_keywords(issue)
                 assigned_to = (k = get_keyword(:assigned_to, :override => true)) && find_assignee_from_keyword(k, issue)
                 attrs = {
                   'tracker_id' => (k = get_keyword(:tracker)) && issue.project.trackers.named(k).first.try(:id),
                   'status_id' =>  (k = get_keyword(:status)) && IssueStatus.named(k).first.try(:id),
                   'priority_id' => (k = get_keyword(:priority)) && IssuePriority.named(k).first.try(:id),
                   'category_id' => (k = get_keyword(:category)) && issue.project.issue_categories.named(k).first.try(:id),
                   'assigned_to_id' => assigned_to.try(:id),
                   'fixed_version_id' => (k = get_keyword(:fixed_version, :override => true)) &&
                                             issue.project.shared_versions.named(k).first.try(:id),
                   'start_date' => get_keyword(:start_date, :override => true, :format => '\d{4}-\d{2}-\d{2}'),
                   'due_date' => get_keyword(:due_date, :override => true, :format => '\d{4}-\d{2}-\d{2}'),
                   'estimated_hours' => get_keyword(:estimated_hours, :override => true),
                   'done_ratio' => get_keyword(:done_ratio, :override => true, :format => '(\d|10)?0')
                 }.delete_if {|k, v| v.blank? }
                 if issue.new_record? && attrs['tracker_id'].nil?
                   attrs['tracker_id'] = issue.project.trackers.find(:first).try(:id)
                 end
                 attrs
               end
               # Returns a Hash of issue custom field values extracted from keywords in the email body
               def custom_field_values_from_keywords(customized)
                 customized.custom_field_values.inject({}) do |h, v|
                   if value = get_keyword(v.custom_field.name, :override => true)
                     h[v.custom_field.id.to_s] = value
                   end
                   h
                 end
               end
               # Returns the text/plain part of the email
               # If not found (eg. HTML-only email), returns the body with tags removed
               def plain_text_body
                 return @plain_text_body unless @plain_text_body.nil?
                 parts = @email.parts.collect {|c| (c.respond_to?(:parts) && !c.parts.empty?) ? c.parts : c}.flatten
                 if parts.empty?
                   parts << @email
                 end
                 plain_text_part = parts.detect {|p| p.content_type == 'text/plain'}
                 if plain_text_part.nil?
                   # no text/plain part found, assuming html-only email
                   # strip html tags and remove doctype directive
                   @plain_text_body = strip_tags(@email.body.to_s)
                   @plain_text_body.gsub! %r{^<!DOCTYPE .*$}, ''
                 else
                   @plain_text_body = plain_text_part.body.to_s
                 end
                 @plain_text_body.strip!
                 @plain_text_body
               end
               def cleaned_up_text_body
                 cleanup_body(plain_text_body)
               end
               def self.full_sanitizer
                 @full_sanitizer ||= HTML::FullSanitizer.new
               end
               def self.assign_string_attribute_with_limit(object, attribute, value, limit=nil)
                 limit ||= object.class.columns_hash[attribute.to_s].limit || 255
                 value = value.to_s.slice(0, limit)
                 object.send("#{attribute}=", value)
               end
               # Returns a User from an email address and a full name
               def self.new_user_from_attributes(email_address, fullname=nil)
                 user = User.new
                 # Truncating the email address would result in an invalid format
                 user.mail = email_address
                 assign_string_attribute_with_limit(user, 'login', email_address, User::LOGIN_LENGTH_LIMIT)
                 names = fullname.blank? ? email_address.gsub(/@.*$/, '').split('.') : fullname.split
                 assign_string_attribute_with_limit(user, 'firstname', names.shift)
                 assign_string_attribute_with_limit(user, 'lastname', names.join(' '))
                 user.lastname = '-' if user.lastname.blank?
                 password_length = [Setting.password_min_length.to_i, 10].max
                 user.password = Redmine::Utils.random_hex(password_length / 2 + 1)
                 user.language = Setting.default_language
                 unless user.valid?
                   user.login = "user#{Redmine::Utils.random_hex(6)}" unless user.errors[:login].blank?
                   user.firstname = "-" unless user.errors[:firstname].blank?
                   user.lastname  = "-" unless user.errors[:lastname].blank?
                 end
                 user
               end
               # Creates a User for the +email+ sender
               # Returns the user or nil if it could not be created
               def create_user_from_email
                 addr = email.from_addrs.to_a.first
                 if addr && !addr.spec.blank?
                   user = self.class.new_user_from_attributes(addr.spec, TMail::Unquoter.unquote_and_convert_to(addr.name, 'utf-8'))
                   if user.save
                     user
                   else
                     logger.error "MailHandler: failed to create User: #{user.errors.full_messages}" if logger
                     nil
                   end
                 else
                   logger.error "MailHandler: failed to create User: no FROM address found" if logger
                   nil
                 end
               end
               # Removes the email body of text after the truncation configurations.
               def cleanup_body(body)
                 delimiters = Setting.mail_handler_body_delimiters.to_s.split(/[\r\n]+/).reject(&:blank?).map {|s| Regexp.escape(s)}
                 unless delimiters.empty?
                   regex = Regexp.new("^[> ]*(#{ delimiters.join('|') })\s*[\r\n].*", Regexp::MULTILINE)
                   body = body.gsub(regex, '')
                 end
                 body.strip
               end
               def find_assignee_from_keyword(keyword, issue)
                 keyword = keyword.to_s.downcase
                 assignable = issue.assignable_users
                 assignee = nil
                 assignee ||= assignable.detect {|a|
                                a.mail.to_s.downcase == keyword ||
                                  a.login.to_s.downcase == keyword
                              }
                 if assignee.nil? && keyword.match(/ /)
                   firstname, lastname = *(keyword.split) # "First Last Throwaway"
                   assignee ||= assignable.detect {|a|
                                  a.is_a?(User) && a.firstname.to_s.downcase == firstname &&
                                    a.lastname.to_s.downcase == lastname
                                }
                 end
                 if assignee.nil?
                   assignee ||= assignable.detect {|a| a.is_a?(Group) && a.name.downcase == keyword}
                 end
                 assignee
               end
             end

app/models/mailer.rb +135 -172

             # Redmine - project management software
             # Copyright (C) 2006-2011  Jean-Philippe Lang
             #
             # This program is free software; you can redistribute it and/or
             # modify it under the terms of the GNU General Public License
             # as published by the Free Software Foundation; either version 2
             # of the License, or (at your option) any later version.
             #
             # This program is distributed in the hope that it will be useful,
             # but WITHOUT ANY WARRANTY; without even the implied warranty of
             # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
             # GNU General Public License for more details.
             #
             # You should have received a copy of the GNU General Public License
             # along with this program; if not, write to the Free Software
             # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
             class Mailer < ActionMailer::Base
               layout 'mailer'
               helper :application
               helper :issues
               helper :custom_fields
-              include ActionController::UrlWriter
               include Redmine::I18n
               def self.default_url_options
-                h = Setting.host_name
+                { :host => Setting.host_name, :protocol => Setting.protocol }
-                h = h.to_s.gsub(%r{\/.*$}, '') unless Redmine::Utils.relative_url_root.blank?
-                { :host => h, :protocol => Setting.protocol }
               end
               # Builds a tmail object used to email recipients of the added issue.
               #
               # Example:
               #   issue_add(issue) => tmail object
               #   Mailer.deliver_issue_add(issue) => sends an email to issue recipients
               def issue_add(issue)
                 redmine_headers 'Project' => issue.project.identifier,
                                 'Issue-Id' => issue.id,
                                 'Issue-Author' => issue.author.login
                 redmine_headers 'Issue-Assignee' => issue.assigned_to.login if issue.assigned_to
                 message_id issue
                 @author = issue.author
-                recipients issue.recipients
+                @issue = issue
-                cc(issue.watcher_recipients - @recipients)
+                @issue_url = url_for(:controller => 'issues', :action => 'show', :id => issue)
-                subject "[#{issue.project.name} - #{issue.tracker.name} ##{issue.id}] (#{issue.status.name}) #{issue.subject}"
+                recipients = issue.recipients
-                body :issue => issue,
+                cc = issue.watcher_recipients - recipients
-                     :issue_url => url_for(:controller => 'issues', :action => 'show', :id => issue)
+                mail :to => recipients,
-                render_multipart('issue_add', body)
+                  :cc => cc,
+                  :subject => "[#{issue.project.name} - #{issue.tracker.name} ##{issue.id}] (#{issue.status.name}) #{issue.subject}"
               end
               # Builds a tmail object used to email recipients of the edited issue.
               #
               # Example:
               #   issue_edit(journal) => tmail object
               #   Mailer.deliver_issue_edit(journal) => sends an email to issue recipients
               def issue_edit(journal)
                 issue = journal.journalized.reload
                 redmine_headers 'Project' => issue.project.identifier,
                                 'Issue-Id' => issue.id,
                                 'Issue-Author' => issue.author.login
                 redmine_headers 'Issue-Assignee' => issue.assigned_to.login if issue.assigned_to
                 message_id journal
                 references issue
                 @author = journal.user
-                recipients issue.recipients
+                recipients = issue.recipients
                 # Watchers in cc
-                cc(issue.watcher_recipients - @recipients)
+                cc = issue.watcher_recipients - recipients
                 s = "[#{issue.project.name} - #{issue.tracker.name} ##{issue.id}] "
                 s << "(#{issue.status.name}) " if journal.new_value_for('status_id')
                 s << issue.subject
-                subject s
+                @issue = issue
-                body :issue => issue,
+                @journal = journal
-                     :journal => journal,
+                @issue_url = url_for(:controller => 'issues', :action => 'show', :id => issue, :anchor => "change-#{journal.id}")
-                     :issue_url => url_for(:controller => 'issues', :action => 'show', :id => issue, :anchor => "change-#{journal.id}")
+                mail :to => recipients,
+                  :cc => cc,
-                render_multipart('issue_edit', body)
+                  :subject => s
               end
               def reminder(user, issues, days)
                 set_language_if_valid user.language
-                recipients user.mail
+                @issues = issues
-                subject l(:mail_subject_reminder, :count => issues.size, :days => days)
+                @days = days
-                body :issues => issues,
+                @issues_url = url_for(:controller => 'issues', :action => 'index',
-                     :days => days,
-                     :issues_url => url_for(:controller => 'issues', :action => 'index',
                                             :set_filter => 1, :assigned_to_id => user.id,
                                             :sort => 'due_date:asc')
-                render_multipart('reminder', body)
+                mail :to => user.mail,
+                  :subject => l(:mail_subject_reminder, :count => issues.size, :days => days)
               end
               # Builds a tmail object used to email users belonging to the added document's project.
               #
               # Example:
               #   document_added(document) => tmail object
               #   Mailer.deliver_document_added(document) => sends an email to the document's project recipients
               def document_added(document)
                 redmine_headers 'Project' => document.project.identifier
-                recipients document.recipients
                 @author = User.current
-                subject "[#{document.project.name}] #{l(:label_document_new)}: #{document.title}"
+                @document = document
-                body :document => document,
+                @document_url = url_for(:controller => 'documents', :action => 'show', :id => document)
-                     :document_url => url_for(:controller => 'documents', :action => 'show', :id => document)
+                mail :to => document.recipients,
-                render_multipart('document_added', body)
+                  :subject => "[#{document.project.name}] #{l(:label_document_new)}: #{document.title}"
               end
               # Builds a tmail object used to email recipients of a project when an attachements are added.
               #
               # Example:
               #   attachments_added(attachments) => tmail object
               #   Mailer.deliver_attachments_added(attachments) => sends an email to the project's recipients
               def attachments_added(attachments)
                 container = attachments.first.container
                 added_to = ''
                 added_to_url = ''
                 @author = attachments.first.author
                 case container.class.name
                 when 'Project'
                   added_to_url = url_for(:controller => 'files', :action => 'index', :project_id => container)
                   added_to = "#{l(:label_project)}: #{container}"
-                  recipients container.project.notified_users.select {|user| user.allowed_to?(:view_files, container.project)}.collect  {|u| u.mail}
+                  recipients = container.project.notified_users.select {|user| user.allowed_to?(:view_files, container.project)}.collect  {|u| u.mail}
                 when 'Version'
                   added_to_url = url_for(:controller => 'files', :action => 'index', :project_id => container.project)
                   added_to = "#{l(:label_version)}: #{container.name}"
-                  recipients container.project.notified_users.select {|user| user.allowed_to?(:view_files, container.project)}.collect  {|u| u.mail}
+                  recipients = container.project.notified_users.select {|user| user.allowed_to?(:view_files, container.project)}.collect  {|u| u.mail}
                 when 'Document'
                   added_to_url = url_for(:controller => 'documents', :action => 'show', :id => container.id)
                   added_to = "#{l(:label_document)}: #{container.title}"
-                  recipients container.recipients
+                  recipients = container.recipients
                 end
                 redmine_headers 'Project' => container.project.identifier
-                subject "[#{container.project.name}] #{l(:label_attachment_new)}"
+                @attachments = attachments
-                body :attachments => attachments,
+                @added_to = added_to
-                     :added_to => added_to,
+                @added_to_url = added_to_url
-                     :added_to_url => added_to_url
+                mail :to => recipients,
-                render_multipart('attachments_added', body)
+                  :subject => "[#{container.project.name}] #{l(:label_attachment_new)}"
               end
               # Builds a tmail object used to email recipients of a news' project when a news item is added.
               #
               # Example:
               #   news_added(news) => tmail object
               #   Mailer.deliver_news_added(news) => sends an email to the news' project recipients
               def news_added(news)
                 redmine_headers 'Project' => news.project.identifier
                 @author = news.author
                 message_id news
-                recipients news.recipients
+                @news = news
-                subject "[#{news.project.name}] #{l(:label_news)}: #{news.title}"
+                @news_url = url_for(:controller => 'news', :action => 'show', :id => news)
-                body :news => news,
+                mail :to => news.recipients,
-                     :news_url => url_for(:controller => 'news', :action => 'show', :id => news)
+                  :subject => "[#{news.project.name}] #{l(:label_news)}: #{news.title}"
-                render_multipart('news_added', body)
               end
               # Builds a tmail object used to email recipients of a news' project when a news comment is added.
               #
               # Example:
               #   news_comment_added(comment) => tmail object
               #   Mailer.news_comment_added(comment) => sends an email to the news' project recipients
               def news_comment_added(comment)
                 news = comment.commented
                 redmine_headers 'Project' => news.project.identifier
                 @author = comment.author
                 message_id comment
-                recipients news.recipients
+                @news = news
-                cc news.watcher_recipients
+                @comment = comment
-                subject "Re: [#{news.project.name}] #{l(:label_news)}: #{news.title}"
+                @news_url = url_for(:controller => 'news', :action => 'show', :id => news)
-                body :news => news,
+                mail :to => news.recipients,
-                     :comment => comment,
+                 :cc => news.watcher_recipients,
-                     :news_url => url_for(:controller => 'news', :action => 'show', :id => news)
+                 :subject => "Re: [#{news.project.name}] #{l(:label_news)}: #{news.title}"
-                render_multipart('news_comment_added', body)
               end
               # Builds a tmail object used to email the recipients of the specified message that was posted.
               #
               # Example:
               #   message_posted(message) => tmail object
               #   Mailer.deliver_message_posted(message) => sends an email to the recipients
               def message_posted(message)
                 redmine_headers 'Project' => message.project.identifier,
                                 'Topic-Id' => (message.parent_id || message.id)
                 @author = message.author
                 message_id message
                 references message.parent unless message.parent.nil?
-                recipients(message.recipients)
+                recipients = message.recipients
-                cc((message.root.watcher_recipients + message.board.watcher_recipients).uniq - @recipients)
+                cc = ((message.root.watcher_recipients + message.board.watcher_recipients).uniq - recipients)
-                subject "[#{message.board.project.name} - #{message.board.name} - msg#{message.root.id}] #{message.subject}"
+                @message = message
-                body :message => message,
+                @message_url = url_for(message.event_url)
-                     :message_url => url_for(message.event_url)
+                mail :to => recipients,
-                render_multipart('message_posted', body)
+                  :cc => cc,
+                  :subject => "[#{message.board.project.name} - #{message.board.name} - msg#{message.root.id}] #{message.subject}"
               end
               # Builds a tmail object used to email the recipients of a project of the specified wiki content was added.
               #
               # Example:
               #   wiki_content_added(wiki_content) => tmail object
               #   Mailer.deliver_wiki_content_added(wiki_content) => sends an email to the project's recipients
               def wiki_content_added(wiki_content)
                 redmine_headers 'Project' => wiki_content.project.identifier,
                                 'Wiki-Page-Id' => wiki_content.page.id
                 @author = wiki_content.author
                 message_id wiki_content
-                recipients wiki_content.recipients
+                recipients = wiki_content.recipients
-                cc(wiki_content.page.wiki.watcher_recipients - recipients)
+                cc = wiki_content.page.wiki.watcher_recipients - recipients
-                subject "[#{wiki_content.project.name}] #{l(:mail_subject_wiki_content_added, :id => wiki_content.page.pretty_title)}"
+                @wiki_content = wiki_content
-                body :wiki_content => wiki_content,
+                @wiki_content_url = url_for(:controller => 'wiki', :action => 'show',
-                     :wiki_content_url => url_for(:controller => 'wiki', :action => 'show',
                                                   :project_id => wiki_content.project,
                                                   :id => wiki_content.page.title)
-                render_multipart('wiki_content_added', body)
+                mail :to => recipients,
+                  :cc => cc,
+                  :subject => "[#{wiki_content.project.name}] #{l(:mail_subject_wiki_content_added, :id => wiki_content.page.pretty_title)}"
               end
               # Builds a tmail object used to email the recipients of a project of the specified wiki content was updated.
               #
               # Example:
               #   wiki_content_updated(wiki_content) => tmail object
               #   Mailer.deliver_wiki_content_updated(wiki_content) => sends an email to the project's recipients
               def wiki_content_updated(wiki_content)
                 redmine_headers 'Project' => wiki_content.project.identifier,
                                 'Wiki-Page-Id' => wiki_content.page.id
                 @author = wiki_content.author
                 message_id wiki_content
-                recipients wiki_content.recipients
+                recipients = wiki_content.recipients
-                cc(wiki_content.page.wiki.watcher_recipients + wiki_content.page.watcher_recipients - recipients)
+                cc = wiki_content.page.wiki.watcher_recipients + wiki_content.page.watcher_recipients - recipients
-                subject "[#{wiki_content.project.name}] #{l(:mail_subject_wiki_content_updated, :id => wiki_content.page.pretty_title)}"
+                @wiki_content = wiki_content
-                body :wiki_content => wiki_content,
+                @wiki_content_url = url_for(:controller => 'wiki', :action => 'show',
-                     :wiki_content_url => url_for(:controller => 'wiki', :action => 'show',
                                                   :project_id => wiki_content.project,
-                                                  :id => wiki_content.page.title),
+                                                  :id => wiki_content.page.title)
-                     :wiki_diff_url => url_for(:controller => 'wiki', :action => 'diff',
+                @wiki_diff_url = url_for(:controller => 'wiki', :action => 'diff',
                                                :project_id => wiki_content.project, :id => wiki_content.page.title,
                                                :version => wiki_content.version)
-                render_multipart('wiki_content_updated', body)
+                mail :to => recipients,
+                  :cc => cc,
+                  :subject => "[#{wiki_content.project.name}] #{l(:mail_subject_wiki_content_updated, :id => wiki_content.page.pretty_title)}"
               end
               # Builds a tmail object used to email the specified user their account information.
               #
               # Example:
               #   account_information(user, password) => tmail object
               #   Mailer.deliver_account_information(user, password) => sends account information to the user
               def account_information(user, password)
                 set_language_if_valid user.language
-                recipients user.mail
+                @user = user
-                subject l(:mail_subject_register, Setting.app_title)
+                @password = password
-                body :user => user,
+                @login_url = url_for(:controller => 'account', :action => 'login')
-                     :password => password,
+                mail :to => user.mail,
-                     :login_url => url_for(:controller => 'account', :action => 'login')
+                  :subject => l(:mail_subject_register, Setting.app_title)
-                render_multipart('account_information', body)
               end
               # Builds a tmail object used to email all active administrators of an account activation request.
               #
               # Example:
               #   account_activation_request(user) => tmail object
               #   Mailer.deliver_account_activation_request(user)=> sends an email to all active administrators
               def account_activation_request(user)
                 # Send the email to all active administrators
-                recipients User.active.find(:all, :conditions => {:admin => true}).collect { |u| u.mail }.compact
+                recipients = User.active.find(:all, :conditions => {:admin => true}).collect { |u| u.mail }.compact
-                subject l(:mail_subject_account_activation_request, Setting.app_title)
+                @user = user
-                body :user => user,
+                @url = url_for(:controller => 'users', :action => 'index',
-                     :url => url_for(:controller => 'users', :action => 'index',
                                      :status => User::STATUS_REGISTERED,
                                      :sort_key => 'created_on', :sort_order => 'desc')
-                render_multipart('account_activation_request', body)
+                mail :to => recipients,
+                  :subject => l(:mail_subject_account_activation_request, Setting.app_title)
               end
               # Builds a tmail object used to email the specified user that their account was activated by an administrator.
               #
               # Example:
               #   account_activated(user) => tmail object
               #   Mailer.deliver_account_activated(user) => sends an email to the registered user
               def account_activated(user)
                 set_language_if_valid user.language
-                recipients user.mail
+                @user = user
-                subject l(:mail_subject_register, Setting.app_title)
+                @login_url = url_for(:controller => 'account', :action => 'login')
-                body :user => user,
+                mail :to => user.mail,
-                     :login_url => url_for(:controller => 'account', :action => 'login')
+                  :subject => l(:mail_subject_register, Setting.app_title)
-                render_multipart('account_activated', body)
               end
               def lost_password(token)
                 set_language_if_valid(token.user.language)
-                recipients token.user.mail
+                @token = token
-                subject l(:mail_subject_lost_password, Setting.app_title)
+                @url = url_for(:controller => 'account', :action => 'lost_password', :token => token.value)
-                body :token => token,
+                mail :to => token.user.mail,
-                     :url => url_for(:controller => 'account', :action => 'lost_password', :token => token.value)
+                  :subject => l(:mail_subject_lost_password, Setting.app_title)
-                render_multipart('lost_password', body)
               end
               def register(token)
                 set_language_if_valid(token.user.language)
-                recipients token.user.mail
+                @token = token
-                subject l(:mail_subject_register, Setting.app_title)
+                @url = url_for(:controller => 'account', :action => 'activate', :token => token.value)
-                body :token => token,
+                mail :to => token.user.mail,
-                     :url => url_for(:controller => 'account', :action => 'activate', :token => token.value)
+                  :subject => l(:mail_subject_register, Setting.app_title)
-                render_multipart('register', body)
               end
               def test_email(user)
                 set_language_if_valid(user.language)
-                recipients user.mail
+                @url = url_for(:controller => 'welcome')
-                subject 'Redmine test'
+                mail :to => user.mail,
-                body :url => url_for(:controller => 'welcome')
+                  :subject => 'Redmine test'
-                render_multipart('test_email', body)
               end
               # Overrides default deliver! method to prevent from sending an email
               # with no recipient, cc or bcc
               def deliver!(mail = @mail)
                 set_language_if_valid @initial_language
                 return false if (recipients.nil? || recipients.empty?) &&
                                 (cc.nil? || cc.empty?) &&
                                 (bcc.nil? || bcc.empty?)
-                # Set Message-Id and References
-                if @message_id_object
-                  mail.message_id = self.class.message_id_for(@message_id_object)
-                end
-                if @references_objects
-                  mail.references = @references_objects.collect {|o| self.class.message_id_for(o)}
-                end
                 # Log errors when raise_delivery_errors is set to false, Rails does not
                 raise_errors = self.class.raise_delivery_errors
                 self.class.raise_delivery_errors = true
                 begin
                   return super(mail)
                 rescue Exception => e
                   if raise_errors
                     raise e
                   elsif mylogger
                     mylogger.error "The following error occured while sending email notification: \"#{e.message}\". Check your configuration in config/configuration.yml."
                   end
                 ensure
                   self.class.raise_delivery_errors = raise_errors
                 end
               end
               # Sends reminders to issue assignees
               # Available options:
               # * :days     => how many days in the future to remind about (defaults to 7)
               # * :tracker  => id of tracker for filtering issues (defaults to all trackers)
               # * :project  => id or identifier of project to process (defaults to all projects)
               # * :users    => array of user ids who should be reminded
               def self.reminders(options={})
                 days = options[:days] || 7
                 project = options[:project] ? Project.find(options[:project]) : nil
                 tracker = options[:tracker] ? Tracker.find(options[:tracker]) : nil
                 user_ids = options[:users]
                 scope = Issue.open.scoped(:conditions => ["#{Issue.table_name}.assigned_to_id IS NOT NULL" +
                   " AND #{Project.table_name}.status = #{Project::STATUS_ACTIVE}" +
                   " AND #{Issue.table_name}.due_date <= ?", days.day.from_now.to_date]
                 )
                 scope = scope.scoped(:conditions => {:assigned_to_id => user_ids}) if user_ids.present?
                 scope = scope.scoped(:conditions => {:project_id => project.id}) if project
                 scope = scope.scoped(:conditions => {:tracker_id => tracker.id}) if tracker
                 issues_by_assignee = scope.all(:include => [:status, :assigned_to, :project, :tracker]).group_by(&:assigned_to)
                 issues_by_assignee.each do |assignee, issues|
                   deliver_reminder(assignee, issues, days) if assignee.is_a?(User) && assignee.active?
                 end
               end
               # Activates/desactivates email deliveries during +block+
               def self.with_deliveries(enabled = true, &block)
                 was_enabled = ActionMailer::Base.perform_deliveries
                 ActionMailer::Base.perform_deliveries = !!enabled
                 yield
               ensure
                 ActionMailer::Base.perform_deliveries = was_enabled
               end
               # Sends emails synchronously in the given block
               def self.with_synched_deliveries(&block)
                 saved_method = ActionMailer::Base.delivery_method
                 if m = saved_method.to_s.match(%r{^async_(.+)$})
                   ActionMailer::Base.delivery_method = m[1].to_sym
                 end
                 yield
               ensure
                 ActionMailer::Base.delivery_method = saved_method
               end
-              private
+              def mail(headers={})
-              def initialize_defaults(method_name)
+                headers.merge! 'X-Mailer' => 'Redmine',
-                super
-                @initial_language = current_language
-                set_language_if_valid Setting.default_language
-                from Setting.mail_from
-                # Common headers
-                headers 'X-Mailer' => 'Redmine',
                         'X-Redmine-Host' => Setting.host_name,
                         'X-Redmine-Site' => Setting.app_title,
                         'X-Auto-Response-Suppress' => 'OOF',
-                        'Auto-Submitted' => 'auto-generated'
+                        'Auto-Submitted' => 'auto-generated',
-              end
+                        'From' => Setting.mail_from
-              # Appends a Redmine header field (name is prepended with 'X-Redmine-')
-              def redmine_headers(h)
-                h.each { |k,v| headers["X-Redmine-#{k}"] = v.to_s }
-              end
-              # Overrides the create_mail method
-              def create_mail
                 # Removes the author from the recipients and cc
                 # if he doesn't want to receive notifications about what he does
                 if @author && @author.logged? && @author.pref[:no_self_notified]
-                  if recipients
+                  headers[:to].delete(@author.mail) if headers[:to].is_a?(Array)
-                    recipients((recipients.is_a?(Array) ? recipients : [recipients]) - [@author.mail])
+                  headers[:cc].delete(@author.mail) if headers[:cc].is_a?(Array)
-                  end
-                  if cc
-                    cc((cc.is_a?(Array) ? cc : [cc]) - [@author.mail])
-                  end
                 end
                 if @author && @author.logged?
                   redmine_headers 'Sender' => @author.login
                 end
-                notified_users = [recipients, cc].flatten.compact.uniq
-                # Rails would log recipients only, not cc and bcc
-                mylogger.info "Sending email notification to: #{notified_users.join(', ')}" if mylogger
                 # Blind carbon copy recipients
                 if Setting.bcc_recipients?
-                  bcc(notified_users)
+                  headers[:bcc] = [headers[:to], headers[:cc]].flatten.uniq.reject(&:blank?)
-                  recipients []
+                  headers[:to] = nil
-                  cc []
+                  headers[:cc] = nil
+                end
+                if @message_id_object
+                  headers[:message_id] = "<#{self.class.message_id_for(@message_id_object)}>"
+                end
+                if @references_objects
+                  headers[:references] = @references_objects.collect {|o| "<#{self.class.message_id_for(o)}>"}.join(' ')
+                end
+                super headers do |format|
+                  format.text
+                  format.html unless Setting.plain_text_mail?
                 end
+                set_language_if_valid @initial_language
+              end
+              def initialize(*args)
+                @initial_language = current_language
+                set_language_if_valid Setting.default_language
+                super
+              end
+              def self.deliver_mail(mail)
+                return false if mail.to.blank? && mail.cc.blank? && mail.bcc.blank?
                 super
               end
-              # Rails 2.3 has problems rendering implicit multipart messages with
+              def self.method_missing(method, *args, &block)
-              # layouts so this method will wrap an multipart messages with
+                if m = method.to_s.match(%r{^deliver_(.+)$})
-              # explicit parts.
+                  send(m[1], *args).deliver
-              # https://rails.lighthouseapp.com/projects/8994/tickets/2338-actionmailer-mailer-views-and-content-type
-              # https://rails.lighthouseapp.com/projects/8994/tickets/1799-actionmailer-doesnt-set-template_format-when-rendering-layouts
-              def render_multipart(method_name, body)
-                if Setting.plain_text_mail?
-                  content_type "text/plain"
-                  body render(:file => "#{method_name}.text.erb",
-                              :body => body,
-                              :layout => 'mailer.text.erb')
                 else
-                  content_type "multipart/alternative"
+                  super
-                  part :content_type => "text/plain",
-                       :body => render(:file => "#{method_name}.text.erb",
-                                       :body => body, :layout => 'mailer.text.erb')
-                  part :content_type => "text/html",
-                       :body => render_message("#{method_name}.html.erb", body)
                 end
               end
-              # Makes partial rendering work with Rails 1.2 (retro-compatibility)
+              private
-              def self.controller_path
-                ''
+              # Appends a Redmine header field (name is prepended with 'X-Redmine-')
-              end unless respond_to?('controller_path')
+              def redmine_headers(h)
+                h.each { |k,v| headers["X-Redmine-#{k}"] = v.to_s }
+              end
               # Returns a predictable Message-Id for the given object
               def self.message_id_for(object)
                 # id + timestamp should reduce the odds of a collision
                 # as far as we don't send multiple emails for the same object
                 timestamp = object.send(object.respond_to?(:created_on) ? :created_on : :updated_on)
                 hash = "redmine.#{object.class.name.demodulize.underscore}-#{object.id}.#{timestamp.strftime("%Y%m%d%H%M%S")}"
                 host = Setting.mail_from.to_s.gsub(%r{^.*@}, '')
                 host = "#{::Socket.gethostname}.redmine" if host.empty?
-                "<#{hash}@#{host}>"
+                "#{hash}@#{host}"
               end
-              private
               def message_id(object)
                 @message_id_object = object
               end
               def references(object)
                 @references_objects ||= []
                 @references_objects << object
               end
               def mylogger
                 Rails.logger
               end
             end
-            # Patch TMail so that message_id is not overwritten
-            module TMail
-              class Mail
-                def add_message_id( fqdn = nil )
-                  self.message_id ||= ::TMail::new_message_id(fqdn)
-                end
-              end
-            end

app/models/project.rb +4 0

             # Redmine - project management software
             # Copyright (C) 2006-2011  Jean-Philippe Lang
             #
             # This program is free software; you can redistribute it and/or
             # modify it under the terms of the GNU General Public License
             # as published by the Free Software Foundation; either version 2
             # of the License, or (at your option) any later version.
             #
             # This program is distributed in the hope that it will be useful,
             # but WITHOUT ANY WARRANTY; without even the implied warranty of
             # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
             # GNU General Public License for more details.
             #
             # You should have received a copy of the GNU General Public License
             # along with this program; if not, write to the Free Software
             # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
             class Project < ActiveRecord::Base
               include Redmine::SafeAttributes
               # Project statuses
               STATUS_ACTIVE     = 1
               STATUS_ARCHIVED   = 9
               # Maximum length for project identifiers
               IDENTIFIER_MAX_LENGTH = 100
               # Specific overidden Activities
               has_many :time_entry_activities
               has_many :members, :include => [:user, :roles], :conditions => "#{User.table_name}.type='User' AND #{User.table_name}.status=#{User::STATUS_ACTIVE}"
               has_many :memberships, :class_name => 'Member'
               has_many :member_principals, :class_name => 'Member',
                                            :include => :principal,
                                            :conditions => "#{Principal.table_name}.type='Group' OR (#{Principal.table_name}.type='User' AND #{Principal.table_name}.status=#{User::STATUS_ACTIVE})"
               has_many :users, :through => :members
               has_many :principals, :through => :member_principals, :source => :principal
               has_many :enabled_modules, :dependent => :delete_all
               has_and_belongs_to_many :trackers, :order => "#{Tracker.table_name}.position"
               has_many :issues, :dependent => :destroy, :include => [:status, :tracker]
               has_many :issue_changes, :through => :issues, :source => :journals
               has_many :versions, :dependent => :destroy, :order => "#{Version.table_name}.effective_date DESC, #{Version.table_name}.name DESC"
               has_many :time_entries, :dependent => :delete_all
               has_many :queries, :dependent => :delete_all
               has_many :documents, :dependent => :destroy
               has_many :news, :dependent => :destroy, :include => :author
               has_many :issue_categories, :dependent => :delete_all, :order => "#{IssueCategory.table_name}.name"
               has_many :boards, :dependent => :destroy, :order => "position ASC"
               has_one :repository, :conditions => ["is_default = ?", true]
               has_many :repositories, :dependent => :destroy
               has_many :changesets, :through => :repository
               has_one :wiki, :dependent => :destroy
               # Custom field for the project issues
               has_and_belongs_to_many :issue_custom_fields,
                                       :class_name => 'IssueCustomField',
                                       :order => "#{CustomField.table_name}.position",
                                       :join_table => "#{table_name_prefix}custom_fields_projects#{table_name_suffix}",
                                       :association_foreign_key => 'custom_field_id'
               acts_as_nested_set :order => 'name', :dependent => :destroy
               acts_as_attachable :view_permission => :view_files,
                                  :delete_permission => :manage_files
               acts_as_customizable
               acts_as_searchable :columns => ['name', 'identifier', 'description'], :project_key => 'id', :permission => nil
               acts_as_event :title => Proc.new {|o| "#{l(:label_project)}: #{o.name}"},
                             :url => Proc.new {|o| {:controller => 'projects', :action => 'show', :id => o}},
                             :author => nil
               attr_protected :status
               validates_presence_of :name, :identifier
               validates_uniqueness_of :identifier
               validates_associated :repository, :wiki
               validates_length_of :name, :maximum => 255
               validates_length_of :homepage, :maximum => 255
               validates_length_of :identifier, :in => 1..IDENTIFIER_MAX_LENGTH
               # donwcase letters, digits, dashes but not digits only
               validates_format_of :identifier, :with => /^(?!\d+$)[a-z0-9\-_]*$/, :if => Proc.new { |p| p.identifier_changed? }
               # reserved words
               validates_exclusion_of :identifier, :in => %w( new )
               before_destroy :delete_all_members
               named_scope :has_module, lambda { |mod| { :conditions => ["#{Project.table_name}.id IN (SELECT em.project_id FROM #{EnabledModule.table_name} em WHERE em.name=?)", mod.to_s] } }
               named_scope :active, { :conditions => "#{Project.table_name}.status = #{STATUS_ACTIVE}"}
               named_scope :status, lambda {|arg| arg.blank? ? {} : {:conditions => {:status => arg.to_i}} }
               named_scope :all_public, { :conditions => { :is_public => true } }
               named_scope :visible, lambda {|*args| {:conditions => Project.visible_condition(args.shift || User.current, *args) }}
               named_scope :allowed_to, lambda {|*args|
                 user = User.current
                 permission = nil
                 if args.first.is_a?(Symbol)
                   permission = args.shift
                 else
                   user = args.shift
                   permission = args.shift
                 end
                 { :conditions => Project.allowed_to_condition(user, permission, *args) }
               }
               named_scope :like, lambda {|arg|
                 if arg.blank?
                   {}
                 else
                   pattern = "%#{arg.to_s.strip.downcase}%"
                   {:conditions => ["LOWER(identifier) LIKE :p OR LOWER(name) LIKE :p", {:p => pattern}]}
                 end
               }
               def initialize(attributes=nil, *args)
                 super
                 initialized = (attributes || {}).stringify_keys
                 if !initialized.key?('identifier') && Setting.sequential_project_identifiers?
                   self.identifier = Project.next_identifier
                 end
                 if !initialized.key?('is_public')
                   self.is_public = Setting.default_projects_public?
                 end
                 if !initialized.key?('enabled_module_names')
                   self.enabled_module_names = Setting.default_projects_modules
                 end
                 if !initialized.key?('trackers') && !initialized.key?('tracker_ids')
                   self.trackers = Tracker.all
                 end
               end
               def identifier=(identifier)
                 super unless identifier_frozen?
               end
               def identifier_frozen?
                 errors[:identifier].nil? && !(new_record? || identifier.blank?)
               end
               # returns latest created projects
               # non public projects will be returned only if user is a member of those
               def self.latest(user=nil, count=5)
                 visible(user).find(:all, :limit => count, :order => "created_on DESC")
               end
               # Returns true if the project is visible to +user+ or to the current user.
               def visible?(user=User.current)
                 user.allowed_to?(:view_project, self)
               end
               # Returns a SQL conditions string used to find all projects visible by the specified user.
               #
               # Examples:
               #   Project.visible_condition(admin)        => "projects.status = 1"
               #   Project.visible_condition(normal_user)  => "((projects.status = 1) AND (projects.is_public = 1 OR projects.id IN (1,3,4)))"
               #   Project.visible_condition(anonymous)    => "((projects.status = 1) AND (projects.is_public = 1))"
               def self.visible_condition(user, options={})
                 allowed_to_condition(user, :view_project, options)
               end
               # Returns a SQL conditions string used to find all projects for which +user+ has the given +permission+
               #
               # Valid options:
               # * :project => limit the condition to project
               # * :with_subprojects => limit the condition to project and its subprojects
               # * :member => limit the condition to the user projects
               def self.allowed_to_condition(user, permission, options={})
                 base_statement = "#{Project.table_name}.status=#{Project::STATUS_ACTIVE}"
                 if perm = Redmine::AccessControl.permission(permission)
                   unless perm.project_module.nil?
                     # If the permission belongs to a project module, make sure the module is enabled
                     base_statement << " AND #{Project.table_name}.id IN (SELECT em.project_id FROM #{EnabledModule.table_name} em WHERE em.name='#{perm.project_module}')"
                   end
                 end
                 if options[:project]
                   project_statement = "#{Project.table_name}.id = #{options[:project].id}"
                   project_statement << " OR (#{Project.table_name}.lft > #{options[:project].lft} AND #{Project.table_name}.rgt < #{options[:project].rgt})" if options[:with_subprojects]
                   base_statement = "(#{project_statement}) AND (#{base_statement})"
                 end
                 if user.admin?
                   base_statement
                 else
                   statement_by_role = {}
                   unless options[:member]
                     role = user.logged? ? Role.non_member : Role.anonymous
                     if role.allowed_to?(permission)
                       statement_by_role[role] = "#{Project.table_name}.is_public = #{connection.quoted_true}"
                     end
                   end
                   if user.logged?
                     user.projects_by_role.each do |role, projects|
                       if role.allowed_to?(permission)
                         statement_by_role[role] = "#{Project.table_name}.id IN (#{projects.collect(&:id).join(',')})"
                       end
                     end
                   end
                   if statement_by_role.empty?
                     "1=0"
                   else
                     if block_given?
                       statement_by_role.each do |role, statement|
                         if s = yield(role, user)
                           statement_by_role[role] = "(#{statement} AND (#{s}))"
                         end
                       end
                     end
                     "((#{base_statement}) AND (#{statement_by_role.values.join(' OR ')}))"
                   end
                 end
               end
               # Returns the Systemwide and project specific activities
               def activities(include_inactive=false)
                 if include_inactive
                   return all_activities
                 else
                   return active_activities
                 end
               end
               # Will create a new Project specific Activity or update an existing one
               #
               # This will raise a ActiveRecord::Rollback if the TimeEntryActivity
               # does not successfully save.
               def update_or_create_time_entry_activity(id, activity_hash)
                 if activity_hash.respond_to?(:has_key?) && activity_hash.has_key?('parent_id')
                   self.create_time_entry_activity_if_needed(activity_hash)
                 else
                   activity = project.time_entry_activities.find_by_id(id.to_i)
                   activity.update_attributes(activity_hash) if activity
                 end
               end
               # Create a new TimeEntryActivity if it overrides a system TimeEntryActivity
               #
               # This will raise a ActiveRecord::Rollback if the TimeEntryActivity
               # does not successfully save.
               def create_time_entry_activity_if_needed(activity)
                 if activity['parent_id']
                   parent_activity = TimeEntryActivity.find(activity['parent_id'])
                   activity['name'] = parent_activity.name
                   activity['position'] = parent_activity.position
                   if Enumeration.overridding_change?(activity, parent_activity)
                     project_activity = self.time_entry_activities.create(activity)
                     if project_activity.new_record?
                       raise ActiveRecord::Rollback, "Overridding TimeEntryActivity was not successfully saved"
                     else
                       self.time_entries.update_all("activity_id = #{project_activity.id}", ["activity_id = ?", parent_activity.id])
                     end
                   end
                 end
               end
               # Returns a :conditions SQL string that can be used to find the issues associated with this project.
               #
               # Examples:
               #   project.project_condition(true)  => "(projects.id = 1 OR (projects.lft > 1 AND projects.rgt < 10))"
               #   project.project_condition(false) => "projects.id = 1"
               def project_condition(with_subprojects)
                 cond = "#{Project.table_name}.id = #{id}"
                 cond = "(#{cond} OR (#{Project.table_name}.lft > #{lft} AND #{Project.table_name}.rgt < #{rgt}))" if with_subprojects
                 cond
               end
               def self.find(*args)
                 if args.first && args.first.is_a?(String) && !args.first.match(/^\d*$/)
                   project = find_by_identifier(*args)
                   raise ActiveRecord::RecordNotFound, "Couldn't find Project with identifier=#{args.first}" if project.nil?
                   project
                 else
                   super
                 end
               end
+              def self.find_by_param(*args)
+                self.find(*args)
+              end
               def reload(*args)
                 @shared_versions = nil
                 @rolled_up_versions = nil
                 @rolled_up_trackers = nil
                 @all_issue_custom_fields = nil
                 @all_time_entry_custom_fields = nil
                 @to_param = nil
                 @allowed_parents = nil
                 @allowed_permissions = nil
                 @actions_allowed = nil
                 super
               end
               def to_param
                 # id is used for projects with a numeric identifier (compatibility)
                 @to_param ||= (identifier.to_s =~ %r{^\d*$} ? id.to_s : identifier)
               end
               def active?
                 self.status == STATUS_ACTIVE
               end
               def archived?
                 self.status == STATUS_ARCHIVED
               end
               # Archives the project and its descendants
               def archive
                 # Check that there is no issue of a non descendant project that is assigned
                 # to one of the project or descendant versions
                 v_ids = self_and_descendants.collect {|p| p.version_ids}.flatten
                 if v_ids.any? && Issue.find(:first, :include => :project,
                                                     :conditions => ["(#{Project.table_name}.lft < ? OR #{Project.table_name}.rgt > ?)" +
                                                                     " AND #{Issue.table_name}.fixed_version_id IN (?)", lft, rgt, v_ids])
                   return false
                 end
                 Project.transaction do
                   archive!
                 end
                 true
               end
               # Unarchives the project
               # All its ancestors must be active
               def unarchive
                 return false if ancestors.detect {|a| !a.active?}
                 update_attribute :status, STATUS_ACTIVE
               end
               # Returns an array of projects the project can be moved to
               # by the current user
               def allowed_parents
                 return @allowed_parents if @allowed_parents
                 @allowed_parents = Project.find(:all, :conditions => Project.allowed_to_condition(User.current, :add_subprojects))
                 @allowed_parents = @allowed_parents - self_and_descendants
                 if User.current.allowed_to?(:add_project, nil, :global => true) || (!new_record? && parent.nil?)
                   @allowed_parents << nil
                 end
                 unless parent.nil? || @allowed_parents.empty? || @allowed_parents.include?(parent)
                   @allowed_parents << parent
                 end
                 @allowed_parents
               end
               # Sets the parent of the project with authorization check
               def set_allowed_parent!(p)
                 unless p.nil? || p.is_a?(Project)
                   if p.to_s.blank?
                     p = nil
                   else
                     p = Project.find_by_id(p)
                     return false unless p
                   end
                 end
                 if p.nil?
                   if !new_record? && allowed_parents.empty?
                     return false
                   end
                 elsif !allowed_parents.include?(p)
                   return false
                 end
                 set_parent!(p)
               end
               # Sets the parent of the project
               # Argument can be either a Project, a String, a Fixnum or nil
               def set_parent!(p)
                 unless p.nil? || p.is_a?(Project)
                   if p.to_s.blank?
                     p = nil
                   else
                     p = Project.find_by_id(p)
                     return false unless p
                   end
                 end
                 if p == parent && !p.nil?
                   # Nothing to do
                   true
                 elsif p.nil? || (p.active? && move_possible?(p))
                   # Insert the project so that target's children or root projects stay alphabetically sorted
                   sibs = (p.nil? ? self.class.roots : p.children)
                   to_be_inserted_before = sibs.detect {|c| c.name.to_s.downcase > name.to_s.downcase }
                   if to_be_inserted_before
                     move_to_left_of(to_be_inserted_before)
                   elsif p.nil?
                     if sibs.empty?
                       # move_to_root adds the project in first (ie. left) position
                       move_to_root
                     else
                       move_to_right_of(sibs.last) unless self == sibs.last
                     end
                   else
                     # move_to_child_of adds the project in last (ie.right) position
                     move_to_child_of(p)
                   end
                   Issue.update_versions_from_hierarchy_change(self)
                   true
                 else
                   # Can not move to the given target
                   false
                 end
               end
               # Returns an array of the trackers used by the project and its active sub projects
               def rolled_up_trackers
                 @rolled_up_trackers ||=
                   Tracker.find(:all, :joins => :projects,
                                      :select => "DISTINCT #{Tracker.table_name}.*",
                                      :conditions => ["#{Project.table_name}.lft >= ? AND #{Project.table_name}.rgt <= ? AND #{Project.table_name}.status = #{STATUS_ACTIVE}", lft, rgt],
                                      :order => "#{Tracker.table_name}.position")
               end
               # Closes open and locked project versions that are completed
               def close_completed_versions
                 Version.transaction do
                   versions.find(:all, :conditions => {:status => %w(open locked)}).each do |version|
                     if version.completed?
                       version.update_attribute(:status, 'closed')
                     end
                   end
                 end
               end
               # Returns a scope of the Versions on subprojects
               def rolled_up_versions
                 @rolled_up_versions ||=
                   Version.scoped(:include => :project,
                                  :conditions => ["#{Project.table_name}.lft >= ? AND #{Project.table_name}.rgt <= ? AND #{Project.table_name}.status = #{STATUS_ACTIVE}", lft, rgt])
               end
               # Returns a scope of the Versions used by the project
               def shared_versions
                 if new_record?
                   Version.scoped(:include => :project,
                                  :conditions => "#{Project.table_name}.status = #{Project::STATUS_ACTIVE} AND #{Version.table_name}.sharing = 'system'")
                 else
                   @shared_versions ||= begin
                     r = root? ? self : root
                     Version.scoped(:include => :project,
                                    :conditions => "#{Project.table_name}.id = #{id}" +
                                                   " OR (#{Project.table_name}.status = #{Project::STATUS_ACTIVE} AND (" +
                                                       " #{Version.table_name}.sharing = 'system'" +
                                                       " OR (#{Project.table_name}.lft >= #{r.lft} AND #{Project.table_name}.rgt <= #{r.rgt} AND #{Version.table_name}.sharing = 'tree')" +
                                                       " OR (#{Project.table_name}.lft < #{lft} AND #{Project.table_name}.rgt > #{rgt} AND #{Version.table_name}.sharing IN ('hierarchy', 'descendants'))" +
                                                       " OR (#{Project.table_name}.lft > #{lft} AND #{Project.table_name}.rgt < #{rgt} AND #{Version.table_name}.sharing = 'hierarchy')" +
                                                       "))")
                   end
                 end
               end
               # Returns a hash of project users grouped by role
               def users_by_role
                 members.find(:all, :include => [:user, :roles]).inject({}) do |h, m|
                   m.roles.each do |r|
                     h[r] ||= []
                     h[r] << m.user
                   end
                   h
                 end
               end
               # Deletes all project's members
               def delete_all_members
                 me, mr = Member.table_name, MemberRole.table_name
                 connection.delete("DELETE FROM #{mr} WHERE #{mr}.member_id IN (SELECT #{me}.id FROM #{me} WHERE #{me}.project_id = #{id})")
                 Member.delete_all(['project_id = ?', id])
               end
               # Users/groups issues can be assigned to
               def assignable_users
                 assignable = Setting.issue_group_assignment? ? member_principals : members
                 assignable.select {|m| m.roles.detect {|role| role.assignable?}}.collect {|m| m.principal}.sort
               end
               # Returns the mail adresses of users that should be always notified on project events
               def recipients
                 notified_users.collect {|user| user.mail}
               end
               # Returns the users that should be notified on project events
               def notified_users
                 # TODO: User part should be extracted to User#notify_about?
                 members.select {|m| m.mail_notification? || m.user.mail_notification == 'all'}.collect {|m| m.user}
               end
               # Returns an array of all custom fields enabled for project issues
               # (explictly associated custom fields and custom fields enabled for all projects)
               def all_issue_custom_fields
                 @all_issue_custom_fields ||= (IssueCustomField.for_all + issue_custom_fields).uniq.sort
               end
               # Returns an array of all custom fields enabled for project time entries
               # (explictly associated custom fields and custom fields enabled for all projects)
               def all_time_entry_custom_fields
                 @all_time_entry_custom_fields ||= (TimeEntryCustomField.for_all + time_entry_custom_fields).uniq.sort
               end
               def project
                 self
               end
               def <=>(project)
                 name.downcase <=> project.name.downcase
               end
               def to_s
                 name
               end
               # Returns a short description of the projects (first lines)
               def short_description(length = 255)
                 description.gsub(/^(.{#{length}}[^\n\r]*).*$/m, '\1...').strip if description
               end
               def css_classes
                 s = 'project'
                 s << ' root' if root?
                 s << ' child' if child?
                 s << (leaf? ? ' leaf' : ' parent')
                 s
               end
               # The earliest start date of a project, based on it's issues and versions
               def start_date
                 [
                  issues.minimum('start_date'),
                  shared_versions.collect(&:effective_date),
                  shared_versions.collect(&:start_date)
                 ].flatten.compact.min
               end
               # The latest due date of an issue or version
               def due_date
                 [
                  issues.maximum('due_date'),
                  shared_versions.collect(&:effective_date),
                  shared_versions.collect {|v| v.fixed_issues.maximum('due_date')}
                 ].flatten.compact.max
               end
               def overdue?
                 active? && !due_date.nil? && (due_date < Date.today)
               end
               # Returns the percent completed for this project, based on the
               # progress on it's versions.
               def completed_percent(options={:include_subprojects => false})
                 if options.delete(:include_subprojects)
                   total = self_and_descendants.collect(&:completed_percent).sum
                   total / self_and_descendants.count
                 else
                   if versions.count > 0
                     total = versions.collect(&:completed_pourcent).sum
                     total / versions.count
                   else
                   end
                 end
               end
               # Return true if this project is allowed to do the specified action.
               # action can be:
               # * a parameter-like Hash (eg. :controller => 'projects', :action => 'edit')
               # * a permission Symbol (eg. :edit_project)
               def allows_to?(action)
                 if action.is_a? Hash
                   allowed_actions.include? "#{action[:controller]}/#{action[:action]}"
                 else
                   allowed_permissions.include? action
                 end
               end
               def module_enabled?(module_name)
                 module_name = module_name.to_s
                 enabled_modules.detect {|m| m.name == module_name}
               end
               def enabled_module_names=(module_names)
                 if module_names && module_names.is_a?(Array)
                   module_names = module_names.collect(&:to_s).reject(&:blank?)
                   self.enabled_modules = module_names.collect {|name| enabled_modules.detect {|mod| mod.name == name} || EnabledModule.new(:name => name)}
                 else
                   enabled_modules.clear
                 end
               end
               # Returns an array of the enabled modules names
               def enabled_module_names
                 enabled_modules.collect(&:name)
               end
               # Enable a specific module
               #
               # Examples:
               #   project.enable_module!(:issue_tracking)
               #   project.enable_module!("issue_tracking")
               def enable_module!(name)
                 enabled_modules << EnabledModule.new(:name => name.to_s) unless module_enabled?(name)
               end
               # Disable a module if it exists
               #
               # Examples:
               #   project.disable_module!(:issue_tracking)
               #   project.disable_module!("issue_tracking")
               #   project.disable_module!(project.enabled_modules.first)
               def disable_module!(target)
                 target = enabled_modules.detect{|mod| target.to_s == mod.name} unless enabled_modules.include?(target)
                 target.destroy unless target.blank?
               end
               safe_attributes 'name',
                 'description',
                 'homepage',
                 'is_public',
                 'identifier',
                 'custom_field_values',
                 'custom_fields',
                 'tracker_ids',
                 'issue_custom_field_ids'
               safe_attributes 'enabled_module_names',
                 :if => lambda {|project, user| project.new_record? || user.allowed_to?(:select_project_modules, project) }
               # Returns an array of projects that are in this project's hierarchy
               #
               # Example: parents, children, siblings
               def hierarchy
                 parents = project.self_and_ancestors || []
                 descendants = project.descendants || []
                 project_hierarchy = parents | descendants # Set union
               end
               # Returns an auto-generated project identifier based on the last identifier used
               def self.next_identifier
                 p = Project.find(:first, :order => 'created_on DESC')
                 p.nil? ? nil : p.identifier.to_s.succ
               end
               # Copies and saves the Project instance based on the +project+.
               # Duplicates the source project's:
               # * Wiki
               # * Versions
               # * Categories
               # * Issues
               # * Members
               # * Queries
               #
               # Accepts an +options+ argument to specify what to copy
               #
               # Examples:
               #   project.copy(1)                                    # => copies everything
               #   project.copy(1, :only => 'members')                # => copies members only
               #   project.copy(1, :only => ['members', 'versions'])  # => copies members and versions
               def copy(project, options={})
                 project = project.is_a?(Project) ? project : Project.find(project)
                 to_be_copied = %w(wiki versions issue_categories issues members queries boards)
                 to_be_copied = to_be_copied & options[:only].to_a unless options[:only].nil?
                 Project.transaction do
                   if save
                     reload
                     to_be_copied.each do |name|
                       send "copy_#{name}", project
                     end
                     Redmine::Hook.call_hook(:model_project_copy_before_save, :source_project => project, :destination_project => self)
                     save
                   end
                 end
               end
               # Copies +project+ and returns the new instance.  This will not save
               # the copy
               def self.copy_from(project)
                 begin
                   project = project.is_a?(Project) ? project : Project.find(project)
                   if project
                     # clear unique attributes
                     attributes = project.attributes.dup.except('id', 'name', 'identifier', 'status', 'parent_id', 'lft', 'rgt')
                     copy = Project.new(attributes)
                     copy.enabled_modules = project.enabled_modules
                     copy.trackers = project.trackers
                     copy.custom_values = project.custom_values.collect {|v| v.clone}
                     copy.issue_custom_fields = project.issue_custom_fields
                     return copy
                   else
                     return nil
                   end
                 rescue ActiveRecord::RecordNotFound
                   return nil
                 end
               end
               # Yields the given block for each project with its level in the tree
               def self.project_tree(projects, &block)
                 ancestors = []
                 projects.sort_by(&:lft).each do |project|
                   while (ancestors.any? && !project.is_descendant_of?(ancestors.last))
                     ancestors.pop
                   end
                   yield project, ancestors.size
                   ancestors << project
                 end
               end
               private
               # Copies wiki from +project+
               def copy_wiki(project)
                 # Check that the source project has a wiki first
                 unless project.wiki.nil?
                   self.wiki ||= Wiki.new
                   wiki.attributes = project.wiki.attributes.dup.except("id", "project_id")
                   wiki_pages_map = {}
                   project.wiki.pages.each do |page|
                     # Skip pages without content
                     next if page.content.nil?
                     new_wiki_content = WikiContent.new(page.content.attributes.dup.except("id", "page_id", "updated_on"))
                     new_wiki_page = WikiPage.new(page.attributes.dup.except("id", "wiki_id", "created_on", "parent_id"))
                     new_wiki_page.content = new_wiki_content
                     wiki.pages << new_wiki_page
                     wiki_pages_map[page.id] = new_wiki_page
                   end
                   wiki.save
                   # Reproduce page hierarchy
                   project.wiki.pages.each do |page|
                     if page.parent_id && wiki_pages_map[page.id]
                       wiki_pages_map[page.id].parent = wiki_pages_map[page.parent_id]
                       wiki_pages_map[page.id].save
                     end
                   end
                 end
               end
               # Copies versions from +project+
               def copy_versions(project)
                 project.versions.each do |version|
                   new_version = Version.new
                   new_version.attributes = version.attributes.dup.except("id", "project_id", "created_on", "updated_on")
                   self.versions << new_version
                 end
               end
               # Copies issue categories from +project+
               def copy_issue_categories(project)
                 project.issue_categories.each do |issue_category|
                   new_issue_category = IssueCategory.new
                   new_issue_category.attributes = issue_category.attributes.dup.except("id", "project_id")
                   self.issue_categories << new_issue_category
                 end
               end
               # Copies issues from +project+
               # Note: issues assigned to a closed version won't be copied due to validation rules
               def copy_issues(project)
                 # Stores the source issue id as a key and the copied issues as the
                 # value.  Used to map the two togeather for issue relations.
                 issues_map = {}
                 # Get issues sorted by root_id, lft so that parent issues
                 # get copied before their children
                 project.issues.find(:all, :order => 'root_id, lft').each do |issue|
                   new_issue = Issue.new
                   new_issue.copy_from(issue)
                   new_issue.project = self
                   # Reassign fixed_versions by name, since names are unique per
                   # project and the versions for self are not yet saved
                   if issue.fixed_version
                     new_issue.fixed_version = self.versions.select {|v| v.name == issue.fixed_version.name}.first
                   end
                   # Reassign the category by name, since names are unique per
                   # project and the categories for self are not yet saved
                   if issue.category
                     new_issue.category = self.issue_categories.select {|c| c.name == issue.category.name}.first
                   end
                   # Parent issue
                   if issue.parent_id
                     if copied_parent = issues_map[issue.parent_id]
                       new_issue.parent_issue_id = copied_parent.id
                     end
                   end
                   self.issues << new_issue
                   if new_issue.new_record?
                     logger.info "Project#copy_issues: issue ##{issue.id} could not be copied: #{new_issue.errors.full_messages}" if logger && logger.info
                   else
                     issues_map[issue.id] = new_issue unless new_issue.new_record?
                   end
                 end
                 # Relations after in case issues related each other
                 project.issues.each do |issue|
                   new_issue = issues_map[issue.id]
                   unless new_issue
                     # Issue was not copied
                     next
                   end
                   # Relations
                   issue.relations_from.each do |source_relation|
                     new_issue_relation = IssueRelation.new
                     new_issue_relation.attributes = source_relation.attributes.dup.except("id", "issue_from_id", "issue_to_id")
                     new_issue_relation.issue_to = issues_map[source_relation.issue_to_id]
                     if new_issue_relation.issue_to.nil? && Setting.cross_project_issue_relations?
                       new_issue_relation.issue_to = source_relation.issue_to
                     end
                     new_issue.relations_from << new_issue_relation
                   end
                   issue.relations_to.each do |source_relation|
                     new_issue_relation = IssueRelation.new
                     new_issue_relation.attributes = source_relation.attributes.dup.except("id", "issue_from_id", "issue_to_id")
                     new_issue_relation.issue_from = issues_map[source_relation.issue_from_id]
                     if new_issue_relation.issue_from.nil? && Setting.cross_project_issue_relations?
                       new_issue_relation.issue_from = source_relation.issue_from
                     end
                     new_issue.relations_to << new_issue_relation
                   end
                 end
               end
               # Copies members from +project+
               def copy_members(project)
                 # Copy users first, then groups to handle members with inherited and given roles
                 members_to_copy = []
                 members_to_copy += project.memberships.select {|m| m.principal.is_a?(User)}
                 members_to_copy += project.memberships.select {|m| !m.principal.is_a?(User)}
                 members_to_copy.each do |member|
                   new_member = Member.new
                   new_member.attributes = member.attributes.dup.except("id", "project_id", "created_on")
                   # only copy non inherited roles
                   # inherited roles will be added when copying the group membership
                   role_ids = member.member_roles.reject(&:inherited?).collect(&:role_id)
                   next if role_ids.empty?
                   new_member.role_ids = role_ids
                   new_member.project = self
                   self.members << new_member
                 end
               end
               # Copies queries from +project+
               def copy_queries(project)
                 project.queries.each do |query|
                   new_query = ::Query.new
                   new_query.attributes = query.attributes.dup.except("id", "project_id", "sort_criteria")
                   new_query.sort_criteria = query.sort_criteria if query.sort_criteria
                   new_query.project = self
                   new_query.user_id = query.user_id
                   self.queries << new_query
                 end
               end
               # Copies boards from +project+
               def copy_boards(project)
                 project.boards.each do |board|
                   new_board = Board.new
                   new_board.attributes = board.attributes.dup.except("id", "project_id", "topics_count", "messages_count", "last_message_id")
                   new_board.project = self
                   self.boards << new_board
                 end
               end
               def allowed_permissions
                 @allowed_permissions ||= begin
                   module_names = enabled_modules.all(:select => :name).collect {|m| m.name}
                   Redmine::AccessControl.modules_permissions(module_names).collect {|p| p.name}
                 end
               end
               def allowed_actions
                 @actions_allowed ||= allowed_permissions.inject([]) { |actions, permission| actions += Redmine::AccessControl.allowed_actions(permission) }.flatten
               end
               # Returns all the active Systemwide and project specific activities
               def active_activities
                 overridden_activity_ids = self.time_entry_activities.collect(&:parent_id)
                 if overridden_activity_ids.empty?
                   return TimeEntryActivity.shared.active
                 else
                   return system_activities_and_project_overrides
                 end
               end
               # Returns all the Systemwide and project specific activities
               # (inactive and active)
               def all_activities
                 overridden_activity_ids = self.time_entry_activities.collect(&:parent_id)
                 if overridden_activity_ids.empty?
                   return TimeEntryActivity.shared
                 else
                   return system_activities_and_project_overrides(true)
                 end
               end
               # Returns the systemwide active activities merged with the project specific overrides
               def system_activities_and_project_overrides(include_inactive=false)
                 if include_inactive
                   return TimeEntryActivity.shared.
                     find(:all,
                          :conditions => ["id NOT IN (?)", self.time_entry_activities.collect(&:parent_id)]) +
                     self.time_entry_activities
                 else
                   return TimeEntryActivity.shared.active.
                     find(:all,
                          :conditions => ["id NOT IN (?)", self.time_entry_activities.collect(&:parent_id)]) +
                     self.time_entry_activities.active
                 end
               end
               # Archives subprojects recursively
               def archive!
                 children.each do |subproject|
                   subproject.send :archive!
                 end
                 update_attribute :status, STATUS_ARCHIVED
               end
             end

app/models/repository.rb +2 -2

             # Redmine - project management software
             # Copyright (C) 2006-2011  Jean-Philippe Lang
             #
             # This program is free software; you can redistribute it and/or
             # modify it under the terms of the GNU General Public License
             # as published by the Free Software Foundation; either version 2
             # of the License, or (at your option) any later version.
             #
             # This program is distributed in the hope that it will be useful,
             # but WITHOUT ANY WARRANTY; without even the implied warranty of
             # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
             # GNU General Public License for more details.
             #
             # You should have received a copy of the GNU General Public License
             # along with this program; if not, write to the Free Software
             # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
             class ScmFetchError < Exception; end
             class Repository < ActiveRecord::Base
               include Redmine::Ciphering
               belongs_to :project
               has_many :changesets, :order => "#{Changeset.table_name}.committed_on DESC, #{Changeset.table_name}.id DESC"
               has_many :changes, :through => :changesets
               serialize :extra_info
               before_save :check_default
               # Raw SQL to delete changesets and changes in the database
               # has_many :changesets, :dependent => :destroy is too slow for big repositories
               before_destroy :clear_changesets
               validates_length_of :password, :maximum => 255, :allow_nil => true
               validates_length_of :identifier, :maximum => 255, :allow_blank => true
               validates_presence_of :identifier, :unless => Proc.new { |r| r.is_default? || r.set_as_default? }
               validates_uniqueness_of :identifier, :scope => :project_id, :allow_blank => true
               validates_exclusion_of :identifier, :in => %w(show entry raw changes annotate diff show stats graph)
               # donwcase letters, digits, dashes but not digits only
               validates_format_of :identifier, :with => /^(?!\d+$)[a-z0-9\-]*$/, :allow_blank => true
               # Checks if the SCM is enabled when creating a repository
               validate :repo_create_validation, :on => :create
               def repo_create_validation
                 unless Setting.enabled_scm.include?(self.class.name.demodulize)
                   errors.add(:type, :invalid)
                 end
               end
               def self.human_attribute_name(attribute_key_name, *args)
                 attr_name = attribute_key_name.to_s
                 if attr_name == "log_encoding"
                   attr_name = "commit_logs_encoding"
                 end
                 super(attr_name, *args)
               end
               alias :attributes_without_extra_info= :attributes=
-              def attributes=(new_attributes, guard_protected_attributes = true)
+              def attributes=(new_attributes)
                 return if new_attributes.nil?
                 attributes = new_attributes.dup
                 attributes.stringify_keys!
                 p       = {}
                 p_extra = {}
                 attributes.each do |k, v|
                   if k =~ /^extra_/
                     p_extra[k] = v
                   else
                     p[k] = v
                   end
                 end
-                send :attributes_without_extra_info=, p, guard_protected_attributes
+                send :attributes_without_extra_info=, p
                 if p_extra.keys.any?
                   merge_extra_info(p_extra)
                 end
               end
               # Removes leading and trailing whitespace
               def url=(arg)
                 write_attribute(:url, arg ? arg.to_s.strip : nil)
               end
               # Removes leading and trailing whitespace
               def root_url=(arg)
                 write_attribute(:root_url, arg ? arg.to_s.strip : nil)
               end
               def password
                 read_ciphered_attribute(:password)
               end
               def password=(arg)
                 write_ciphered_attribute(:password, arg)
               end
               def scm_adapter
                 self.class.scm_adapter_class
               end
               def scm
                 unless @scm
                   @scm = self.scm_adapter.new(url, root_url,
                                               login, password, path_encoding)
                   if root_url.blank? && @scm.root_url.present?
                     update_attribute(:root_url, @scm.root_url)
                   end
                 end
                 @scm
               end
               def scm_name
                 self.class.scm_name
               end
               def name
                 if identifier.present?
                   identifier
                 elsif is_default?
                   l(:field_repository_is_default)
                 else
                   scm_name
                 end
               end
               def identifier_param
                 if is_default?
                   nil
                 elsif identifier.present?
                   identifier
                 else
                   id.to_s
                 end
               end
               def <=>(repository)
                 if is_default?
                   -1
                 elsif repository.is_default?
                 else
                   identifier <=> repository.identifier
                 end
               end
               def self.find_by_identifier_param(param)
                 if param.to_s =~ /^\d+$/
                   find_by_id(param)
                 else
                   find_by_identifier(param)
                 end
               end
               def merge_extra_info(arg)
                 h = extra_info || {}
                 return h if arg.nil?
                 h.merge!(arg)
                 write_attribute(:extra_info, h)
               end
               def report_last_commit
                 true
               end
               def supports_cat?
                 scm.supports_cat?
               end
               def supports_annotate?
                 scm.supports_annotate?
               end
               def supports_all_revisions?
                 true
               end
               def supports_directory_revisions?
                 false
               end
               def supports_revision_graph?
                 false
               end
               def entry(path=nil, identifier=nil)
                 scm.entry(path, identifier)
               end
               def entries(path=nil, identifier=nil)
                 scm.entries(path, identifier)
               end
               def branches
                 scm.branches
               end
               def tags
                 scm.tags
               end
               def default_branch
                 nil
               end
               def properties(path, identifier=nil)
                 scm.properties(path, identifier)
               end
               def cat(path, identifier=nil)
                 scm.cat(path, identifier)
               end
               def diff(path, rev, rev_to)
                 scm.diff(path, rev, rev_to)
               end
               def diff_format_revisions(cs, cs_to, sep=':')
                 text = ""
                 text << cs_to.format_identifier + sep if cs_to
                 text << cs.format_identifier if cs
                 text
               end
               # Returns a path relative to the url of the repository
               def relative_path(path)
                 path
               end
               # Finds and returns a revision with a number or the beginning of a hash
               def find_changeset_by_name(name)
                 return nil if name.blank?
                 s = name.to_s
                 changesets.find(:first, :conditions => (s.match(/^\d*$/) ?
                       ["revision = ?", s] : ["revision LIKE ?", s + '%']))
               end
               def latest_changeset
                 @latest_changeset ||= changesets.find(:first)
               end
               # Returns the latest changesets for +path+
               # Default behaviour is to search in cached changesets
               def latest_changesets(path, rev, limit=10)
                 if path.blank?
                   changesets.find(
                      :all,
                      :include => :user,
                      :order => "#{Changeset.table_name}.committed_on DESC, #{Changeset.table_name}.id DESC",
                      :limit => limit)
                 else
                   changes.find(
                      :all,
                      :include => {:changeset => :user},
                      :conditions => ["path = ?", path.with_leading_slash],
                      :order => "#{Changeset.table_name}.committed_on DESC, #{Changeset.table_name}.id DESC",
                      :limit => limit
                    ).collect(&:changeset)
                 end
               end
               def scan_changesets_for_issue_ids
                 self.changesets.each(&:scan_comment_for_issue_ids)
               end
               # Returns an array of committers usernames and associated user_id
               def committers
                 @committers ||= Changeset.connection.select_rows(
                      "SELECT DISTINCT committer, user_id FROM #{Changeset.table_name} WHERE repository_id = #{id}")
               end
               # Maps committers username to a user ids
               def committer_ids=(h)
                 if h.is_a?(Hash)
                   committers.each do |committer, user_id|
                     new_user_id = h[committer]
                     if new_user_id && (new_user_id.to_i != user_id.to_i)
                       new_user_id = (new_user_id.to_i > 0 ? new_user_id.to_i : nil)
                       Changeset.update_all(
                            "user_id = #{ new_user_id.nil? ? 'NULL' : new_user_id }",
                            ["repository_id = ? AND committer = ?", id, committer])
                     end
                   end
                   @committers            = nil
                   @found_committer_users = nil
                   true
                 else
                   false
                 end
               end
               # Returns the Redmine User corresponding to the given +committer+
               # It will return nil if the committer is not yet mapped and if no User
               # with the same username or email was found
               def find_committer_user(committer)
                 unless committer.blank?
                   @found_committer_users ||= {}
                   return @found_committer_users[committer] if @found_committer_users.has_key?(committer)
                   user = nil
                   c = changesets.find(:first, :conditions => {:committer => committer}, :include => :user)
                   if c && c.user
                     user = c.user
                   elsif committer.strip =~ /^([^<]+)(<(.*)>)?$/
                     username, email = $1.strip, $3
                     u = User.find_by_login(username)
                     u ||= User.find_by_mail(email) unless email.blank?
                     user = u
                   end
                   @found_committer_users[committer] = user
                   user
                 end
               end
               def repo_log_encoding
                 encoding = log_encoding.to_s.strip
                 encoding.blank? ? 'UTF-8' : encoding
               end
               # Fetches new changesets for all repositories of active projects
               # Can be called periodically by an external script
               # eg. ruby script/runner "Repository.fetch_changesets"
               def self.fetch_changesets
                 Project.active.has_module(:repository).all.each do |project|
                   project.repositories.each do |repository|
                     begin
                       repository.fetch_changesets
                     rescue Redmine::Scm::Adapters::CommandFailed => e
                       logger.error "scm: error during fetching changesets: #{e.message}"
                     end
                   end
                 end
               end
               # scan changeset comments to find related and fixed issues for all repositories
               def self.scan_changesets_for_issue_ids
                 find(:all).each(&:scan_changesets_for_issue_ids)
               end
               def self.scm_name
                 'Abstract'
               end
               def self.available_scm
                 subclasses.collect {|klass| [klass.scm_name, klass.name]}
               end
               def self.factory(klass_name, *args)
                 klass = "Repository::#{klass_name}".constantize
                 klass.new(*args)
               rescue
                 nil
               end
               def self.scm_adapter_class
                 nil
               end
               def self.scm_command
                 ret = ""
                 begin
                   ret = self.scm_adapter_class.client_command if self.scm_adapter_class
                 rescue Exception => e
                   logger.error "scm: error during get command: #{e.message}"
                 end
                 ret
               end
               def self.scm_version_string
                 ret = ""
                 begin
                   ret = self.scm_adapter_class.client_version_string if self.scm_adapter_class
                 rescue Exception => e
                   logger.error "scm: error during get version string: #{e.message}"
                 end
                 ret
               end
               def self.scm_available
                 ret = false
                 begin
                   ret = self.scm_adapter_class.client_available if self.scm_adapter_class
                 rescue Exception => e
                   logger.error "scm: error during get scm available: #{e.message}"
                 end
                 ret
               end
               def set_as_default?
                 new_record? && project && !Repository.first(:conditions => {:project_id => project.id})
               end
               protected
               def check_default
                 if !is_default? && set_as_default?
                   self.is_default = true
                 end
                 if is_default? && is_default_changed?
                   Repository.update_all(["is_default = ?", false], ["project_id = ?", project_id])
                 end
               end
               private
               # Deletes repository data
               def clear_changesets
                 cs = Changeset.table_name
                 ch = Change.table_name
                 ci = "#{table_name_prefix}changesets_issues#{table_name_suffix}"
                 cp = "#{table_name_prefix}changeset_parents#{table_name_suffix}"
                 connection.delete("DELETE FROM #{ch} WHERE #{ch}.changeset_id IN (SELECT #{cs}.id FROM #{cs} WHERE #{cs}.repository_id = #{id})")
                 connection.delete("DELETE FROM #{ci} WHERE #{ci}.changeset_id IN (SELECT #{cs}.id FROM #{cs} WHERE #{cs}.repository_id = #{id})")
                 connection.delete("DELETE FROM #{cp} WHERE #{cp}.changeset_id IN (SELECT #{cs}.id FROM #{cs} WHERE #{cs}.repository_id = #{id})")
                 connection.delete("DELETE FROM #{cs} WHERE #{cs}.repository_id = #{id}")
               end
             end

app/models/role.rb +1 -1

             # Redmine - project management software
             # Copyright (C) 2006-2011  Jean-Philippe Lang
             #
             # This program is free software; you can redistribute it and/or
             # modify it under the terms of the GNU General Public License
             # as published by the Free Software Foundation; either version 2
             # of the License, or (at your option) any later version.
             #
             # This program is distributed in the hope that it will be useful,
             # but WITHOUT ANY WARRANTY; without even the implied warranty of
             # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
             # GNU General Public License for more details.
             #
             # You should have received a copy of the GNU General Public License
             # along with this program; if not, write to the Free Software
             # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
             class Role < ActiveRecord::Base
               # Built-in roles
               BUILTIN_NON_MEMBER = 1
               BUILTIN_ANONYMOUS  = 2
               ISSUES_VISIBILITY_OPTIONS = [
                 ['all', :label_issues_visibility_all],
                 ['default', :label_issues_visibility_public],
                 ['own', :label_issues_visibility_own]
               ]
               named_scope :sorted, {:order => 'builtin, position'}
               named_scope :givable, { :conditions => "builtin = 0", :order => 'position' }
               named_scope :builtin, lambda { |*args|
                 compare = 'not' if args.first == true
                 { :conditions => "#{compare} builtin = 0" }
               }
               before_destroy :check_deletable
               has_many :workflows, :dependent => :delete_all do
                 def copy(source_role)
-                  Workflow.copy(nil, source_role, nil, proxy_owner)
+                  Workflow.copy(nil, source_role, nil, proxy_association.owner)
                 end
               end
               has_many :member_roles, :dependent => :destroy
               has_many :members, :through => :member_roles
               acts_as_list
               serialize :permissions, Array
               attr_protected :builtin
               validates_presence_of :name
               validates_uniqueness_of :name
               validates_length_of :name, :maximum => 30
               validates_inclusion_of :issues_visibility,
                 :in => ISSUES_VISIBILITY_OPTIONS.collect(&:first),
                 :if => lambda {|role| role.respond_to?(:issues_visibility)}
               def permissions
                 read_attribute(:permissions) || []
               end
               def permissions=(perms)
                 perms = perms.collect {|p| p.to_sym unless p.blank? }.compact.uniq if perms
                 write_attribute(:permissions, perms)
               end
               def add_permission!(*perms)
                 self.permissions = [] unless permissions.is_a?(Array)
                 permissions_will_change!
                 perms.each do |p|
                   p = p.to_sym
                   permissions << p unless permissions.include?(p)
                 end
                 save!
               end
               def remove_permission!(*perms)
                 return unless permissions.is_a?(Array)
                 permissions_will_change!
                 perms.each { |p| permissions.delete(p.to_sym) }
                 save!
               end
               # Returns true if the role has the given permission
               def has_permission?(perm)
                 !permissions.nil? && permissions.include?(perm.to_sym)
               end
               def <=>(role)
                 role ? position <=> role.position : -1
               end
               def to_s
                 name
               end
               def name
                 case builtin
                 when 1; l(:label_role_non_member, :default => read_attribute(:name))
                 when 2; l(:label_role_anonymous,  :default => read_attribute(:name))
                 else; read_attribute(:name)
                 end
               end
               # Return true if the role is a builtin role
               def builtin?
                 self.builtin != 0
               end
               # Return true if the role is a project member role
               def member?
                 !self.builtin?
               end
               # Return true if role is allowed to do the specified action
               # action can be:
               # * a parameter-like Hash (eg. :controller => 'projects', :action => 'edit')
               # * a permission Symbol (eg. :edit_project)
               def allowed_to?(action)
                 if action.is_a? Hash
                   allowed_actions.include? "#{action[:controller]}/#{action[:action]}"
                 else
                   allowed_permissions.include? action
                 end
               end
               # Return all the permissions that can be given to the role
               def setable_permissions
                 setable_permissions = Redmine::AccessControl.permissions - Redmine::AccessControl.public_permissions
                 setable_permissions -= Redmine::AccessControl.members_only_permissions if self.builtin == BUILTIN_NON_MEMBER
                 setable_permissions -= Redmine::AccessControl.loggedin_only_permissions if self.builtin == BUILTIN_ANONYMOUS
                 setable_permissions
               end
               # Find all the roles that can be given to a project member
               def self.find_all_givable
                 find(:all, :conditions => {:builtin => 0}, :order => 'position')
               end
               # Return the builtin 'non member' role.  If the role doesn't exist,
               # it will be created on the fly.
               def self.non_member
                 find_or_create_system_role(BUILTIN_NON_MEMBER, 'Non member')
               end
               # Return the builtin 'anonymous' role.  If the role doesn't exist,
               # it will be created on the fly.
               def self.anonymous
                 find_or_create_system_role(BUILTIN_ANONYMOUS, 'Anonymous')
               end
             private
               def allowed_permissions
                 @allowed_permissions ||= permissions + Redmine::AccessControl.public_permissions.collect {|p| p.name}
               end
               def allowed_actions
                 @actions_allowed ||= allowed_permissions.inject([]) { |actions, permission| actions += Redmine::AccessControl.allowed_actions(permission) }.flatten
               end
               def check_deletable
                 raise "Can't delete role" if members.any?
                 raise "Can't delete builtin role" if builtin?
               end
               def self.find_or_create_system_role(builtin, name)
                 role = first(:conditions => {:builtin => builtin})
                 if role.nil?
                   role = create(:name => name, :position => 0) do |r|
                     r.builtin = builtin
                   end
                   raise "Unable to create the #{name} role." if role.new_record?
                 end
                 role
               end
             end

app/models/tracker.rb +1 -1

             # Redmine - project management software
             # Copyright (C) 2006-2011  Jean-Philippe Lang
             #
             # This program is free software; you can redistribute it and/or
             # modify it under the terms of the GNU General Public License
             # as published by the Free Software Foundation; either version 2
             # of the License, or (at your option) any later version.
             #
             # This program is distributed in the hope that it will be useful,
             # but WITHOUT ANY WARRANTY; without even the implied warranty of
             # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
             # GNU General Public License for more details.
             #
             # You should have received a copy of the GNU General Public License
             # along with this program; if not, write to the Free Software
             # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
             class Tracker < ActiveRecord::Base
               before_destroy :check_integrity
               has_many :issues
               has_many :workflows, :dependent => :delete_all do
                 def copy(source_tracker)
-                  Workflow.copy(source_tracker, nil, proxy_owner, nil)
+                  Workflow.copy(source_tracker, nil, proxy_association.owner, nil)
                 end
               end
               has_and_belongs_to_many :projects
               has_and_belongs_to_many :custom_fields, :class_name => 'IssueCustomField', :join_table => "#{table_name_prefix}custom_fields_trackers#{table_name_suffix}", :association_foreign_key => 'custom_field_id'
               acts_as_list
               validates_presence_of :name
               validates_uniqueness_of :name
               validates_length_of :name, :maximum => 30
               named_scope :named, lambda {|arg| { :conditions => ["LOWER(#{table_name}.name) = LOWER(?)", arg.to_s.strip]}}
               def to_s; name end
               def <=>(tracker)
                 name <=> tracker.name
               end
               def self.all
                 find(:all, :order => 'position')
               end
               # Returns an array of IssueStatus that are used
               # in the tracker's workflows
               def issue_statuses
                 if @issue_statuses
                   return @issue_statuses
                 elsif new_record?
                   return []
                 end
                 ids = Workflow.
                         connection.select_rows("SELECT DISTINCT old_status_id, new_status_id FROM #{Workflow.table_name} WHERE tracker_id = #{id}").
                         flatten.
                         uniq
                 @issue_statuses = IssueStatus.find_all_by_id(ids).sort
               end
             private
               def check_integrity
                 raise "Can't delete tracker" if Issue.find(:first, :conditions => ["tracker_id=?", self.id])
               end
             end

app/views/account/login.html.erb +1 -1

             <%= call_hook :view_account_login_top %>
             <div id="login-form">
-            <% form_tag({:action=> "login"}) do %>
+            <%= form_tag({:action=> "login"}) do %>
             <%= back_url_hidden_field_tag %>
             <table>
             <tr>
                 <td align="right"><label for="username"><%=l(:field_login)%>:</label></td>
                 <td align="left"><%= text_field_tag 'username', nil, :tabindex => '1' %></td>
             </tr>
             <tr>
                 <td align="right"><label for="password"><%=l(:field_password)%>:</label></td>
                 <td align="left"><%= password_field_tag 'password', nil, :tabindex => '2' %></td>
             </tr>
             <% if Setting.openid? %>
             <tr>
               <td align="right"><label for="openid_url"><%=l(:field_identity_url)%></label></td>
               <td align="left"><%= text_field_tag "openid_url", nil, :tabindex => '3' %></td>
             </tr>
             <% end %>
             <tr>
                 <td></td>
                 <td align="left">
                     <% if Setting.autologin? %>
                     <label for="autologin"><%= check_box_tag 'autologin', 1, false, :tabindex => 4 %> <%= l(:label_stay_logged_in) %></label>
                     <% end %>
                 </td>
             </tr>
             <tr>
                 <td align="left">
                     <% if Setting.lost_password? %>
                         <%= link_to l(:label_password_lost), :controller => 'account', :action => 'lost_password' %>
                     <% end %>
                 </td>
                 <td align="right">
                     <input type="submit" name="login" value="<%=l(:button_login)%> &#187;" tabindex="5"/>
                 </td>
             </tr>
             </table>
             <%= javascript_tag "Form.Element.focus('username');" %>
             <% end %>
             </div>
             <%= call_hook :view_account_login_bottom %>

app/views/account/lost_password.html.erb +1 -1

             <h2><%=l(:label_password_lost)%></h2>
             <div class="box">
-            <% form_tag({:action=> "lost_password"}, :class => "tabular") do %>
+            <%= form_tag({:action=> "lost_password"}, :class => "tabular") do %>
             <p><label for="mail"><%=l(:field_mail)%> <span class="required">*</span></label>
             <%= text_field_tag 'mail', nil, :size => 40 %>
             <%= submit_tag l(:button_submit) %></p>
             <% end %>
             </div>

app/views/account/password_recovery.html.erb +1 -1

             <h2><%=l(:label_password_lost)%></h2>
             <%= error_messages_for 'user' %>
-            <% form_tag({:token => @token.value}) do %>
+            <%= form_tag({:token => @token.value}) do %>
             <div class="box tabular">
             <p><label for="new_password"><%=l(:field_new_password)%> <span class="required">*</span></label>
             <%= password_field_tag 'new_password', nil, :size => 25 %>
             <em class="info"><%= l(:text_caracters_minimum, :count => Setting.password_min_length) %></em></p>
             <p><label for="new_password_confirmation"><%=l(:field_password_confirmation)%> <span class="required">*</span></label>
             <%= password_field_tag 'new_password_confirmation', nil, :size => 25 %></p>
             </div>
             <p><%= submit_tag l(:button_save) %></p>
             <% end %>

app/views/account/register.html.erb +1 -1

             <h2><%=l(:label_register)%> <%=link_to l(:label_login_with_open_id_option), signin_url if Setting.openid? %></h2>
-            <% labelled_form_for @user, :url => {:action => 'register'} do |f| %>
+            <%= labelled_form_for @user, :url => {:action => 'register'} do |f| %>
             <%= error_messages_for 'user' %>
             <div class="box tabular">
             <% if @user.auth_source_id.nil? %>
               <p><%= f.text_field :login, :size => 25, :required => true %></p>
               <p><%= f.password_field :password, :size => 25, :required => true %>
               <em class="info"><%= l(:text_caracters_minimum, :count => Setting.password_min_length) %></em></p>
               <p><%= f.password_field :password_confirmation, :size => 25, :required => true %></p>
             <% end %>
             <p><%= f.text_field :firstname, :required => true %></p>
             <p><%= f.text_field :lastname, :required => true %></p>
             <p><%= f.text_field :mail, :required => true %></p>
             <p><%= f.select :language, lang_options_for_select %></p>
             <% if Setting.openid? %>
               <p><%= f.text_field :identity_url  %></p>
             <% end %>
             <% @user.custom_field_values.select {|v| v.editable? || v.required?}.each do |value| %>
               <p><%= custom_field_tag_with_label :user, value %></p>
             <% end %>
             </div>
             <%= submit_tag l(:button_submit) %>
             <% end %>

app/views/activities/index.html.erb +1 -1

             <h2><%= @author.nil? ? l(:label_activity) : l(:label_user_activity, link_to_user(@author)) %></h2>
             <p class="subtitle"><%= l(:label_date_from_to, :start => format_date(@date_to - @days), :end => format_date(@date_to-1)) %></p>
             <div id="activity">
             <% @events_by_day.keys.sort.reverse.each do |day| %>
             <h3><%= format_activity_day(day) %></h3>
             <dl>
             <% @events_by_day[day].sort {|x,y| y.event_datetime <=> x.event_datetime }.each do |e| -%>
               <dt class="<%= e.event_type %>  <%= User.current.logged? && e.respond_to?(:event_author) && User.current == e.event_author ? 'me' : nil %>">
               <%= avatar(e.event_author, :size => "24") if e.respond_to?(:event_author) %>
               <span class="time"><%= format_time(e.event_datetime, false) %></span>
               <%= content_tag('span', h(e.project), :class => 'project') if @project.nil? || @project != e.project %>
               <%= link_to format_activity_title(e.event_title), e.event_url %></dt>
               <dd><span class="description"><%= format_activity_description(e.event_description) %></span>
               <span class="author"><%= link_to_user(e.event_author) if e.respond_to?(:event_author) %></span></dd>
             <% end -%>
             </dl>
             <% end -%>
             </div>
             <%= content_tag('p', l(:label_no_data), :class => 'nodata') if @events_by_day.empty? %>
             <div style="float:left;">
             <%= link_to_content_update("\xc2\xab " + l(:label_previous),
                                params.merge(:from => @date_to - @days - 1),
                                :title => l(:label_date_from_to, :start => format_date(@date_to - 2*@days), :end => format_date(@date_to - @days - 1))) %>
             </div>
             <div style="float:right;">
             <%= link_to_content_update(l(:label_next) + " \xc2\xbb",
                                params.merge(:from => @date_to + @days - 1),
                                :title => l(:label_date_from_to, :start => format_date(@date_to), :end => format_date(@date_to + @days - 1))) unless @date_to >= Date.today %>
             </div>
             &nbsp;
             <% other_formats_links do |f| %>
               <%= f.link_to 'Atom', :url => params.merge(:from => nil, :key => User.current.rss_key) %>
             <% end %>
             <% content_for :header_tags do %>
             <%= auto_discovery_link_tag(:atom, params.merge(:format => 'atom', :from => nil, :key => User.current.rss_key)) %>
             <% end %>
             <% content_for :sidebar do %>
-            <% form_tag({}, :method => :get) do %>
+            <%= form_tag({}, :method => :get) do %>
             <h3><%= l(:label_activity) %></h3>
             <p><% @activity.event_types.each do |t| %>
             <%= check_box_tag "show_#{t}", 1, @activity.scope.include?(t) %>
             <label for="show_<%=t%>"><%= link_to(l("label_#{t.singularize}_plural"), {"show_#{t}" => 1, :user_id => params[:user_id]})%></label>
             <br />
             <% end %></p>
             <% if @project && @project.descendants.active.any? %>
                 <%= hidden_field_tag 'with_subprojects', 0 %>
                 <p><label><%= check_box_tag 'with_subprojects', 1, @with_subprojects %> <%=l(:label_subproject_plural)%></label></p>
             <% end %>
             <%= hidden_field_tag('user_id', params[:user_id]) unless params[:user_id].blank? %>
             <p><%= submit_tag l(:button_apply), :class => 'button-small', :name => nil %></p>
             <% end %>
             <% end %>
             <% html_title(l(:label_activity), @author) -%>

app/views/admin/_no_data.html.erb +1 -1

             <div class="nodata">
-            <% form_tag({:action => 'default_configuration'}) do %>
+            <%= form_tag({:action => 'default_configuration'}) do %>
                 <%= simple_format(l(:text_no_configuration_data)) %>
                 <p><%= l(:field_language) %>:
                 <%= select_tag 'lang', options_for_select(lang_options_for_select(false), current_language.to_s) %>
                 <%= submit_tag l(:text_load_default_configuration) %></p>
             <% end %>
             </div>

app/views/admin/projects.html.erb +1 -1

             <div class="contextual">
             <%= link_to l(:label_project_new), {:controller => 'projects', :action => 'new'}, :class => 'icon icon-add' %>
             </div>
             <h2><%=l(:label_project_plural)%></h2>
-            <% form_tag({}, :method => :get) do %>
+            <%= form_tag({}, :method => :get) do %>
             <fieldset><legend><%= l(:label_filter_plural) %></legend>
             <label for='status'><%= l(:field_status) %> :</label>
             <%= select_tag 'status', project_status_options_for_select(@status), :class => "small", :onchange => "this.form.submit(); return false;"  %>
             <label for='name'><%= l(:label_project) %>:</label>
             <%= text_field_tag 'name', params[:name], :size => 30 %>
             <%= submit_tag l(:button_apply), :class => "small", :name => nil %>
             <%= link_to l(:button_clear), {:controller => 'admin', :action => 'projects'}, :class => 'icon icon-reload' %>
             </fieldset>
             <% end %>
             &nbsp;
             <div class="autoscroll">
             <table class="list">
               <thead><tr>
               <th><%=l(:label_project)%></th>
               <th><%=l(:field_is_public)%></th>
               <th><%=l(:field_created_on)%></th>
               <th></th>
               </tr></thead>
               <tbody>
             <% project_tree(@projects) do |project, level| %>
               <tr class="<%= cycle("odd", "even") %> <%= project.css_classes %> <%= level > 0 ? "idnt idnt-#{level}" : nil %>">
               <td class="name"><span><%= link_to_project(project, {:action => 'settings'}, :title => project.short_description) %></span></td>
               <td align="center"><%= checked_image project.is_public? %></td>
               <td align="center"><%= format_date(project.created_on) %></td>
               <td class="buttons">
                 <%= link_to(l(:button_archive), { :controller => 'projects', :action => 'archive', :id => project, :status => params[:status] }, :confirm => l(:text_are_you_sure), :method => :post, :class => 'icon icon-lock') if project.active? %>
                 <%= link_to(l(:button_unarchive), { :controller => 'projects', :action => 'unarchive', :id => project, :status => params[:status] }, :method => :post, :class => 'icon icon-unlock') if !project.active? && (project.parent.nil? || project.parent.active?) %>
                 <%= link_to(l(:button_copy), { :controller => 'projects', :action => 'copy', :id => project }, :class => 'icon icon-copy') %>
                 <%= link_to(l(:button_delete), project_path(project), :method => :delete, :class => 'icon icon-del') %>
               </td>
               </tr>
             <% end %>
               </tbody>
             </table>
             </div>
             <% html_title(l(:label_project_plural)) -%>

app/views/attachments/diff.html.erb +1 -1

             <h2><%=h @attachment.filename %></h2>
             <div class="attachments">
             <p><%= h("#{@attachment.description} - ") unless @attachment.description.blank? %>
                <span class="author"><%= link_to_user(@attachment.author) %>, <%= format_time(@attachment.created_on) %></span></p>
             <p><%= link_to_attachment @attachment, :text => l(:button_download), :download => true -%>
                <span class="size">(<%= number_to_human_size @attachment.filesize %>)</span></p>
             </div>
             <p>
-            <% form_tag({}, :method => 'get') do %>
+            <%= form_tag({}, :method => 'get') do %>
                 <label><%= l(:label_view_diff) %></label>
                 <%= select_tag 'type',
                                 options_for_select(
                                   [[l(:label_diff_inline), "inline"], [l(:label_diff_side_by_side), "sbs"]], @diff_type),
                                 :onchange => "if (this.value != '') {this.form.submit()}" %>
             <% end %>
             </p>
             <%= render :partial => 'common/diff', :locals => {:diff => @diff, :diff_type => @diff_type} %>
             <% html_title @attachment.filename %>
             <% content_for :header_tags do -%>
                 <%= stylesheet_link_tag "scm" -%>
             <% end -%>

app/views/auth_sources/edit.html.erb +1 -1

             <h2><%=l(:label_auth_source)%> (<%= h(@auth_source.auth_method_name) %>)</h2>
-            <% form_tag({:action => 'update', :id => @auth_source}, :method => :put, :class => "tabular") do %>
+            <%= form_tag({:action => 'update', :id => @auth_source}, :method => :put, :class => "tabular") do %>
               <%= render :partial => auth_source_partial_name(@auth_source) %>
               <%= submit_tag l(:button_save) %>
             <% end %>

app/views/auth_sources/new.html.erb +1 -1

             <h2><%=l(:label_auth_source_new)%> (<%= h(@auth_source.auth_method_name) %>)</h2>
-            <% form_tag({:action => 'create'}, :class => "tabular") do %>
+            <%= form_tag({:action => 'create'}, :class => "tabular") do %>
               <%= hidden_field_tag 'type', @auth_source.type %>
               <%= render :partial => auth_source_partial_name(@auth_source) %>
               <%= submit_tag l(:button_create) %>
             <% end %>

app/views/boards/edit.html.erb +1 -1

             <h2><%= l(:label_board) %></h2>
-            <% labelled_form_for @board, :url => project_board_path(@project, @board) do |f| %>
+            <%= labelled_form_for @board, :url => project_board_path(@project, @board) do |f| %>
               <%= render :partial => 'form', :locals => {:f => f} %>
               <%= submit_tag l(:button_save) %>
             <% end %>

app/views/boards/new.html.erb +1 -1

             <h2><%= l(:label_board_new) %></h2>
-            <% labelled_form_for @board, :url => project_boards_path(@project) do |f| %>
+            <%= labelled_form_for @board, :url => project_boards_path(@project) do |f| %>
               <%= render :partial => 'form', :locals => {:f => f} %>
               <%= submit_tag l(:button_create) %>
             <% end %>

app/views/boards/show.html.erb +1 -1

             <%= breadcrumb link_to(l(:label_board_plural), project_boards_path(@project)) %>
             <div class="contextual">
             <%= link_to_if_authorized l(:label_message_new),
                                       {:controller => 'messages', :action => 'new', :board_id => @board},
                                       :class => 'icon icon-add',
                                       :onclick => 'Element.show("add-message"); Form.Element.focus("message_subject"); return false;' %>
             <%= watcher_tag(@board, User.current) %>
             </div>
             <div id="add-message" style="display:none;">
             <% if authorize_for('messages', 'new') %>
             <h2><%= link_to h(@board.name), :controller => 'boards', :action => 'show', :project_id => @project, :id => @board %> &#187; <%= l(:label_message_new) %></h2>
-            <% form_for :message, @message, :url => {:controller => 'messages', :action => 'new', :board_id => @board}, :html => {:multipart => true, :id => 'message-form'} do |f| %>
+            <%= form_for @message, :url => {:controller => 'messages', :action => 'new', :board_id => @board}, :html => {:multipart => true, :id => 'message-form'} do |f| %>
               <%= render :partial => 'messages/form', :locals => {:f => f} %>
               <p><%= submit_tag l(:button_create) %>
               <%= link_to_remote l(:label_preview),
                                  { :url => { :controller => 'messages', :action => 'preview', :board_id => @board },
                                    :method => 'post',
                                    :update => 'preview',
                                    :with => "Form.serialize('message-form')",
                                    :complete => "Element.scrollTo('preview')"
                                  }, :accesskey => accesskey(:preview) %> |
               <%= link_to l(:button_cancel), "#", :onclick => 'Element.hide("add-message")' %></p>
             <% end %>
             <div id="preview" class="wiki"></div>
             <% end %>
             </div>
             <h2><%=h @board.name %></h2>
             <p class="subtitle"><%=h @board.description %></p>
             <% if @topics.any? %>
             <table class="list messages">
               <thead><tr>
                 <th><%= l(:field_subject) %></th>
                 <th><%= l(:field_author) %></th>
                 <%= sort_header_tag('created_on', :caption => l(:field_created_on)) %>
                 <%= sort_header_tag('replies', :caption => l(:label_reply_plural)) %>
                 <%= sort_header_tag('updated_on', :caption => l(:label_message_last)) %>
               </tr></thead>
               <tbody>
               <% @topics.each do |topic| %>
                 <tr class="message <%= cycle 'odd', 'even' %> <%= topic.sticky? ? 'sticky' : '' %> <%= topic.locked? ? 'locked' : '' %>">
                   <td class="subject"><%= link_to h(topic.subject), { :controller => 'messages', :action => 'show', :board_id => @board, :id => topic } %></td>
                   <td class="author" align="center"><%= link_to_user(topic.author) %></td>
                   <td class="created_on" align="center"><%= format_time(topic.created_on) %></td>
                   <td class="replies" align="center"><%= topic.replies_count %></td>
                   <td class="last_message">
                     <% if topic.last_reply %>
                     <%= authoring topic.last_reply.created_on, topic.last_reply.author %><br />
                     <%= link_to_message topic.last_reply %>
                     <% end %>
                   </td>
                 </tr>
               <% end %>
               </tbody>
             </table>
             <p class="pagination"><%= pagination_links_full @topic_pages, @topic_count %></p>
             <% else %>
             <p class="nodata"><%= l(:label_no_data) %></p>
             <% end %>
             <% other_formats_links do |f| %>
               <%= f.link_to 'Atom', :url => {:key => User.current.rss_key} %>
             <% end %>
             <% html_title @board.name %>
             <% content_for :header_tags do %>
                 <%= auto_discovery_link_tag(:atom, {:format => 'atom', :key => User.current.rss_key}, :title => "#{@project}: #{@board}") %>
                 <%= stylesheet_link_tag 'scm' %>
             <% end %>

app/views/calendars/show.html.erb +2 -1

             <h2><%= @query.new_record? ? l(:label_calendar) : h(@query.name) %></h2>
-            <% form_tag({:controller => 'calendars', :action => 'show', :project_id => @project}, :method => :get, :id => 'query_form') do %>
+            <%= form_tag({:controller => 'calendars', :action => 'show', :project_id => @project},
+                         :method => :get, :id => 'query_form') do %>
             <%= hidden_field_tag 'set_filter', '1' %>
             <fieldset id="filters" class="collapsible <%= @query.new_record? ? "" : "collapsed" %>">
               <legend onclick="toggleFieldset(this);"><%= l(:label_filter_plural) %></legend>
               <div style="<%= @query.new_record? ? "" : "display: none;" %>">
                 <%= render :partial => 'queries/filters', :locals => {:query => @query} %>
               </div>
             </fieldset>
             <p style="float:right;">
               <%= link_to_previous_month(@year, @month) %> | <%= link_to_next_month(@year, @month) %>
             </p>
             <p class="buttons">
             <%= label_tag('month', l(:label_month)) %>
             <%= select_month(@month, :prefix => "month", :discard_type => true) %>
             <%= label_tag('year', l(:label_year)) %>
             <%= select_year(@year, :prefix => "year", :discard_type => true) %>
             <%= link_to_function l(:button_apply), '$("query_form").submit()', :class => 'icon icon-checked' %>
             <%= link_to l(:button_clear), { :project_id => @project, :set_filter => 1 }, :class => 'icon icon-reload' %>
             </p>
             <% end %>
             <%= error_messages_for 'query' %>
             <% if @query.valid? %>
             <%= render :partial => 'common/calendar', :locals => {:calendar => @calendar} %>
             <p class="legend cal">
               <span class="starting"><%= l(:text_tip_issue_begin_day) %></span>
               <span class="ending"><%= l(:text_tip_issue_end_day) %></span>
               <span class="starting ending"><%= l(:text_tip_issue_begin_end_day) %></span>
             </p>
             <% end %>
             <% content_for :sidebar do %>
                 <%= render :partial => 'issues/sidebar' %>
             <% end %>
             <% html_title(l(:label_calendar)) -%>

app/views/common/feed.atom.builder +2 -2

             xml.instruct!
             xml.feed "xmlns" => "http://www.w3.org/2005/Atom" do
               xml.title   truncate_single_line(@title, :length => 100)
-              xml.link    "rel" => "self", "href" => url_for(params.merge(:only_path => false, :escape => false))
+              xml.link    "rel" => "self", "href" => url_for(params.merge(:only_path => false))
-              xml.link    "rel" => "alternate", "href" => url_for(params.merge(:only_path => false, :format => nil, :key => nil, :escape => false))
+              xml.link    "rel" => "alternate", "href" => url_for(params.merge(:only_path => false, :format => nil, :key => nil))
               xml.id      url_for(:controller => 'welcome', :only_path => false)
               xml.updated((@items.first ? @items.first.event_datetime : Time.now).xmlschema)
               xml.author  { xml.name "#{Setting.app_title}" }
               xml.generator(:uri => Redmine::Info.url) { xml.text! Redmine::Info.app_name; }
               @items.each do |item|
                 xml.entry do
                   url = url_for(item.event_url(:only_path => false))
                   if @project
                     xml.title truncate_single_line(item.event_title, :length => 100)
                   else
                     xml.title truncate_single_line("#{item.project} - #{item.event_title}", :length => 100)
                   end
                   xml.link "rel" => "alternate", "href" => url
                   xml.id url
                   xml.updated item.event_datetime.xmlschema
                   author = item.event_author if item.respond_to?(:event_author)
                   xml.author do
                     xml.name(author)
                     xml.email(author.mail) if author.is_a?(User) && !author.mail.blank? && !author.pref.hide_mail
                   end if author
                   xml.content "type" => "html" do
                     xml.text! textilizable(item, :event_description, :only_path => false)
                   end
                 end
               end
             end

app/views/custom_fields/edit.html.erb +1 -1

             <h2><%= link_to l(:label_custom_field_plural), :controller => 'custom_fields', :action => 'index' %>
               &#187; <%= link_to l(@custom_field.type_name), :controller => 'custom_fields', :action => 'index', :tab => @custom_field.class.name %>
               &#187; <%=h @custom_field.name %></h2>
-            <% labelled_form_for :custom_field, @custom_field, :url => custom_field_path(@custom_field), :html => {:method => :put} do |f| %>
+            <%= labelled_form_for :custom_field, @custom_field, :url => custom_field_path(@custom_field), :html => {:method => :put} do |f| %>
             <%= render :partial => 'form', :locals => { :f => f } %>
             <%= submit_tag l(:button_save) %>
             <% end %>

app/views/custom_fields/new.html.erb +1 -1

             <h2><%= link_to l(:label_custom_field_plural), :controller => 'custom_fields', :action => 'index' %>
               &#187; <%= link_to l(@custom_field.type_name), :controller => 'custom_fields', :action => 'index', :tab => @custom_field.class.name %>
               &#187; <%= l(:label_custom_field_new) %></h2>
-            <% labelled_form_for :custom_field, @custom_field, :url => custom_fields_path do |f| %>
+            <%= labelled_form_for :custom_field, @custom_field, :url => custom_fields_path do |f| %>
             <%= render :partial => 'form', :locals => { :f => f } %>
             <%= hidden_field_tag 'type', @custom_field.type %>
             <%= submit_tag l(:button_save) %>
             <% end %>

app/views/documents/edit.html.erb +1 -1

             <h2><%=l(:label_document)%></h2>
-            <% labelled_form_for @document do |f| %>
+            <%= labelled_form_for @document do |f| %>
               <%= render :partial => 'form', :locals => {:f => f} %>
               <p><%= submit_tag l(:button_save) %></p>
             <% end %>

app/views/documents/index.html.erb +1 -1

             <div class="contextual">
             <%= link_to l(:label_document_new), new_project_document_path(@project), :class => 'icon icon-add',
                   :onclick => 'Element.show("add-document"); Form.Element.focus("document_title"); return false;' if User.current.allowed_to?(:manage_documents, @project) %>
             </div>
             <div id="add-document" style="display:none;">
             <h2><%=l(:label_document_new)%></h2>
-            <% labelled_form_for @document, :url => project_documents_path(@project), :html => {:multipart => true} do |f| %>
+            <%= labelled_form_for @document, :url => project_documents_path(@project), :html => {:multipart => true} do |f| %>
             <%= render :partial => 'form', :locals => {:f => f} %>
             <p>
             	<%= submit_tag l(:button_create) %>
               <%= link_to l(:button_cancel), "#", :onclick => 'Element.hide("add-document")' %>
             </p>
             <% end %>
             </div>
             <h2><%=l(:label_document_plural)%></h2>
             <% if @grouped.empty? %><p class="nodata"><%= l(:label_no_data) %></p><% end %>
             <% @grouped.keys.sort.each do |group| %>
                 <h3><%= group %></h3>
                 <%= render :partial => 'documents/document', :collection => @grouped[group] %>
             <% end %>
             <% content_for :sidebar do %>
               <h3><%= l(:label_sort_by, '') %></h3>
               <%= link_to l(:field_category), {:sort_by => 'category'}, :class => (@sort_by == 'category' ? 'selected' :nil) %><br />
               <%= link_to l(:label_date), {:sort_by => 'date'}, :class => (@sort_by == 'date' ? 'selected' :nil) %><br />
               <%= link_to l(:field_title), {:sort_by => 'title'}, :class => (@sort_by == 'title' ? 'selected' :nil) %><br />
               <%= link_to l(:field_author), {:sort_by => 'author'}, :class => (@sort_by == 'author' ? 'selected' :nil) %>
             <% end %>
             <% html_title(l(:label_document_plural)) -%>

app/views/documents/new.html.erb +1 -1

             <h2><%=l(:label_document_new)%></h2>
-            <% labelled_form_for @document, :url => project_documents_path(@project), :html => {:multipart => true} do |f| %>
+            <%= labelled_form_for @document, :url => project_documents_path(@project), :html => {:multipart => true} do |f| %>
               <%= render :partial => 'form', :locals => {:f => f} %>
               <p><%= submit_tag l(:button_create) %></p>
             <% end %>

app/views/documents/show.html.erb +1 -1

             <div class="contextual">
             <% if User.current.allowed_to?(:manage_documents, @project) %>
             <%= link_to l(:button_edit), edit_document_path(@document), :class => 'icon icon-edit', :accesskey => accesskey(:edit) %>
             <%= link_to l(:button_delete), document_path(@document), :confirm => l(:text_are_you_sure), :method => :delete, :class => 'icon icon-del' %>
             <% end %>
             </div>
             <h2><%=h @document.title %></h2>
             <p><em><%=h @document.category.name %><br />
             <%= format_date @document.created_on %></em></p>
             <div class="wiki">
             <%= textilizable @document.description, :attachments => @document.attachments %>
             </div>
             <h3><%= l(:label_attachment_plural) %></h3>
             <%= link_to_attachments @document %>
             <% if authorize_for('documents', 'add_attachment') %>
             <p><%= link_to l(:label_attachment_new), {}, :onclick => "Element.show('add_attachment_form'); Element.hide(this); Element.scrollTo('add_attachment_form'); return false;",
                                                          :id => 'attach_files_link' %></p>
-              <% form_tag({ :controller => 'documents', :action => 'add_attachment', :id => @document }, :multipart => true, :id => "add_attachment_form", :style => "display:none;") do %>
+              <%= form_tag({ :controller => 'documents', :action => 'add_attachment', :id => @document }, :multipart => true, :id => "add_attachment_form", :style => "display:none;") do %>
               <div class="box">
               <p><%= render :partial => 'attachments/form' %></p>
               </div>
               <%= submit_tag l(:button_add) %>
               <% end %>
             <% end %>
             <% html_title @document.title -%>
             <% content_for :header_tags do %>
                 <%= stylesheet_link_tag 'scm' %>
             <% end %>

app/views/enumerations/destroy.html.erb +1 -1

             <h2><%= l(@enumeration.option_name) %>: <%=h @enumeration %></h2>
-            <% form_tag({}, :method => :delete) do %>
+            <%= form_tag({}, :method => :delete) do %>
             <div class="box">
             <p><strong><%= l(:text_enumeration_destroy_question, @enumeration.objects_count) %></strong></p>
             <p><label for='reassign_to_id'><%= l(:text_enumeration_category_reassign_to) %></label>
             <%= select_tag 'reassign_to_id', ("<option>--- #{l(:actionview_instancetag_blank_option)} ---</option>" + options_from_collection_for_select(@enumerations, 'id', 'name')) %></p>
             </div>
             <%= submit_tag l(:button_apply) %>
             <%= link_to l(:button_cancel), enumerations_path %>
             <% end %>

app/views/enumerations/edit.html.erb +1 -1

             <h2><%= link_to l(@enumeration.option_name), enumerations_path %> &#187; <%=h @enumeration %></h2>
-            <% labelled_form_for :enumeration, @enumeration, :url => enumeration_path(@enumeration), :html => {:method => :put} do |f| %>
+            <%= labelled_form_for :enumeration, @enumeration, :url => enumeration_path(@enumeration), :html => {:method => :put} do |f| %>
               <%= render :partial => 'form', :locals => {:f => f} %>
               <%= submit_tag l(:button_save) %>
             <% end %>

app/views/enumerations/new.html.erb +1 -1

             <h2><%= link_to l(@enumeration.option_name), enumerations_path %> &#187; <%=l(:label_enumeration_new)%></h2>
-            <% labelled_form_for :enumeration, @enumeration, :url => enumerations_path do |f| %>
+            <%= labelled_form_for :enumeration, @enumeration, :url => enumerations_path do |f| %>
               <%= f.hidden_field :type  %>
               <%= render :partial => 'form', :locals => {:f => f} %>
               <%= submit_tag l(:button_create) %>
             <% end %>

app/views/files/new.html.erb +1 -1

             <h2><%=l(:label_attachment_new)%></h2>
             <%= error_messages_for 'attachment' %>
-            <% form_tag(project_files_path(@project), :multipart => true, :class => "tabular") do %>
+            <%= form_tag(project_files_path(@project), :multipart => true, :class => "tabular") do %>
             <div class="box">
             <% if @versions.any? %>
             <p><label for="version_id"><%=l(:field_version)%></label>
             <%= select_tag "version_id", content_tag('option', '') +
                                          options_from_collection_for_select(@versions, "id", "name") %></p>
             <% end %>
             <p><label><%=l(:label_attachment_plural)%></label><%= render :partial => 'attachments/form' %></p>
             </div>
             <%= submit_tag l(:button_add) %>
             <% end %>

app/views/gantts/show.html.erb +4 -1

             <% @gantt.view = self %>
             <h2><%= @query.new_record? ? l(:label_gantt) : h(@query.name) %></h2>
-            <% form_tag({:controller => 'gantts', :action => 'show', :project_id => @project, :month => params[:month], :year => params[:year], :months => params[:months]}, :method => :get, :id => 'query_form') do %>
+            <%= form_tag({:controller => 'gantts', :action => 'show',
+                         :project_id => @project, :month => params[:month],
+                         :year => params[:year], :months => params[:months]},
+                         :method => :get, :id => 'query_form') do %>
             <%= hidden_field_tag 'set_filter', '1' %>
             <fieldset id="filters" class="collapsible <%= @query.new_record? ? "" : "collapsed" %>">
               <legend onclick="toggleFieldset(this);"><%= l(:label_filter_plural) %></legend>
               <div style="<%= @query.new_record? ? "" : "display: none;" %>">
                 <%= render :partial => 'queries/filters', :locals => {:query => @query} %>
               </div>
             </fieldset>
             <p class="contextual">
               <%= gantt_zoom_link(@gantt, :in) %>
               <%= gantt_zoom_link(@gantt, :out) %>
             </p>
             <p class="buttons">
             <%= text_field_tag 'months', @gantt.months, :size => 2 %>
             <%= l(:label_months_from) %>
             <%= select_month(@gantt.month_from, :prefix => "month", :discard_type => true) %>
             <%= select_year(@gantt.year_from, :prefix => "year", :discard_type => true) %>
             <%= hidden_field_tag 'zoom', @gantt.zoom %>
             <%= link_to_function l(:button_apply), '$("query_form").submit()', :class => 'icon icon-checked' %>
             <%= link_to l(:button_clear), { :project_id => @project, :set_filter => 1 }, :class => 'icon icon-reload' %>
             </p>
             <% end %>
             <%= error_messages_for 'query' %>
             <% if @query.valid? %>
             <% zoom = 1
             @gantt.zoom.times { zoom = zoom * 2 }
             subject_width = 330
             header_heigth = 18
             headers_height = header_heigth
             show_weeks = false
             show_days = false
             if @gantt.zoom > 1
                 show_weeks = true
                 headers_height = 2 * header_heigth
                 if @gantt.zoom > 2
                     show_days = true
                     headers_height = 3 * header_heigth
                 end
             end
             # Width of the entire chart
             g_width = ((@gantt.date_to - @gantt.date_from + 1) * zoom).to_i
             @gantt.render(:top => headers_height + 8, :zoom => zoom, :g_width => g_width, :subject_width => subject_width)
             g_height = [(20 * (@gantt.number_of_rows + 6)) + 150, 206].max
             t_height = g_height + headers_height
             %>
             <% if @gantt.truncated %>
               <p class="warning"><%= l(:notice_gantt_chart_truncated, :max => @gantt.max_rows) %></p>
             <% end %>
             <table style="width:100%; border:0; border-collapse: collapse;">
             <tr>
             <td style="width:<%= subject_width %>px; padding:0px;">
             <div style="position:relative;height:<%= t_height + 24 %>px;width:<%= subject_width + 1 %>px;">
             <div style="right:-2px;width:<%= subject_width %>px;height:<%= headers_height %>px;background: #eee;" class="gantt_hdr"></div>
             <div style="right:-2px;width:<%= subject_width %>px;height:<%= t_height %>px;border-left: 1px solid #c0c0c0;overflow:hidden;" class="gantt_hdr"></div>
             <div class="gantt_subjects">
             <%= @gantt.subjects.html_safe %>
             </div>
             </div>
             </td>
             <td>
             <div style="position:relative;height:<%= t_height + 24 %>px;overflow:auto;">
             <div style="width:<%= g_width - 1 %>px;height:<%= headers_height %>px;background: #eee;" class="gantt_hdr">&nbsp;</div>
             <%
             #
             # Months headers
             #
             month_f = @gantt.date_from
             left = 0
             height = (show_weeks ? header_heigth : header_heigth + g_height)
             @gantt.months.times do
               width = (((month_f >> 1) - month_f) * zoom - 1).to_i
               %>
               <div style="left:<%= left %>px;width:<%= width %>px;height:<%= height %>px;" class="gantt_hdr">
               <%= link_to h("#{month_f.year}-#{month_f.month}"), @gantt.params.merge(:year => month_f.year, :month => month_f.month), :title => "#{month_name(month_f.month)} #{month_f.year}"%>
               </div>
               <%
               left = left + width + 1
               month_f = month_f >> 1
             end %>
             <%
             #
             # Weeks headers
             #
             if show_weeks
               left = 0
               height = (show_days ? header_heigth - 1 : header_heigth - 1 + g_height)
               if @gantt.date_from.cwday == 1
                 # @date_from is monday
                 week_f = @gantt.date_from
               else
                 # find next monday after @date_from
                 week_f = @gantt.date_from + (7 - @gantt.date_from.cwday + 1)
                 width = (7 - @gantt.date_from.cwday + 1) * zoom - 1
                 %>
                 <div style="left:<%= left %>px;top:19px;width:<%= width %>px;height:<%= height %>px;" class="gantt_hdr">&nbsp;</div>
                 <%
                 left = left + width + 1
               end %>
               <%
               while week_f <= @gantt.date_to
                 width = ((week_f + 6 <= @gantt.date_to) ? 7 * zoom - 1 : (@gantt.date_to - week_f + 1) * zoom - 1).to_i
                 %>
                 <div style="left:<%= left %>px;top:19px;width:<%= width %>px;height:<%= height %>px;" class="gantt_hdr">
                 <small><%= week_f.cweek if width >= 16 %></small>
                 </div>
                 <%
                 left = left + width + 1
                 week_f = week_f + 7
               end
             end %>
             <%
             #
             # Days headers
             #
             if show_days
               left = 0
               height = g_height + header_heigth - 1
               wday = @gantt.date_from.cwday
               (@gantt.date_to - @gantt.date_from + 1).to_i.times do
               width =  zoom - 1
               %>
               <div style="left:<%= left %>px;top:37px;width:<%= width %>px;height:<%= height %>px;font-size:0.7em;<%= "background:#f1f1f1;" if wday > 5 %>" class="gantt_hdr">
               <%= day_name(wday).first %>
               </div>
               <%
               left = left + width + 1
               wday = wday + 1
               wday = 1 if wday > 7
               end
             end %>
             <%= @gantt.lines.html_safe %>
             <%
             #
             # Today red line (excluded from cache)
             #
             if Date.today >= @gantt.date_from and Date.today <= @gantt.date_to %>
                 <div style="position: absolute;height:<%= g_height %>px;top:<%= headers_height + 1 %>px;left:<%= (((Date.today - @gantt.date_from + 1) * zoom).floor() - 1).to_i %>px;width:10px;border-left: 1px dashed red;">&nbsp;</div>
             <% end %>
             </div>
             </td>
             </tr>
             </table>
             <table style="width:100%">
             <tr>
             <td align="left"><%= link_to_content_update("\xc2\xab " + l(:label_previous), params.merge(@gantt.params_previous)) %></td>
             <td align="right"><%= link_to_content_update(l(:label_next) + " \xc2\xbb", params.merge(@gantt.params_next)) %></td>
             </tr>
             </table>
             <% other_formats_links do |f| %>
               <%= f.link_to 'PDF', :url => params.merge(@gantt.params) %>
               <%= f.link_to('PNG', :url => params.merge(@gantt.params)) if @gantt.respond_to?('to_image') %>
             <% end %>
             <% end # query.valid? %>
             <% content_for :sidebar do %>
                 <%= render :partial => 'issues/sidebar' %>
             <% end %>
             <% html_title(l(:label_gantt)) -%>

app/views/groups/_general.html.erb +1 -1

-            <% labelled_form_for @group do |f| %>
+            <%= labelled_form_for @group do |f| %>
             <%= render :partial => 'form', :locals => { :f => f } %>
             <%= submit_tag l(:button_save) %>
             <% end %>

app/views/groups/_memberships.html.erb +4 -3

             <% roles = Role.find_all_givable %>
             <% projects = Project.active.find(:all, :order => 'lft') %>
             <div class="splitcontentleft">
             <% if @group.memberships.any? %>
             <table class="list memberships">
               <thead><tr>
                 <th><%= l(:label_project) %></th>
                 <th><%= l(:label_role_plural) %></th>
                 <th style="width:15%"></th>
               </tr></thead>
               <tbody>
               <% @group.memberships.each do |membership| %>
               <% next if membership.new_record? %>
               <tr id="member-<%= membership.id %>" class="<%= cycle 'odd', 'even' %> class">
               <td class="project"><%=h membership.project %></td>
               <td class="roles">
                 <span id="member-<%= membership.id %>-roles"><%=h membership.roles.sort.collect(&:to_s).join(', ') %></span>
-                <% remote_form_for(:membership, :url => { :action => 'edit_membership', :id => @group, :membership_id => membership },
+                <%= form_for(:membership, :remote => true,
-                                                :html => { :id => "member-#{membership.id}-roles-form", :style => 'display:none;'}) do %>
+                             :url => { :action => 'edit_membership', :id => @group, :membership_id => membership },
+                             :html => { :id => "member-#{membership.id}-roles-form", :style => 'display:none;'}) do %>
                     <p><% roles.each do |role| %>
                     <label><%= check_box_tag 'membership[role_ids][]', role.id, membership.roles.include?(role) %> <%=h role %></label><br />
                     <% end %></p>
                     <p><%= submit_tag l(:button_change) %>
                     <%= link_to_function(
                           l(:button_cancel),
                           "$('member-#{membership.id}-roles').show(); $('member-#{membership.id}-roles-form').hide(); return false;"
                         ) %></p>
                 <% end %>
               </td>
               <td class="buttons">
                   <%= link_to_function(
                         l(:button_edit),
                         "$('member-#{membership.id}-roles').hide(); $('member-#{membership.id}-roles-form').show(); return false;",
                         :class => 'icon icon-edit'
                       ) %>
                   <%= link_to_remote(
                         l(:button_delete),
                         { :url => { :controller => 'groups',
                                     :action => 'destroy_membership',
                                     :id => @group,
                                     :membership_id => membership },
                            :method => :post },
                         :class => 'icon icon-del' ) %>
               </td>
               </tr>
             <% end; reset_cycle %>
               </tbody>
             </table>
             <% else %>
             <p class="nodata"><%= l(:label_no_data) %></p>
             <% end %>
             </div>
             <div class="splitcontentright">
             <% if projects.any? %>
             <fieldset><legend><%=l(:label_project_new)%></legend>
-            <% remote_form_for(:membership, :url => { :action => 'edit_membership', :id => @group }) do %>
+            <%= form_for(:membership, :remote => true, :url => { :action => 'edit_membership', :id => @group }) do %>
             <%= label_tag "membership_project_id", l(:description_choose_project), :class => "hidden-for-sighted" %>
             <%= select_tag 'membership[project_id]', options_for_membership_project_select(@group, projects) %>
             <p><%= l(:label_role_plural) %>:
             <% roles.each do |role| %>
               <label><%= check_box_tag 'membership[role_ids][]', role.id %> <%=h role %></label>
             <% end %></p>
             <p><%= submit_tag l(:button_add) %></p>
             <% end %>
             </fieldset>
             <% end %>
             </div>

app/views/groups/_users.html.erb +2 -1

             <div class="splitcontentleft">
             <% if @group.users.any? %>
               <table class="list users">
                 <thead><tr>
                   <th><%= l(:label_user) %></th>
                   <th style="width:15%"></th>
                 </tr></thead>
                 <tbody>
                 <% @group.users.sort.each do |user| %>
                   <tr id="user-<%= user.id %>" class="<%= cycle 'odd', 'even' %>">
                     <td class="user"><%= link_to_user user %></td>
                     <td class="buttons">
                         <%= link_to_remote(
                               l(:button_delete),
                               { :url => group_user_path(@group, :user_id => user),
                                 :method => :delete },
                               :class => 'icon icon-del'
                             ) %>
                     </td>
                   </tr>
                 <% end %>
                 </tbody>
               </table>
             <% else %>
               <p class="nodata"><%= l(:label_no_data) %></p>
             <% end %>
             </div>
             <div class="splitcontentright">
             <% users = User.active.not_in_group(@group).all(:limit => 100) %>
             <% if users.any? %>
-              <% remote_form_for(@group, :url => group_users_path(@group), :html => {:method => :post}) do |f| %>
+              <%= form_for(@group, :remote => true, :url => group_users_path(@group),
+                           :html => {:method => :post}) do |f| %>
                 <fieldset><legend><%=l(:label_user_new)%></legend>
                 <p><%= label_tag "user_search", l(:label_user_search) %><%= text_field_tag 'user_search', nil %></p>
                 <%= observe_field(:user_search,
                              :frequency => 0.5,
                              :update => :users,
                              :url => autocomplete_for_user_group_path(@group),
                              :method => :get,
                              :before => '$("user_search").addClassName("ajax-loading")',
                              :complete => '$("user_search").removeClassName("ajax-loading")',
                              :with => 'q')
                               %>
                 <div id="users">
                   <%= principals_check_box_tags 'user_ids[]', users %>
                 </div>
                 <p><%= submit_tag l(:button_add) %></p>
                 </fieldset>
               <% end %>
             <% end %>
             </div>

app/views/groups/new.html.erb +1 -1

             <h2><%= link_to l(:label_group_plural), groups_path %> &#187; <%= l(:label_group_new) %></h2>
-            <% labelled_form_for @group do |f| %>
+            <%= labelled_form_for @group do |f| %>
             <%= render :partial => 'form', :locals => { :f => f } %>
             <p>
               <%= f.submit l(:button_create) %>
               <%= f.submit l(:button_create_and_continue), :name => 'continue' %>
             </p>
             <% end %>

app/views/issue_categories/destroy.html.erb +1 -1

             <h2><%=l(:label_issue_category)%>: <%=h @category.name %></h2>
-            <% form_tag(issue_category_path(@category), :method => :delete) do %>
+            <%= form_tag(issue_category_path(@category), :method => :delete) do %>
             <div class="box">
             <p><strong><%= l(:text_issue_category_destroy_question, @issue_count) %></strong></p>
             <p><label><%= radio_button_tag 'todo', 'nullify', true %> <%= l(:text_issue_category_destroy_assignments) %></label><br />
             <% if @categories.size > 0 %>
             <label><%= radio_button_tag 'todo', 'reassign', false %> <%= l(:text_issue_category_reassign_to) %></label>:
             <%= label_tag "reassign_to_id", l(:description_issue_category_reassign), :class => "hidden-for-sighted" %>
             <%= select_tag 'reassign_to_id', options_from_collection_for_select(@categories, 'id', 'name') %></p>
             <% end %>
             </div>
             <%= submit_tag l(:button_apply) %>
             <%= link_to l(:button_cancel), :controller => 'projects', :action => 'settings', :id => @project, :tab => 'categories' %>
             <% end %>

app/views/issue_statuses/edit.html.erb +1 -1

             <h2><%= link_to l(:label_issue_status_plural), issue_statuses_path %> &#187; <%=h @issue_status %></h2>
-            <% labelled_form_for @issue_status do |f| %>
+            <%= labelled_form_for @issue_status do |f| %>
               <%= render :partial => 'form', :locals => {:f => f} %>
               <%= submit_tag l(:button_save) %>
             <% end %>

app/views/issue_statuses/new.html.erb +1 -1

             <h2><%= link_to l(:label_issue_status_plural), issue_statuses_path %> &#187; <%=l(:label_issue_status_new)%></h2>
-            <% labelled_form_for @issue_status do |f| %>
+            <%= labelled_form_for @issue_status do |f| %>
               <%= render :partial => 'form', :locals => {:f => f} %>
               <%= submit_tag l(:button_create) %>
             <% end %>

app/views/issues/_action_menu.html.erb +1 -1

             <div class="contextual">
             <%= link_to_if_authorized(l(:button_update), {:controller => 'issues', :action => 'edit', :id => @issue }, :onclick => 'showAndScrollTo("update", "notes"); return false;', :class => 'icon icon-edit', :accesskey => accesskey(:edit)) %>
-            <%= link_to_if_authorized l(:button_log_time), {:controller => 'timelog', :action => 'new', :issue_id => @issue}, :class => 'icon icon-time-add' %>
+            <%= link_to l(:button_log_time), new_issue_time_entry_path(@issue), :class => 'icon icon-time-add' if User.current.allowed_to?(:log_time, @project) %>
             <%= watcher_tag(@issue, User.current) %>
             <%= link_to_if_authorized l(:button_copy), {:controller => 'issues', :action => 'new', :project_id => @project, :copy_from => @issue}, :class => 'icon icon-copy' %>
             <%= link_to l(:button_delete), issue_path(@issue), :confirm => issues_destroy_confirmation_message(@issue), :method => :delete, :class => 'icon icon-del' if User.current.allowed_to?(:delete_issues, @project) %>
             </div>

app/views/issues/_attributes.html.erb +1 -1

-            <% labelled_fields_for :issue, @issue do |f| %>
+            <%= labelled_fields_for :issue, @issue do |f| %>
             <div class="splitcontent">
             <div class="splitcontentleft">
             <% if @issue.safe_attribute? 'status_id'  %>
             <p><%= f.select :status_id, (@allowed_statuses.collect {|p| [p.name, p.id]}), :required => true %></p>
             <% else %>
             <p><label><%= l(:field_status) %></label> <%= h(@issue.status.name) %></p>
             <% end %>
             <% if @issue.safe_attribute? 'priority_id' %>
             <p><%= f.select :priority_id, (@priorities.collect {|p| [p.name, p.id]}), {:required => true}, :disabled => !@issue.leaf? %></p>
             <% end %>
             <% if @issue.safe_attribute? 'assigned_to_id' %>
             <p><%= f.select :assigned_to_id, principals_options_for_select(@issue.assignable_users, @issue.assigned_to), :include_blank => true %></p>
             <% end %>
             <% if @issue.safe_attribute?('category_id') && @issue.project.issue_categories.any? %>
             <p><%= f.select :category_id, (@issue.project.issue_categories.collect {|c| [c.name, c.id]}), :include_blank => true %>
             <%= prompt_to_remote(image_tag('add.png', :style => 'vertical-align: middle;'),
                                  l(:label_issue_category_new),
                                  'issue_category[name]',
                                  {:controller => 'issue_categories', :action => 'create', :project_id => @issue.project},
                                  :title => l(:label_issue_category_new),
                                  :tabindex => 199) if User.current.allowed_to?(:manage_categories, @issue.project) %></p>
             <% end %>
             <% if @issue.safe_attribute?('fixed_version_id') && @issue.assignable_versions.any? %>
             <p><%= f.select :fixed_version_id, version_options_for_select(@issue.assignable_versions, @issue.fixed_version), :include_blank => true %>
             <%= link_to_remote(image_tag('add.png', :style => 'vertical-align: middle;'),
                                {:url => new_project_version_path(@issue.project), :method => 'get'},
                                :title => l(:label_version_new),
                                :tabindex => 200) if User.current.allowed_to?(:manage_versions, @issue.project) %>
             </p>
             <% end %>
             </div>
             <div class="splitcontentright">
             <% if @issue.safe_attribute? 'parent_issue_id' %>
             <p id="parent_issue"><%= f.text_field :parent_issue_id, :size => 10 %></p>
             <div id="parent_issue_candidates" class="autocomplete"></div>
             <%= javascript_tag "observeParentIssueField('#{auto_complete_issues_path(:id => @issue, :project_id => @issue.project) }')" %>
             <% end %>
             <% if @issue.safe_attribute? 'start_date' %>
             <p><%= f.text_field :start_date, :size => 10, :disabled => !@issue.leaf? %><%= calendar_for('issue_start_date') if @issue.leaf? %></p>
             <% end %>
             <% if @issue.safe_attribute? 'due_date' %>
             <p><%= f.text_field :due_date, :size => 10, :disabled => !@issue.leaf? %><%= calendar_for('issue_due_date') if @issue.leaf? %></p>
             <% end %>
             <% if @issue.safe_attribute? 'estimated_hours' %>
             <p><%= f.text_field :estimated_hours, :size => 3, :disabled => !@issue.leaf? %> <%= l(:field_hours) %></p>
             <% end %>
             <% if @issue.safe_attribute?('done_ratio') && @issue.leaf? && Issue.use_field_for_done_ratio? %>
             <p><%= f.select :done_ratio, ((0..10).to_a.collect {|r| ["#{r*10} %", r*10] }) %></p>
             <% end %>
             </div>
             </div>
             <% if @issue.safe_attribute? 'custom_field_values' %>
             <%= render :partial => 'issues/form_custom_fields' %>
             <% end %>
             <% end %>

app/views/issues/_edit.html.erb +2 -2

-            <% labelled_form_for @issue, :html => {:id => 'issue-form', :multipart => true} do |f| %>
+            <%= labelled_form_for @issue, :html => {:id => 'issue-form', :multipart => true} do |f| %>
                 <%= error_messages_for 'issue', 'time_entry' %>
                 <%= render :partial => 'conflict' if @conflict %>
                 <div class="box">
                 <% if @edit_allowed || !@allowed_statuses.empty? %>
                     <fieldset class="tabular"><legend><%= l(:label_change_properties) %></legend>
                     <div id="all_attributes">
                     <%= render :partial => 'form', :locals => {:f => f} %>
                     </div>
                     </fieldset>
                 <% end %>
                 <% if User.current.allowed_to?(:log_time, @project) %>
                     <fieldset class="tabular"><legend><%= l(:button_log_time) %></legend>
-                    <% labelled_fields_for :time_entry, @time_entry do |time_entry| %>
+                    <%= labelled_fields_for :time_entry, @time_entry do |time_entry| %>
                     <div class="splitcontentleft">
                     <p><%= time_entry.text_field :hours, :size => 6, :label => :label_spent_time %> <%= l(:field_hours) %></p>
                     </div>
                     <div class="splitcontentright">
                     <p><%= time_entry.select :activity_id, activity_collection_for_select_options %></p>
                     </div>
                     <p><%= time_entry.text_field :comments, :size => 60 %></p>
                     <% @time_entry.custom_field_values.each do |value| %>
                       <p><%= custom_field_tag_with_label :time_entry, value %></p>
                     <% end %>
                     <% end %>
                 </fieldset>
                 <% end %>
                 <fieldset><legend><%= l(:field_notes) %></legend>
                 <%= text_area_tag 'notes', @notes, :cols => 60, :rows => 10, :class => 'wiki-edit' %>
                 <%= wikitoolbar_for 'notes' %>
                 <%= call_hook(:view_issues_edit_notes_bottom, { :issue => @issue, :notes => @notes, :form => f }) %>
                 <p><%=l(:label_attachment_plural)%><br /><%= render :partial => 'attachments/form', :locals => {:container => @issue} %></p>
                 </fieldset>
                 </div>
                 <%= f.hidden_field :lock_version %>
                 <%= hidden_field_tag 'last_journal_id', params[:last_journal_id] || @issue.last_journal_id %>
                 <%= submit_tag l(:button_submit) %>
                 <%= link_to_remote l(:label_preview),
                                    { :url => preview_edit_issue_path(:project_id => @project, :id => @issue),
                                      :method => 'post',
                                      :update => 'preview',
                                      :with => 'Form.serialize("issue-form")',
                                      :complete => "Element.scrollTo('preview')"
                                    }, :accesskey => accesskey(:preview) %>
             <% end %>
             <div id="preview" class="wiki"></div>

app/views/issues/_form.html.erb +2 -2

-            <% labelled_fields_for :issue, @issue do |f| %>
+            <%= labelled_fields_for :issue, @issue do |f| %>
             <%= call_hook(:view_issues_form_details_top, { :issue => @issue, :form => f }) %>
             <% if @issue.safe_attribute? 'is_private' %>
             <p style="float:right; margin-right:1em;">
               <label class="inline" for="issue_is_private" id="issue_is_private_label"><%= f.check_box :is_private, :no_label => true %> <%= l(:field_is_private) %></label>
             </p>
             <% end %>
             <% if @issue.safe_attribute? 'project_id' %>
             <p><%= f.select :project_id, project_tree_options_for_select(@issue.allowed_target_projects, :selected => @issue.project), :required => true %></p>
             <%= observe_field :issue_project_id, :url => project_issue_form_path(@project, :id => @issue, :project_change => '1'),
                                                  :with => "Form.serialize('issue-form')" %>
             <% end %>
             <% if @issue.safe_attribute? 'tracker_id' %>
             <p><%= f.select :tracker_id, @issue.project.trackers.collect {|t| [t.name, t.id]}, :required => true %></p>
             <%= observe_field :issue_tracker_id, :url => project_issue_form_path(@project, :id => @issue),
                                                  :with => "Form.serialize('issue-form')" %>
             <% end %>
             <% if @issue.safe_attribute? 'subject' %>
             <p><%= f.text_field :subject, :size => 80, :required => true %></p>
             <% end %>
             <% if @issue.safe_attribute? 'description' %>
             <p>
               <label><%= l(:field_description) %></label>
               <%= link_to_function image_tag('edit.png'),
                 'Element.hide(this); Effect.toggle("issue_description_and_toolbar", "appear", {duration:0.3})' unless @issue.new_record? %>
-              <% content_tag 'span', :id => "issue_description_and_toolbar", :style => (@issue.new_record? ? nil : 'display:none') do %>
+              <%= content_tag 'span', :id => "issue_description_and_toolbar", :style => (@issue.new_record? ? nil : 'display:none') do %>
                 <%= f.text_area :description,
                                :cols => 60,
                                :rows => (@issue.description.blank? ? 10 : [[10, @issue.description.length / 50].max, 100].min),
                                :accesskey => accesskey(:edit),
                                :class => 'wiki-edit',
                                :no_label => true %>
               <% end %>
             </p>
             <%= wikitoolbar_for 'issue_description' %>
             <% end %>
             <div id="attributes" class="attributes">
               <%= render :partial => 'issues/attributes' %>
             </div>
             <%= call_hook(:view_issues_form_details_bottom, { :issue => @issue, :form => f }) %>
             <% end %>

app/views/issues/_list.html.erb +3 -3

-            <% form_tag({}) do -%>
+            <%= form_tag({}) do -%>
             <%= hidden_field_tag 'back_url', url_for(params), :id => nil %>
             <div class="autoscroll">
             <table class="list issues">
                 <thead><tr>
                     <th class="checkbox hide-when-print"><%= link_to image_tag('toggle_check.png'), {}, :onclick => 'toggleIssuesSelection(Element.up(this, "form")); return false;',
                                                                        :title => "#{l(:button_check_all)}/#{l(:button_uncheck_all)}" %>
                     </th>
                 <%= sort_header_tag('id', :caption => '#', :default_order => 'desc') %>
                     <% query.columns.each do |column| %>
                       <%= column_header(column) %>
                     <% end %>
               </tr></thead>
               <% previous_group = false %>
               <tbody>
               <% issue_list(issues) do |issue, level| -%>
               <% if @query.grouped? && (group = @query.group_by_column.value(issue)) != previous_group %>
                 <% reset_cycle %>
                 <tr class="group open">
                   <td colspan="<%= query.columns.size + 2 %>">
                     <span class="expander" onclick="toggleRowGroup(this);">&nbsp;</span>
                     <%= group.blank? ? 'None' : column_content(@query.group_by_column, issue) %> <span class="count">(<%= @issue_count_by_group[group] %>)</span>
                     <%= link_to_function("#{l(:button_collapse_all)}/#{l(:button_expand_all)}", "toggleAllRowGroups(this)", :class => 'toggle-all') %>
                   </td>
                 </tr>
                 <% previous_group = group %>
               <% end %>
               <tr id="issue-<%= issue.id %>" class="hascontextmenu <%= cycle('odd', 'even') %> <%= issue.css_classes %> <%= level > 0 ? "idnt idnt-#{level}" : nil %>">
                 <td class="checkbox hide-when-print"><%= check_box_tag("ids[]", issue.id, false, :id => nil) %></td>
-                <td class="id"><%= link_to issue.id, :controller => 'issues', :action => 'show', :id => issue %></td>
+                <td class="id"><%= link_to issue.id, issue_path(issue) %></td>
-                    <% query.columns.each do |column| %><%= content_tag 'td', column_content(column, issue), :class => column.css_classes %><% end %>
+                    <%= raw query.columns.map {|column| "<td class=\"#{column.css_classes}\">#{column_content(column, issue)}</td>"}.join %>
               </tr>
               <% end -%>
               </tbody>
             </table>
             </div>
             <% end -%>

app/views/issues/_list_simple.html.erb +1 -1

             <% if issues && issues.any? %>
-            <% form_tag({}) do %>
+            <%= form_tag({}) do %>
               <table class="list issues">
                 <thead><tr>
                 <th>#</th>
                 <th><%=l(:field_project)%></th>
                 <th><%=l(:field_tracker)%></th>
                 <th><%=l(:field_subject)%></th>
                 </tr></thead>
                 <tbody>
                 <% for issue in issues %>
                 <tr id="issue-<%= h(issue.id) %>" class="hascontextmenu <%= cycle('odd', 'even') %> <%= issue.css_classes %>">
                   <td class="id">
                     <%= check_box_tag("ids[]", issue.id, false, :style => 'display:none;', :id => nil) %>
                     <%= link_to(h(issue.id), :controller => 'issues', :action => 'show', :id => issue) %>
                   </td>
                   <td class="project"><%= link_to_project(issue.project) %></td>
                   <td class="tracker"><%=h issue.tracker %></td>
                   <td class="subject">
                     <%= link_to h(truncate(issue.subject, :length => 60)), :controller => 'issues', :action => 'show', :id => issue %> (<%=h issue.status %>)
                   </td>
                 </tr>
                 <% end %>
                 </tbody>
               </table>
             <% end %>
             <% else %>
               <p class="nodata"><%= l(:label_no_data) %></p>
             <% end %>

app/views/issues/bulk_edit.html.erb +1 -1

             <h2><%= @copy ? l(:button_copy) : l(:label_bulk_edit_selected_issues) %></h2>
             <ul><%= @issues.collect {|i|
                         content_tag('li',
                                     link_to(h("#{i.tracker} ##{i.id}"),
                                             { :action => 'show', :id => i }
                                         ) + h(": #{i.subject}"))
                      }.join("\n").html_safe %></ul>
-            <% form_tag({:action => 'bulk_update'}, :id => 'bulk_edit_form') do %>
+            <%= form_tag({:action => 'bulk_update'}, :id => 'bulk_edit_form') do %>
             <%= @issues.collect {|i| hidden_field_tag('ids[]', i.id)}.join("\n").html_safe %>
             <div class="box tabular">
             <fieldset class="attributes">
             <legend><%= l(:label_change_properties) %></legend>
             <div class="splitcontentleft">
             <% if @allowed_projects.present? %>
             <p>
               <label for="issue_project_id"><%= l(:field_project) %></label>
               <%= select_tag('issue[project_id]', content_tag('option', l(:label_no_change_option), :value => '') + project_tree_options_for_select(@allowed_projects, :selected => @target_project)) %>
             </p>
             <%= observe_field :issue_project_id, :url => {:action => 'bulk_edit'},
                                                  :update => 'content',
                                                  :with => "Form.serialize('bulk_edit_form')" %>
             <% end %>
             <p>
               <label for="issue_tracker_id"><%= l(:field_tracker) %></label>
               <%= select_tag('issue[tracker_id]', content_tag('option', l(:label_no_change_option), :value => '') + options_from_collection_for_select(@trackers, :id, :name)) %>
             </p>
             <% if @available_statuses.any? %>
             <p>
               <label for='issue_status_id'><%= l(:field_status) %></label>
               <%= select_tag('issue[status_id]',content_tag('option', l(:label_no_change_option), :value => '') + options_from_collection_for_select(@available_statuses, :id, :name)) %>
             </p>
             <% end %>
             <p>
               <label for='issue_priority_id'><%= l(:field_priority) %></label>
               <%= select_tag('issue[priority_id]', content_tag('option', l(:label_no_change_option), :value => '') + options_from_collection_for_select(IssuePriority.active, :id, :name)) %>
             </p>
             <p>
               <label for='issue_assigned_to_id'><%= l(:field_assigned_to) %></label>
               <%= select_tag('issue[assigned_to_id]', content_tag('option', l(:label_no_change_option), :value => '') +
                                              content_tag('option', l(:label_nobody), :value => 'none') +
                                              principals_options_for_select(@assignables)) %>
             </p>
             <p>
               <label for='issue_category_id'><%= l(:field_category) %></label>
               <%= select_tag('issue[category_id]', content_tag('option', l(:label_no_change_option), :value => '') +
                                             content_tag('option', l(:label_none), :value => 'none') +
                                             options_from_collection_for_select(@categories, :id, :name)) %>
             </p>
             <p>
               <label for='issue_fixed_version_id'><%= l(:field_fixed_version) %></label>
               <%= select_tag('issue[fixed_version_id]', content_tag('option', l(:label_no_change_option), :value => '') +
                                                content_tag('option', l(:label_none), :value => 'none') +
                                                version_options_for_select(@versions.sort)) %>
             </p>
             <% @custom_fields.each do |custom_field| %>
               <p><label><%= h(custom_field.name) %></label> <%= custom_field_tag_for_bulk_edit('issue', custom_field, @projects) %></p>
             <% end %>
             <% if @copy && @attachments_present %>
             <p>
               <label for='copy_attachments'><%= l(:label_copy_attachments) %></label>
               <%= check_box_tag 'copy_attachments', '1', true %>
             </p>
             <% end %>
             <%= call_hook(:view_issues_bulk_edit_details_bottom, { :issues => @issues }) %>
             </div>
             <div class="splitcontentright">
             <% if @safe_attributes.include?('is_private') %>
             <p>
               <label for='issue_is_private'><%= l(:field_is_private) %></label>
               <%= select_tag('issue[is_private]', content_tag('option', l(:label_no_change_option), :value => '') +
                                             content_tag('option', l(:general_text_Yes), :value => '1') +
                                             content_tag('option', l(:general_text_No), :value => '0')) %>
             </p>
             <% end %>
             <% if @project && User.current.allowed_to?(:manage_subtasks, @project) %>
             <p>
               <label for='issue_parent_issue_id'><%= l(:field_parent_issue) %></label>
               <%= text_field_tag 'issue[parent_issue_id]', '', :size => 10 %>
             </p>
             <div id="parent_issue_candidates" class="autocomplete"></div>
             <%= javascript_tag "observeParentIssueField('#{auto_complete_issues_path(:project_id => @project) }')" %>
             <% end %>
             <p>
               <label for='issue_start_date'><%= l(:field_start_date) %></label>
               <%= text_field_tag 'issue[start_date]', '', :size => 10 %><%= calendar_for('issue_start_date') %>
             </p>
             <p>
               <label for='issue_due_date'><%= l(:field_due_date) %></label>
               <%= text_field_tag 'issue[due_date]', '', :size => 10 %><%= calendar_for('issue_due_date') %>
             </p>
             <% if Issue.use_field_for_done_ratio? %>
             <p>
               <label for='issue_done_ratio'><%= l(:field_done_ratio) %></label>
               <%= select_tag 'issue[done_ratio]', options_for_select([[l(:label_no_change_option), '']] + (0..10).to_a.collect {|r| ["#{r*10} %", r*10] }) %>
             </p>
             <% end %>
             </div>
             </fieldset>
             <fieldset><legend><%= l(:field_notes) %></legend>
             <%= text_area_tag 'notes', @notes, :cols => 60, :rows => 10, :class => 'wiki-edit' %>
             <%= wikitoolbar_for 'notes' %>
             </fieldset>
             </div>
             <p>
             	<% if @copy %>
             	  <%= hidden_field_tag 'copy', '1' %>
             	  <%= submit_tag l(:button_copy) %>
             	  <%= submit_tag l(:button_copy_and_follow), :name => 'follow' %>
             	<% elsif @target_project %>
             	  <%= submit_tag l(:button_move) %>
             	  <%= submit_tag l(:button_move_and_follow), :name => 'follow' %>
             	<% else %>
             	  <%= submit_tag l(:button_submit) %>
             	<% end %>
             </p>
             <% end %>

app/views/issues/destroy.html.erb +1 -1

             <h2><%= l(:label_confirmation) %></h2>
-            <% form_tag({}, :method => :delete)  do %>
+            <%= form_tag({}, :method => :delete)  do %>
             <%= @issues.collect {|i| hidden_field_tag('ids[]', i.id)}.join("\n").html_safe %>
             <div class="box">
             <p><strong><%= l(:text_destroy_time_entries_question, :hours => number_with_precision(@hours, :precision => 2)) %></strong></p>
             <p>
             <label><%= radio_button_tag 'todo', 'destroy', true %> <%= l(:text_destroy_time_entries) %></label><br />
             <label><%= radio_button_tag 'todo', 'nullify', false %> <%= l(:text_assign_time_entries_to_project) %></label><br />
             <label><%= radio_button_tag 'todo', 'reassign', false, :onchange => 'if (this.checked) { $("reassign_to_id").focus(); }' %> <%= l(:text_reassign_time_entries) %></label>
             <%= text_field_tag 'reassign_to_id', params[:reassign_to_id], :size => 6, :onfocus => '$("todo_reassign").checked=true;' %>
             </p>
             </div>
             <%= submit_tag l(:button_apply) %>
             <% end %>

app/views/issues/index.html.erb +2 -2

             <div class="contextual">
             <% if !@query.new_record? && @query.editable_by?(User.current) %>
               <%= link_to l(:button_edit), edit_query_path(@query), :class => 'icon icon-edit' %>
               <%= link_to l(:button_delete), query_path(@query), :confirm => l(:text_are_you_sure),
                           :method => :delete, :class => 'icon icon-del' %>
             <% end %>
             </div>
             <h2><%= @query.new_record? ? l(:label_issue_plural) : h(@query.name) %></h2>
             <% html_title(@query.new_record? ? l(:label_issue_plural) : @query.name) %>
-            <% form_tag({ :controller => 'issues', :action => 'index', :project_id => @project },
+            <%= form_tag({ :controller => 'issues', :action => 'index', :project_id => @project },
                         :method => :get, :id => 'query_form') do %>
                 <%= hidden_field_tag 'set_filter', '1' %>
                 <div id="query_form_content" class="hide-when-print">
                 <fieldset id="filters" class="collapsible <%= @query.new_record? ? "" : "collapsed" %>">
                   <legend onclick="toggleFieldset(this);"><%= l(:label_filter_plural) %></legend>
                   <div style="<%= @query.new_record? ? "" : "display: none;" %>">
                     <%= render :partial => 'queries/filters', :locals => {:query => @query} %>
                   </div>
                 </fieldset>
                 <fieldset class="collapsible collapsed">
                   <legend onclick="toggleFieldset(this);"><%= l(:label_options) %></legend>
                   <div style="display: none;">
                     <table>
                       <tr>
                         <td><%= l(:field_column_names) %></td>
                         <td><%= render :partial => 'queries/columns', :locals => {:query => @query} %></td>
                       </tr>
                       <tr>
                         <td><label for='group_by'><%= l(:field_group_by) %></label></td>
                         <td><%= select_tag('group_by',
                                            options_for_select(
                                              [[]] + @query.groupable_columns.collect {|c| [c.caption, c.name.to_s]},
                                              @query.group_by)
                                    ) %></td>
                       </tr>
                     </table>
                   </div>
                 </fieldset>
                 </div>
                 <p class="buttons hide-when-print">
                 <%= link_to_function l(:button_apply), 'submit_query_form("query_form")', :class => 'icon icon-checked' %>
                 <%= link_to l(:button_clear), { :set_filter => 1, :project_id => @project }, :class => 'icon icon-reload'  %>
                 <% if @query.new_record? && User.current.allowed_to?(:save_queries, @project, :global => true) %>
                     <%= link_to_function l(:button_save),
                                          "$('query_form').action='#{ @project ? new_project_query_path(@project) : new_query_path }'; submit_query_form('query_form')",
                                          :class => 'icon icon-save' %>
                 <% end %>
                 </p>
             <% end %>
             <%= error_messages_for 'query' %>
             <% if @query.valid? %>
             <% if @issues.empty? %>
             <p class="nodata"><%= l(:label_no_data) %></p>
             <% else %>
             <%= render :partial => 'issues/list', :locals => {:issues => @issues, :query => @query} %>
             <p class="pagination"><%= pagination_links_full @issue_pages, @issue_count %></p>
             <% end %>
             <% other_formats_links do |f| %>
               <%= f.link_to 'Atom', :url => params.merge(:key => User.current.rss_key) %>
               <%= f.link_to 'CSV', :url => params, :onclick => "showModal('csv-export-options', '330px'); return false;" %>
               <%= f.link_to 'PDF', :url => params %>
             <% end %>
             <div id="csv-export-options" style="display:none;">
               <h3 class="title"><%= l(:label_export_options, :export_format => 'CSV') %></h3>
-              <% form_tag(params.merge({:format => 'csv',:page=>nil}), :method => :get, :id => 'csv-export-form') do %>
+              <%= form_tag(params.merge({:format => 'csv',:page=>nil}), :method => :get, :id => 'csv-export-form') do %>
               <p>
                 <label><%= radio_button_tag 'columns', '', true %> <%= l(:description_selected_columns) %></label><br />
                 <label><%= radio_button_tag 'columns', 'all' %> <%= l(:description_all_columns) %></label>
               </p>
               <p>
                 <label><%= check_box_tag 'description', '1' %> <%= l(:field_description) %></label>
               </p>
               <p class="buttons">
                 <%= submit_tag l(:button_export), :name => nil, :onclick => "hideModal(this);" %>
                 <%= submit_tag l(:button_cancel), :name => nil, :onclick => "hideModal(this);", :type => 'button' %>
               </p>
               <% end %>
             </div>
             <% end %>
             <%= call_hook(:view_issues_index_bottom, { :issues => @issues, :project => @project, :query => @query }) %>
             <% content_for :sidebar do %>
                 <%= render :partial => 'issues/sidebar' %>
             <% end %>
             <% content_for :header_tags do %>
                 <%= auto_discovery_link_tag(:atom,
                                             {:query_id => @query, :format => 'atom',
                                              :page => nil, :key => User.current.rss_key},
                                             :title => l(:label_issue_plural)) %>
                 <%= auto_discovery_link_tag(:atom,
                                             {:controller => 'journals', :action => 'index',
                                              :query_id => @query, :format => 'atom',
                                              :page => nil, :key => User.current.rss_key},
                                             :title => l(:label_changes_details)) %>
             <% end %>
             <%= context_menu issues_context_menu_path %>

app/views/issues/new.html.erb +1 -1

             <h2><%=l(:label_issue_new)%></h2>
             <%= call_hook(:view_issues_new_top, {:issue => @issue}) %>
-            <% labelled_form_for @issue, :url => project_issues_path(@project),
+            <%= labelled_form_for @issue, :url => project_issues_path(@project),
                                          :html => {:id => 'issue-form', :multipart => true} do |f| %>
               <%= error_messages_for 'issue' %>
               <%= hidden_field_tag 'copy_from', params[:copy_from] if params[:copy_from] %>
               <div class="box tabular">
                 <div id="all_attributes">
                 <%= render :partial => 'issues/form', :locals => {:f => f} %>
                 </div>
                 <% if @copy_from && @copy_from.attachments.any? %>
                 <p>
                   <label for="copy_attachments"><%= l(:label_copy_attachments) %></label>
                   <%= check_box_tag 'copy_attachments', '1', @copy_attachments %>
                 </p>
                 <% end %>
                 <p id="attachments_form"><%= label_tag('attachments[1][file]', l(:label_attachment_plural))%><%= render :partial => 'attachments/form', :locals => {:container => @issue} %></p>
                 <% if @issue.safe_attribute? 'watcher_user_ids' -%>
                   <p id="watchers_form"><label><%= l(:label_issue_watchers) %></label>
                   <span id="watchers_inputs">
                     <%= watchers_checkboxes(@issue, @available_watchers) %>
                   </span>
                   <span class="search_for_watchers">
                   <%= link_to_remote l(:label_search_for_watchers),
                                :url => {:controller => 'watchers', :action => 'new', :project_id => @issue.project},
                                :method => 'get' %>
                   </span>
                   </p>
                 <% end %>
               </div>
               <%= submit_tag l(:button_create) %>
               <%= submit_tag l(:button_create_and_continue), :name => 'continue' %>
               <%= link_to_remote l(:label_preview),
                                    { :url => preview_new_issue_path(:project_id => @project),
                                      :method => 'post',
                                      :update => 'preview',
                                      :with => "Form.serialize('issue-form')",
                                      :complete => "Element.scrollTo('preview')"
                                    }, :accesskey => accesskey(:preview) %>
               <%= javascript_tag "Form.Element.focus('issue_subject');" %>
             <% end %>
             <div id="preview" class="wiki"></div>
             <% content_for :header_tags do %>
                 <%= stylesheet_link_tag 'scm' %>
                 <%= robot_exclusion_tag %>
             <% end %>

app/views/journals/_notes_form.html.erb +1 -1

-            <% form_remote_tag(:url => {}, :html => { :id => "journal-#{@journal.id}-form" }) do %>
+            <%= form_remote_tag(:url => {}, :html => { :id => "journal-#{@journal.id}-form" }) do %>
                 <%= label_tag "notes", l(:description_notes), :class => "hidden-for-sighted" %>
                 <%= text_area_tag :notes, @journal.notes,
                       :id => "journal_#{@journal.id}_notes",
                       :class => 'wiki-edit',
                       :rows => (@journal.notes.blank? ? 10 : [[10, @journal.notes.length / 50].max, 100].min) %>
                 <%= call_hook(:view_journals_notes_form_after_notes, { :journal => @journal}) %>
                 <p><%= submit_tag l(:button_save) %>
                 <%= link_to_remote l(:label_preview),
                                    { :url => preview_edit_issue_path(:project_id => @project, :id => @journal.issue),
                                      :method => 'post',
                                      :update => "journal_#{@journal.id}_preview",
                                      :with => "Form.serialize('journal-#{@journal.id}-form')",
                                      :complete => "Element.scrollTo('journal_#{@journal.id}_preview')"
                                    }, :accesskey => accesskey(:preview) %>
                 |
                 <%= link_to l(:button_cancel), '#', :onclick => "Element.remove('journal-#{@journal.id}-form'); " +
                                                                 "Element.show('journal-#{@journal.id}-notes'); return false;" %></p>
                 <div id="journal_<%= @journal.id %>_preview" class="wiki"></div>
             <% end %>
             <%= wikitoolbar_for "journal_#{@journal.id}_notes" %>

app/views/layouts/base.html.erb +6 -6

             <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
             <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
             <head>
             <meta http-equiv="content-type" content="text/html; charset=utf-8" />
             <title><%=h html_title %></title>
             <meta name="description" content="<%= Redmine::Info.app_name %>" />
             <meta name="keywords" content="issue,bug,tracker" />
             <meta http-equiv="X-UA-Compatible" content="IE=9; IE=8; IE=7; IE=EDGE" />
             <%= csrf_meta_tag %>
             <%= favicon %>
             <%= stylesheet_link_tag 'application', :media => 'all' %>
             <%= stylesheet_link_tag 'rtl', :media => 'all' if l(:direction) == 'rtl' %>
             <%= javascript_heads %>
             <%= heads_for_theme %>
             <!--[if IE 6]>
                 <style type="text/css">
                   * html body{ width: expression( document.documentElement.clientWidth < 900 ? '900px' : '100%' ); }
                   body {behavior: url(<%= stylesheet_path "csshover.htc" %>);}
                 </style>
             <![endif]-->
             <%= call_hook :view_layouts_base_html_head %>
             <!-- page specific tags -->
             <%= yield :header_tags -%>
             </head>
             <body class="<%=h body_css_classes %>">
             <div id="wrapper">
             <div id="wrapper2">
             <div id="top-menu">
                 <div id="account">
                     <%= render_menu :account_menu -%>
                 </div>
-                <%= content_tag(
+                <%= content_tag('div', "#{l(:label_logged_as)} #{link_to_user(User.current, :format => :username)}".html_safe, :id => 'loggedas') if User.current.logged? %>
-                       'div',
-                       "#{l(:label_logged_as)} #{link_to_user(User.current, :format => :username)}".html_safe,
-                       :id => 'loggedas') if User.current.logged? %>
                 <%= render_menu :top_menu if User.current.logged? || !Setting.login_required? -%>
             </div>
             <div id="header">
                 <% if User.current.logged? || !Setting.login_required? %>
                 <div id="quick-search">
-                    <% form_tag({:controller => 'search', :action => 'index', :id => @project}, :method => :get ) do %>
+                    <%= form_tag({:controller => 'search', :action => 'index', :id => @project}, :method => :get ) do %>
                     <%= hidden_field_tag(controller.default_search_scope, 1, :id => nil) if controller.default_search_scope %>
                     <label for='q'>
                       <%= link_to l(:label_search), {:controller => 'search', :action => 'index', :id => @project}, :accesskey => accesskey(:search) %>:
                     </label>
                     <%= text_field_tag 'q', @question, :size => 20, :class => 'small', :accesskey => accesskey(:quick_search) %>
                     <% end %>
                     <%= render_project_jump_box %>
                 </div>
                 <% end %>
                 <h1><%= page_header_title %></h1>
                 <% if display_main_menu?(@project) %>
                 <div id="main-menu">
                     <%= render_main_menu(@project) %>
                 </div>
                 <% end %>
             </div>
+            <% content_for :sidebar do %>
+              <%= call_hook :view_layouts_base_sidebar %>
+            <% end %>
             <%= tag('div', {:id => 'main', :class => (has_content?(:sidebar) ? '' : 'nosidebar')}, true) %>
                 <div id="sidebar">
                     <%= yield :sidebar %>
-                    <%= call_hook :view_layouts_base_sidebar %>
                 </div>
                 <div id="content">
                     <%= render_flash_messages %>
                     <%= yield %>
                     <%= call_hook :view_layouts_base_content %>
                     <div style="clear:both;"></div>
                 </div>
             </div>
             <div id="ajax-indicator" style="display:none;"><span><%= l(:label_loading) %></span></div>
             <div id="ajax-modal" style="display:none;"></div>
             <div id="footer">
               <div class="bgl"><div class="bgr">
                 Powered by <%= link_to Redmine::Info.app_name, Redmine::Info.url %> &copy; 2006-2012 Jean-Philippe Lang
               </div></div>
             </div>
             </div>
             </div>
             <%= call_hook :view_layouts_base_body_bottom %>
             </body>
             </html>

app/views/messages/edit.html.erb +7 -5

             <h2><%= link_to h(@board.name), :controller => 'boards',
                            :action => 'show', :project_id => @project,
                            :id => @board %> &#187; <%= h @message.subject %></h2>
-            <% form_for :message, @message,
+            <%= form_for @message, {
-                        :url => {:action => 'edit'},
+                           :as => :message,
-                        :html => {:multipart => true,
+                           :url => {:action => 'edit'},
-                                  :id => 'message-form',
+                           :html => {:multipart => true,
-                                  :method => :post} do |f| %>
+                                     :id => 'message-form',
+                                     :method => :post}
+                      } do |f| %>
               <%= render :partial => 'form',
                          :locals => {:f => f, :replying => !@message.parent.nil?} %>
               <%= submit_tag l(:button_save) %>
               <%= link_to_remote l(:label_preview),
                                  { :url => { :controller => 'messages',
                                              :action => 'preview', :board_id => @board, :id => @message },
                                    :method => 'post',
                                    :update => 'preview',
                                    :with => "Form.serialize('message-form')",
                                    :complete => "Element.scrollTo('preview')"
                                  }, :accesskey => accesskey(:preview) %>
             <% end %>
             <div id="preview" class="wiki"></div>
             <% content_for :header_tags do %>
                 <%= stylesheet_link_tag 'scm' %>
             <% end %>

app/views/messages/new.html.erb +1 -1

             <h2><%= link_to h(@board.name), :controller => 'boards', :action => 'show', :project_id => @project, :id => @board %> &#187; <%= l(:label_message_new) %></h2>
-            <% form_for :message, @message, :url => {:action => 'new'}, :html => {:multipart => true, :id => 'message-form'} do |f| %>
+            <%= form_for @message, :url => {:action => 'new'}, :html => {:multipart => true, :id => 'message-form'} do |f| %>
               <%= render :partial => 'form', :locals => {:f => f} %>
               <%= submit_tag l(:button_create) %>
               <%= link_to_remote l(:label_preview),
                                  { :url => { :controller => 'messages', :action => 'preview', :board_id => @board },
                                    :method => 'post',
                                    :update => 'preview',
                                    :with => "Form.serialize('message-form')",
                                    :complete => "Element.scrollTo('preview')"
                                  }, :accesskey => accesskey(:preview) %>
             <% end %>
             <div id="preview" class="wiki"></div>

app/views/messages/show.html.erb +1 -1

             <%= breadcrumb link_to(l(:label_board_plural), project_boards_path(@project)),
                            link_to(h(@board.name), project_board_path(@project, @board)) %>
             <div class="contextual">
                 <%= watcher_tag(@topic, User.current) %>
                 <%= link_to_remote_if_authorized(
                       l(:button_quote),
                       { :url => {:action => 'quote', :id => @topic} },
                       :class => 'icon icon-comment'
                     ) unless @topic.locked? %>
                 <%= link_to(
                       l(:button_edit),
                       {:action => 'edit', :id => @topic},
                       :class => 'icon icon-edit'
                     ) if @message.editable_by?(User.current) %>
                 <%= link_to(
                       l(:button_delete),
                       {:action => 'destroy', :id => @topic},
                       :method => :post,
                       :confirm => l(:text_are_you_sure),
                       :class => 'icon icon-del'
                      ) if @message.destroyable_by?(User.current) %>
             </div>
             <h2><%= avatar(@topic.author, :size => "24") %><%=h @topic.subject %></h2>
             <div class="message">
             <p><span class="author"><%= authoring @topic.created_on, @topic.author %></span></p>
             <div class="wiki">
             <%= textilizable(@topic, :content) %>
             </div>
             <%= link_to_attachments @topic, :author => false %>
             </div>
             <br />
             <% unless @replies.empty? %>
             <h3 class="comments"><%= l(:label_reply_plural) %> (<%= @reply_count %>)</h3>
             <% @replies.each do |message| %>
               <div class="message reply" id="<%= "message-#{message.id}" %>">
                 <div class="contextual">
                   <%= link_to_remote_if_authorized(
                         image_tag('comment.png'),
                         { :url => {:action => 'quote', :id => message} },
                         :title => l(:button_quote)
                       ) unless @topic.locked? %>
                   <%= link_to(
                         image_tag('edit.png'),
                         {:action => 'edit', :id => message},
                         :title => l(:button_edit)
                       ) if message.editable_by?(User.current) %>
                   <%= link_to(
                         image_tag('delete.png'),
                         {:action => 'destroy', :id => message},
                         :method => :post,
                         :confirm => l(:text_are_you_sure),
                         :title => l(:button_delete)
                       ) if message.destroyable_by?(User.current) %>
                 </div>
               <h4>
                 <%= avatar(message.author, :size => "24") %>
                 <%= link_to h(message.subject), { :controller => 'messages', :action => 'show', :board_id => @board, :id => @topic, :r => message, :anchor => "message-#{message.id}" } %>
                 -
                 <%= authoring message.created_on, message.author %>
               </h4>
               <div class="wiki"><%= textilizable message, :content, :attachments => message.attachments %></div>
               <%= link_to_attachments message, :author => false %>
               </div>
             <% end %>
             <p class="pagination"><%= pagination_links_full @reply_pages, @reply_count, :per_page_links => false %></p>
             <% end %>
             <% if !@topic.locked? && authorize_for('messages', 'reply') %>
             <p><%= toggle_link l(:button_reply), "reply", :focus => 'message_content' %></p>
             <div id="reply" style="display:none;">
-            <% form_for :reply, @reply, :url => {:action => 'reply', :id => @topic}, :html => {:multipart => true, :id => 'message-form'} do |f| %>
+            <%= form_for @reply, :as => :reply, :url => {:action => 'reply', :id => @topic}, :html => {:multipart => true, :id => 'message-form'} do |f| %>
               <%= render :partial => 'form', :locals => {:f => f, :replying => true} %>
               <%= submit_tag l(:button_submit) %>
               <%= link_to_remote l(:label_preview),
                                  { :url => { :controller => 'messages', :action => 'preview', :board_id => @board },
                                    :method => 'post',
                                    :update => 'preview',
                                    :with => "Form.serialize('message-form')",
                                    :complete => "Element.scrollTo('preview')"
                                  }, :accesskey => accesskey(:preview) %>
             <% end %>
             <div id="preview" class="wiki"></div>
             </div>
             <% end %>
             <% content_for :header_tags do %>
               <%= stylesheet_link_tag 'scm' %>
             <% end %>
             <% html_title @topic.subject %>

app/views/my/account.html.erb +1 -1

             <div class="contextual">
             <%= link_to(l(:button_change_password), {:action => 'password'}, :class => 'icon icon-passwd') if @user.change_password_allowed? %>
             <%= call_hook(:view_my_account_contextual, :user => @user)%>
             </div>
             <h2><%=l(:label_my_account)%></h2>
             <%= error_messages_for 'user' %>
-            <% labelled_form_for :user, @user,
+            <%= labelled_form_for :user, @user,
                                  :url => { :action => "account" },
                                  :html => { :id => 'my_account_form',
                                             :method => :post } do |f| %>
             <div class="splitcontentleft">
             <fieldset class="box tabular">
               <legend><%=l(:label_information_plural)%></legend>
               <p><%= f.text_field :firstname, :required => true %></p>
               <p><%= f.text_field :lastname, :required => true %></p>
               <p><%= f.text_field :mail, :required => true %></p>
               <p><%= f.select :language, lang_options_for_select %></p>
               <% if Setting.openid? %>
               <p><%= f.text_field :identity_url  %></p>
               <% end %>
               <% @user.custom_field_values.select(&:editable?).each do |value| %>
                 <p><%= custom_field_tag_with_label :user, value %></p>
               <% end %>
               <%= call_hook(:view_my_account, :user => @user, :form => f) %>
             </fieldset>
             <%= submit_tag l(:button_save) %>
             </div>
             <div class="splitcontentright">
             <fieldset class="box">
               <legend><%=l(:field_mail_notification)%></legend>
               <%= render :partial => 'users/mail_notifications' %>
             </fieldset>
             <fieldset class="box tabular">
               <legend><%=l(:label_preferences)%></legend>
               <%= render :partial => 'users/preferences' %>
             </fieldset>
             </div>
             <% end %>
             <% content_for :sidebar do %>
             <%= render :partial => 'sidebar' %>
             <% end %>
             <% html_title(l(:label_my_account)) -%>

app/views/my/destroy.html.erb +1 -1

             <h2><%=l(:label_confirmation)%></h2>
             <div class="warning">
             <p><%= simple_format l(:text_account_destroy_confirmation)%></p>
             <p>
-                <% form_tag({}) do %>
+                <%= form_tag({}) do %>
                 <label><%= check_box_tag 'confirm', 1 %> <%= l(:general_text_Yes) %></label>
                 <%= submit_tag l(:button_delete_my_account) %> |
             		<%= link_to l(:button_cancel), :action => 'account' %>
                 <% end %>
             </p>
             </div>

app/views/my/page_layout.html.erb +1 -1

             <script language="JavaScript">
             //<![CDATA[
             function recreateSortables() {
                 Sortable.destroy('list-top');
                 Sortable.destroy('list-left');
                 Sortable.destroy('list-right');
               Sortable.create("list-top", {constraint:false, containment:['list-top','list-left','list-right'], dropOnEmpty:true, handle:'handle', onUpdate:function(){new Ajax.Request('<%= url_for(:controller => 'my', :action => 'order_blocks', :group => 'top') %>', {asynchronous:true, evalScripts:true, parameters:Sortable.serialize("list-top")})}, only:'mypage-box', tag:'div'})
               Sortable.create("list-left", {constraint:false, containment:['list-top','list-left','list-right'], dropOnEmpty:true, handle:'handle', onUpdate:function(){new Ajax.Request('<%= url_for(:controller => 'my', :action => 'order_blocks', :group => 'left') %>', {asynchronous:true, evalScripts:true, parameters:Sortable.serialize("list-left")})}, only:'mypage-box', tag:'div'})
               Sortable.create("list-right", {constraint:false, containment:['list-top','list-left','list-right'], dropOnEmpty:true, handle:'handle', onUpdate:function(){new Ajax.Request('<%= url_for(:controller => 'my', :action => 'order_blocks', :group => 'right') %>', {asynchronous:true, evalScripts:true, parameters:Sortable.serialize("list-right")})}, only:'mypage-box', tag:'div'})
             }
             function updateSelect() {
                 s = $('block-select')
                 for (var i = 0; i < s.options.length; i++) {
                     if ($('block_' + s.options[i].value)) {
                         s.options[i].disabled = true;
                     } else {
                         s.options[i].disabled = false;
                     }
                 }
                 s.options[0].selected = true;
             }
             function afterAddBlock() {
                 recreateSortables();
                 updateSelect();
             }
             function removeBlock(block) {
                 Effect.DropOut(block);
                 updateSelect();
             }
             //]]>
             </script>
             <div class="contextual">
-            <% form_tag({:action => "add_block"}, :id => "block-form") do %>
+            <%= form_tag({:action => "add_block"}, :id => "block-form") do %>
             <%= label_tag('block-select', l(:label_my_page_block)) %>:
             <%= select_tag 'block',
                            "<option></option>".html_safe + options_for_select(@block_options),
                            :id => "block-select" %>
             <%= link_to_remote l(:button_add),
                        {:url => { :action => "add_block" },
                         :with => "Form.serialize('block-form')",
                         :update => "list-top",
                         :position => :top,
                         :complete => "afterAddBlock();"
                        }, :class => 'icon icon-add'
                          %>
             <% end %>
             <%= link_to l(:button_back), {:action => 'page'}, :class => 'icon icon-cancel' %>
             </div>
             <h2><%=l(:label_my_page)%></h2>
             <div id="list-top" class="block-receiver">
               <% @blocks['top'].each do |b|
                  next unless MyController::BLOCKS.keys.include? b %>
               <%= render :partial => 'block', :locals => {:user => @user, :block_name => b} %>
               <% end if @blocks['top'] %>
             </div>
             <div id="list-left" class="splitcontentleft block-receiver">
               <% @blocks['left'].each do |b|
                  next unless MyController::BLOCKS.keys.include? b %>
               <%= render :partial => 'block', :locals => {:user => @user, :block_name => b} %>
               <% end if @blocks['left'] %>
             </div>
             <div id="list-right" class="splitcontentright block-receiver">
               <% @blocks['right'].each do |b|
                  next unless MyController::BLOCKS.keys.include? b %>
               <%= render :partial => 'block', :locals => {:user => @user, :block_name => b} %>
               <% end if @blocks['right'] %>
             </div>
             <%= sortable_element 'list-top',
                   :tag => 'div',
                   :only => 'mypage-box',
                   :handle => "handle",
                   :dropOnEmpty => true,
                   :containment => ['list-top', 'list-left', 'list-right'],
                   :constraint => false,
                   :url => { :action => "order_blocks", :group => "top" }
                    %>
             <%= sortable_element 'list-left',
                   :tag => 'div',
                   :only => 'mypage-box',
                   :handle => "handle",
                   :dropOnEmpty => true,
                   :containment => ['list-top', 'list-left', 'list-right'],
                   :constraint => false,
                   :url => { :action => "order_blocks", :group => "left" }
                    %>
             <%= sortable_element 'list-right',
                   :tag => 'div',
                   :only => 'mypage-box',
                   :handle => "handle",
                   :dropOnEmpty => true,
                   :containment => ['list-top', 'list-left', 'list-right'],
                   :constraint => false,
                   :url => { :action => "order_blocks", :group => "right" }
                    %>
             <%= javascript_tag "updateSelect()" %>
             <% html_title(l(:label_my_page)) -%>

app/views/my/password.html.erb +1 -1

             <h2><%=l(:button_change_password)%></h2>
             <%= error_messages_for 'user' %>
-            <% form_tag({}, :class => "tabular") do %>
+            <%= form_tag({}, :class => "tabular") do %>
             <div class="box">
             <p><label for="password"><%=l(:field_password)%> <span class="required">*</span></label>
             <%= password_field_tag 'password', nil, :size => 25 %></p>
             <p><label for="new_password"><%=l(:field_new_password)%> <span class="required">*</span></label>
             <%= password_field_tag 'new_password', nil, :size => 25 %>
             <em class="info"><%= l(:text_caracters_minimum, :count => Setting.password_min_length) %></em></p>
             <p><label for="new_password_confirmation"><%=l(:field_password_confirmation)%> <span class="required">*</span></label>
             <%= password_field_tag 'new_password_confirmation', nil, :size => 25 %></p>
             </div>
             <%= submit_tag l(:button_apply) %>
             <% end %>
             <% content_for :sidebar do %>
             <%= render :partial => 'sidebar' %>
             <% end %>

app/views/news/edit.html.erb +1 -1

             <h2><%=l(:label_news)%></h2>
-            <% labelled_form_for @news, :html => { :id => 'news-form', :multipart => true, :method => :put } do |f| %>
+            <%= labelled_form_for @news, :html => { :id => 'news-form', :multipart => true, :method => :put } do |f| %>
             <%= render :partial => 'form', :locals => { :f => f } %>
             <%= submit_tag l(:button_save) %>
             <%= link_to_remote l(:label_preview),
                                { :url => preview_news_path(:project_id => @project),
                                  :method => 'get',
                                  :update => 'preview',
                                  :with => "Form.serialize('news-form')"
                                }, :accesskey => accesskey(:preview) %>
             <% end %>
             <div id="preview" class="wiki"></div>
             <% content_for :header_tags do %>
               <%= stylesheet_link_tag 'scm' %>
             <% end %>

app/views/news/index.html.erb +1 -1

             <div class="contextual">
             <%= link_to(l(:label_news_new),
                         new_project_news_path(@project),
                         :class => 'icon icon-add',
                         :onclick => 'Element.show("add-news"); Form.Element.focus("news_title"); return false;') if @project && User.current.allowed_to?(:manage_news, @project) %>
             </div>
             <div id="add-news" style="display:none;">
             <h2><%=l(:label_news_new)%></h2>
-            <% labelled_form_for @news, :url => project_news_index_path(@project),
+            <%= labelled_form_for @news, :url => project_news_index_path(@project),
                                                        :html => { :id => 'news-form', :multipart => true } do |f| %>
             <%= render :partial => 'news/form', :locals => { :f => f } %>
             <%= submit_tag l(:button_create) %>
             <%= link_to_remote l(:label_preview),
                                { :url => preview_news_path(:project_id => @project),
                                  :method => 'get',
                                  :update => 'preview',
                                  :with => "Form.serialize('news-form')"
                                }, :accesskey => accesskey(:preview) %> |
             <%= link_to l(:button_cancel), "#", :onclick => 'Element.hide("add-news")' %>
             <% end if @project %>
             <div id="preview" class="wiki"></div>
             </div>
             <h2><%=l(:label_news_plural)%></h2>
             <% if @newss.empty? %>
             <p class="nodata"><%= l(:label_no_data) %></p>
             <% else %>
             <% @newss.each do |news| %>
                 <h3><%= avatar(news.author, :size => "24") %><%= link_to_project(news.project) + ': ' unless news.project == @project %>
                 <%= link_to h(news.title), news_path(news) %>
                 <%= "(#{l(:label_x_comments, :count => news.comments_count)})" if news.comments_count > 0 %></h3>
                 <p class="author"><%= authoring news.created_on, news.author %></p>
                 <div class="wiki">
                 <%= textilizable(news, :description) %>
                 </div>
             <% end %>
             <% end %>
             <p class="pagination"><%= pagination_links_full @news_pages %></p>
             <% other_formats_links do |f| %>
               <%= f.link_to 'Atom', :url => {:project_id => @project, :key => User.current.rss_key} %>
             <% end %>
             <% content_for :header_tags do %>
               <%= auto_discovery_link_tag(:atom, params.merge({:format => 'atom', :page => nil, :key => User.current.rss_key})) %>
               <%= stylesheet_link_tag 'scm' %>
             <% end %>
             <% html_title(l(:label_news_plural)) -%>

app/views/news/new.html.erb +1 -1

             <h2><%=l(:label_news_new)%></h2>
-            <% labelled_form_for @news, :url => project_news_index_path(@project),
+            <%= labelled_form_for @news, :url => project_news_index_path(@project),
                                                        :html => { :id => 'news-form', :multipart => true } do |f| %>
               <%= render :partial => 'news/form', :locals => { :f => f } %>
               <%= submit_tag l(:button_create) %>
               <%= link_to_remote l(:label_preview),
                                  { :url => preview_news_path(:project_id => @project),
                                    :method => 'get',
                                    :update => 'preview',
                                    :with => "Form.serialize('news-form')"
                                  }, :accesskey => accesskey(:preview) %>
             <% end %>
             <div id="preview" class="wiki"></div>

app/views/news/show.html.erb +2 -2

             <div class="contextual">
             <%= watcher_tag(@news, User.current) %>
             <%= link_to(l(:button_edit),
                   edit_news_path(@news),
                   :class => 'icon icon-edit',
                   :accesskey => accesskey(:edit),
                   :onclick => 'Element.show("edit-news"); return false;') if User.current.allowed_to?(:manage_news, @project) %>
             <%= link_to(l(:button_delete),
                   news_path(@news),
                   :confirm => l(:text_are_you_sure),
                   :method => :delete,
                   :class => 'icon icon-del') if User.current.allowed_to?(:manage_news, @project) %>
             </div>
             <h2><%= avatar(@news.author, :size => "24") %><%=h @news.title %></h2>
             <% if authorize_for('news', 'edit') %>
             <div id="edit-news" style="display:none;">
-            <% labelled_form_for :news, @news, :url => news_path(@news),
+            <%= labelled_form_for :news, @news, :url => news_path(@news),
                                                        :html => { :id => 'news-form', :multipart => true, :method => :put } do |f| %>
             <%= render :partial => 'form', :locals => { :f => f } %>
             <%= submit_tag l(:button_save) %>
             <%= link_to_remote l(:label_preview),
                                { :url => preview_news_path(:project_id => @project),
                                  :method => 'get',
                                  :update => 'preview',
                                  :with => "Form.serialize('news-form')"
                                }, :accesskey => accesskey(:preview) %> |
             <%= link_to l(:button_cancel), "#", :onclick => 'Element.hide("edit-news"); return false;' %>
             <% end %>
             <div id="preview" class="wiki"></div>
             </div>
             <% end %>
             <p><% unless @news.summary.blank? %><em><%=h @news.summary %></em><br /><% end %>
             <span class="author"><%= authoring @news.created_on, @news.author %></span></p>
             <div class="wiki">
             <%= textilizable(@news, :description) %>
             </div>
             <%= link_to_attachments @news %>
             <br />
             <div id="comments" style="margin-bottom:16px;">
             <h3 class="comments"><%= l(:label_comment_plural) %></h3>
             <% @comments.each do |comment| %>
                 <% next if comment.new_record? %>
                 <div class="contextual">
                 <%= link_to_if_authorized image_tag('delete.png'), {:controller => 'comments', :action => 'destroy', :id => @news, :comment_id => comment},
                                                                    :confirm => l(:text_are_you_sure), :method => :delete, :title => l(:button_delete) %>
                 </div>
                 <h4><%= avatar(comment.author, :size => "24") %><%= authoring comment.created_on, comment.author %></h4>
                 <%= textilizable(comment.comments) %>
             <% end if @comments.any? %>
             </div>
             <% if @news.commentable? %>
             <p><%= toggle_link l(:label_comment_add), "add_comment_form", :focus => "comment_comments" %></p>
-            <% form_tag({:controller => 'comments', :action => 'create', :id => @news}, :id => "add_comment_form", :style => "display:none;") do %>
+            <%= form_tag({:controller => 'comments', :action => 'create', :id => @news}, :id => "add_comment_form", :style => "display:none;") do %>
             <div class="box">
                 <%= text_area 'comment', 'comments', :cols => 80, :rows => 15, :class => 'wiki-edit' %>
                 <%= wikitoolbar_for 'comment_comments' %>
             </div>
             <p><%= submit_tag l(:button_add) %></p>
             <% end %>
             <% end %>
             <% html_title @news.title -%>
             <% content_for :header_tags do %>
               <%= stylesheet_link_tag 'scm' %>
             <% end %>

app/views/projects/_edit.html.erb +1 -1

-            <% labelled_form_for @project do |f| %>
+            <%= labelled_form_for @project do |f| %>
             <%= render :partial => 'form', :locals => { :f => f } %>
             <%= submit_tag l(:button_save) %>
             <% end %>

app/views/projects/copy.html.erb +1 -1

             <h2><%=l(:label_project_new)%></h2>
-            <% labelled_form_for @project, :url => { :action => "copy" } do |f| %>
+            <%= labelled_form_for @project, :url => { :action => "copy" } do |f| %>
             <%= render :partial => 'form', :locals => { :f => f } %>
             <fieldset class="box tabular"><legend><%= l(:button_copy) %></legend>
               <label class="block"><%= check_box_tag 'only[]', 'members', true %> <%= l(:label_member_plural) %> (<%= @source_project.members.count %>)</label>
               <label class="block"><%= check_box_tag 'only[]', 'versions', true %> <%= l(:label_version_plural) %> (<%= @source_project.versions.count %>)</label>
               <label class="block"><%= check_box_tag 'only[]', 'issue_categories', true %> <%= l(:label_issue_category_plural) %> (<%= @source_project.issue_categories.count %>)</label>
               <label class="block"><%= check_box_tag 'only[]', 'issues', true %> <%= l(:label_issue_plural) %> (<%= @source_project.issues.count %>)</label>
               <label class="block"><%= check_box_tag 'only[]', 'queries', true %> <%= l(:label_query_plural) %> (<%= @source_project.queries.count %>)</label>
               <label class="block"><%= check_box_tag 'only[]', 'boards', true %> <%= l(:label_board_plural) %> (<%= @source_project.boards.count %>)</label>
               <label class="block"><%= check_box_tag 'only[]', 'wiki', true %> <%= l(:label_wiki_page_plural) %> (<%= @source_project.wiki.nil? ? 0 : @source_project.wiki.pages.count %>)</label>
               <%= hidden_field_tag 'only[]', '' %>
               <br />
               <label class="block"><%= check_box_tag 'notifications', 1, params[:notifications] %> <%= l(:label_project_copy_notifications) %></label>
             </fieldset>
             <%= submit_tag l(:button_copy) %>
             <% end %>

app/views/projects/destroy.html.erb +1 -1

             <h2><%=l(:label_confirmation)%></h2>
             <div class="warning">
             <p><strong><%=h @project_to_destroy %></strong><br />
             <%=l(:text_project_destroy_confirmation)%>
             <% if @project_to_destroy.descendants.any? %>
             <br /><%= l(:text_subprojects_destroy_warning, content_tag('strong', h(@project_to_destroy.descendants.collect{|p| p.to_s}.join(', ')))) %>
             <% end %>
             </p>
             <p>
-                <% form_tag(project_path(@project_to_destroy), :method => :delete) do %>
+                <%= form_tag(project_path(@project_to_destroy), :method => :delete) do %>
                 <label><%= check_box_tag 'confirm', 1 %> <%= l(:general_text_Yes) %></label>
                 <%= submit_tag l(:button_delete) %>
                 <% end %>
             </p>
             </div>

app/views/projects/index.html.erb +1 -1

             <% content_for :header_tags do %>
                 <%= auto_discovery_link_tag(:atom, {:action => 'index', :format => 'atom', :key => User.current.rss_key}) %>
             <% end %>
             <div class="contextual">
                 <%= link_to(l(:label_project_new), {:controller => 'projects', :action => 'new'}, :class => 'icon icon-add') + ' |' if User.current.allowed_to?(:add_project, nil, :global => true) %>
-                <%= link_to(l(:label_issue_view_all), { :controller => 'issues' }) + ' |' if User.current.allowed_to?(:view_issues, nil, :global => true) %>
+                <%= link_to(l(:label_issue_view_all), issues_path) + ' |' if User.current.allowed_to?(:view_issues, nil, :global => true) %>
                 <%= link_to(l(:label_overall_spent_time), time_entries_path) + ' |' if User.current.allowed_to?(:view_time_entries, nil, :global => true) %>
                 <%= link_to l(:label_overall_activity),
                             { :controller => 'activities', :action => 'index',
                               :id => nil } %>
             </div>
             <h2><%=l(:label_project_plural)%></h2>
             <%= render_project_hierarchy(@projects)%>
             <% if User.current.logged? %>
             <p style="text-align:right;">
             <span class="my-project"><%= l(:label_my_projects) %></span>
             </p>
             <% end %>
             <% other_formats_links do |f| %>
               <%= f.link_to 'Atom', :url => {:key => User.current.rss_key} %>
             <% end %>
             <% html_title(l(:label_project_plural)) -%>

app/views/projects/new.html.erb +1 -1

             <h2><%=l(:label_project_new)%></h2>
-            <% labelled_form_for @project do |f| %>
+            <%= labelled_form_for @project do |f| %>
             <%= render :partial => 'form', :locals => { :f => f } %>
             <%= submit_tag l(:button_create) %>
             <%= submit_tag l(:button_create_and_continue), :name => 'continue' %>
             <%= javascript_tag "Form.Element.focus('project_name');" %>
             <% end %>

app/views/projects/settings/_activities.html.erb +2 -2

-            <% form_tag(project_enumerations_path(@project), :method => :put, :class => "tabular") do %>
+            <%= form_tag(project_enumerations_path(@project), :method => :put, :class => "tabular") do %>
             <table class="list">
               <thead><tr>
                 <th><%= l(:field_name) %></th>
                 <th><%= l(:enumeration_system_activity) %></th>
                 <% TimeEntryActivity.new.available_custom_fields.each do |value| %>
                 <th><%= h value.name %></th>
                 <% end %>
                 <th style="width:15%;"><%= l(:field_active) %></th>
               </tr></thead>
               <% @project.activities(true).each do |enumeration| %>
-              <% fields_for "enumerations[#{enumeration.id}]", enumeration do |ff| %>
+              <%= fields_for "enumerations[#{enumeration.id}]", enumeration do |ff| %>
               <tr class="<%= cycle('odd', 'even') %>">
                 <td>
                   <%= ff.hidden_field :parent_id, :value => enumeration.id unless enumeration.project %>
                   <%= h(enumeration) %>
                 </td>
                 <td align="center" style="width:15%;"><%= checked_image !enumeration.project %></td>
                 <% enumeration.custom_field_values.each do |value| %>
                 <td align="center">
                   <%= custom_field_tag "enumerations[#{enumeration.id}]", value %>
                 </td>
                 <% end %>
                 <td align="center" style="width:15%;">
                   <%= ff.check_box :active %>
                 </td>
               </tr>
               <% end %>
               <% end %>
             </table>
             <div class="contextual">
             <%= link_to(l(:button_reset), project_enumerations_path(@project),
                         :method => :delete,
                         :confirm => l(:text_are_you_sure),
                         :class => 'icon icon-del') %>
             </div>
             <%= submit_tag l(:button_save) %>
             <% end %>

app/views/projects/settings/_modules.html.erb +1 -1

-            <% form_for :project, @project,
+            <%= form_for @project,
                         :url => { :action => 'modules', :id => @project },
                         :html => {:id => 'modules-form',
                                   :method => :post} do |f| %>
             <div class="box">
             <fieldset>
             <legend><%= l(:text_select_project_modules) %></legend>
             <% Redmine::AccessControl.available_project_modules.each do |m| %>
             <p><label><%= check_box_tag 'enabled_module_names[]', m, @project.module_enabled?(m) -%>
              <%= l_or_humanize(m, :prefix => "project_module_") %></label></p>
             <% end %>
             </fieldset>
             </div>
             <p><%= check_all_links 'modules-form' %></p>
             <p><%= submit_tag l(:button_save) %></p>
             <% end %>

app/views/projects/show.html.erb +3 -3

             <div class="contextual">
               <% if User.current.allowed_to?(:add_subprojects, @project) %>
                 <%= link_to l(:label_subproject_new), {:controller => 'projects', :action => 'new', :parent_id => @project}, :class => 'icon icon-add' %>
               <% end %>
             </div>
             <h2><%=l(:label_overview)%></h2>
             <div class="splitcontentleft">
               <div class="wiki">
                 <%= textilizable @project.description %>
               </div>
               <ul>
               <% unless @project.homepage.blank? %>
-                <li><%=l(:field_homepage)%>: <%= auto_link(h(@project.homepage)).html_safe %></li>
+                <li><%=l(:field_homepage)%>: <%= link_to h(@project.homepage), @project.homepage %></li>
               <% end %>
               <% if @subprojects.any? %>
                 <li><%=l(:label_subproject_plural)%>:
                   <%= @subprojects.collect{|p| link_to(h(p), :action => 'show', :id => p)}.join(", ").html_safe %></li>
               <% end %>
               <% @project.visible_custom_field_values.each do |custom_value| %>
               <% if !custom_value.value.blank? %>
                  <li><%=h custom_value.custom_field.name %>: <%=h show_value(custom_value) %></li>
               <% end %>
               <% end %>
               </ul>
               <% if User.current.allowed_to?(:view_issues, @project) %>
               <div class="issues box">
                 <h3><%=l(:label_issue_tracking)%></h3>
                 <ul>
                 <% for tracker in @trackers %>
                   <li><%= link_to h(tracker.name), :controller => 'issues', :action => 'index', :project_id => @project,
                                                             :set_filter => 1,
                                                             "tracker_id" => tracker.id %>:
                       <%= l(:label_x_open_issues_abbr_on_total, :count => @open_issues_by_tracker[tracker].to_i,
                                                                 :total => @total_issues_by_tracker[tracker].to_i) %>
                   </li>
                 <% end %>
                 </ul>
                 <p>
                   <%= link_to l(:label_issue_view_all), :controller => 'issues', :action => 'index', :project_id => @project, :set_filter => 1 %>
                   <% if User.current.allowed_to?(:view_calendar, @project, :global => true) %>
                     | <%= link_to(l(:label_calendar), :controller => 'calendars', :action => 'show', :project_id => @project) %>
                   <% end %>
                   <% if User.current.allowed_to?(:view_gantt, @project, :global => true) %>
                     | <%= link_to(l(:label_gantt), :controller => 'gantts', :action => 'show', :project_id => @project) %>
                   <% end %>
                 </p>
               </div>
               <% end %>
               <%= call_hook(:view_projects_show_left, :project => @project) %>
             </div>
             <div class="splitcontentright">
               <%= render :partial => 'members_box' %>
               <% if @news.any? && authorize_for('news', 'index') %>
               <div class="news box">
                 <h3><%=l(:label_news_latest)%></h3>
                 <%= render :partial => 'news/news', :collection => @news %>
                 <p><%= link_to l(:label_news_view_all), :controller => 'news', :action => 'index', :project_id => @project %></p>
               </div>
               <% end %>
               <%= call_hook(:view_projects_show_right, :project => @project) %>
             </div>
             <% content_for :sidebar do %>
                 <% if @total_hours.present? %>
                 <h3><%= l(:label_spent_time) %></h3>
                 <p><span class="icon icon-time"><%= l_hours(@total_hours) %></span></p>
-                <p><%= link_to(l(:label_details), {:controller => 'timelog', :action => 'index', :project_id => @project}) %> |
+                <p><%= link_to(l(:label_details), project_time_entries_path(@project)) %> |
-                <%= link_to(l(:label_report), {:controller => 'timelog', :action => 'report', :project_id => @project}) %></p>
+                <%= link_to(l(:label_report), report_project_time_entries_path(@project)) %></p>
                 <% end %>
                 <%= call_hook(:view_projects_show_sidebar_bottom, :project => @project) %>
             <% end %>
             <% content_for :header_tags do %>
             <%= auto_discovery_link_tag(:atom, {:controller => 'activities', :action => 'index', :id => @project, :format => 'atom', :key => User.current.rss_key}) %>
             <% end %>
             <% html_title(l(:label_overview)) -%>

app/views/queries/_filters.html.erb +1 -1

             <table style="width:100%">
             <tr>
             <td>
             <table>
             <% query.available_filters.sort{|a,b| a[1][:order]<=>b[1][:order]}.each do |filter| %>
                 <% field = filter[0]
                    options = filter[1] %>
-                <tr <%= 'style="display:none;"' unless query.has_filter?(field) %> id="tr_<%= field %>" class="filter">
+                <tr <%= 'style="display:none;"'.html_safe unless query.has_filter?(field) %> id="tr_<%= field %>" class="filter">
                 <td class="field">
                     <%= check_box_tag 'f[]', field, query.has_filter?(field), :onclick => "toggle_filter('#{field}');", :id => "cb_#{field}" %>
                     <label for="cb_<%= field %>"><%= filter[1][:name] || l(("field_"+field.to_s.gsub(/\_id$/, "")).to_sym) %></label>
                 </td>
                 <td class="operator">
                     <%= label_tag "operators_#{field}", l(:description_filter), :class => "hidden-for-sighted" %>
                     <%= select_tag "op[#{field}]", options_for_select(operators_for_select(options[:type]),
                                     query.operator_for(field)), :id => "operators_#{field}",
                                     :onchange => "toggle_operator('#{field}');" %>
                 </td>
                 <td class="values">
                 <div id="div_values_<%= field %>" style="display:none;">
                 <% case options[:type]
                 when :list, :list_optional, :list_status, :list_subprojects %>
                     <span class="span_values_<%= field %>">
                       <%= select_tag "v[#{field}][]", options_for_select(options[:values], query.values_for(field)), :class => "values_#{field}", :id => "values_#{field}_1", :multiple => (query.values_for(field) && query.values_for(field).length > 1) %>
                       <%= link_to_function image_tag('bullet_toggle_plus.png'), "toggle_multi_select('values_#{field}_1');" %>
                     </span>
                 <% when :date, :date_past %>
                     <span class="span_values_<%= field %>"><%= text_field_tag "v[#{field}][]", query.value_for(field), :size => 10, :class => "values_#{field}", :id => "values_#{field}_1" %> <%= calendar_for "values_#{field}_1" %></span>
                     <span class="span_values_<%= field %>"><%= text_field_tag "v[#{field}][]", query.value_for(field, 1), :size => 10, :class => "values_#{field}", :id => "values_#{field}_2" %> <%= calendar_for "values_#{field}_2" %></span>
                     <span class="span_values_<%= field %>"><%= text_field_tag "v[#{field}][]", query.value_for(field), :size => 3, :class => "values_#{field}" %> <%= l(:label_day_plural) %></span>
                 <% when :string, :text %>
                     <span class="span_values_<%= field %>"><%= text_field_tag "v[#{field}][]", query.value_for(field), :class => "values_#{field}", :id => "values_#{field}", :size => 30 %></span>
                 <% when :integer, :float %>
                     <span class="span_values_<%= field %>"><%= text_field_tag "v[#{field}][]", query.value_for(field), :class => "values_#{field}", :id => "values_#{field}_1", :size => 6 %></span>
                     <span class="span_values_<%= field %>"><%= text_field_tag "v[#{field}][]", query.value_for(field, 1), :class => "values_#{field}", :id => "values_#{field}_2", :size => 6 %></span>
                 <% end %>
                 </div>
                 <script type="text/javascript">toggle_filter('<%= field %>');</script>
                 </td>
                 </tr>
             <% end %>
             </table>
             </td>
             <td class="add-filter">
             <%= label_tag('add_filter_select', l(:label_filter_add)) %>
             <%= select_tag 'add_filter_select', options_for_select([["",""]] + query.available_filters.sort{|a,b| a[1][:order]<=>b[1][:order]}.collect{|field| [ field[1][:name] || l(("field_"+field[0].to_s.gsub(/_id$/, "")).to_sym), field[0]] unless query.has_filter?(field[0])}.compact),
                                                 :onchange => "add_filter();",
                                                 :name => nil %>
             </td>
             </tr>
             </table>
             <%= hidden_field_tag 'f[]', '' %>
             <%= javascript_tag 'Event.observe(window,"load",apply_filters_observer);' %>

app/views/queries/edit.html.erb +1 -1

             <h2><%= l(:label_query) %></h2>
-            <% form_tag(query_path(@query), :onsubmit => 'selectAllOptions("selected_columns");', :method => :put) do %>
+            <%= form_tag(query_path(@query), :onsubmit => 'selectAllOptions("selected_columns");', :method => :put) do %>
               <%= render :partial => 'form', :locals => {:query => @query} %>
               <%= submit_tag l(:button_save) %>
             <% end %>

app/views/queries/new.html.erb +1 -1

             <h2><%= l(:label_query_new) %></h2>
-            <% form_tag(@project ? project_queries_path : queries_path, :onsubmit => 'selectAllOptions("selected_columns");') do %>
+            <%= form_tag(@project ? project_queries_path(@project) : queries_path, :onsubmit => 'selectAllOptions("selected_columns");') do %>
               <%= render :partial => 'form', :locals => {:query => @query} %>
               <%= submit_tag l(:button_save) %>
             <% end %>

app/views/repositories/_navigation.html.erb +1 -1

             <% content_for :header_tags do %>
               <%= javascript_include_tag 'repository_navigation' %>
             <% end %>
             <%= link_to l(:label_statistics),
                         {:action => 'stats', :id => @project, :repository_id => @repository.identifier_param},
                         :class => 'icon icon-stats' if @repository.supports_all_revisions? %>
-            <% form_tag({:action => controller.action_name,
+            <%= form_tag({:action => controller.action_name,
                          :id => @project,
                          :repository_id => @repository.identifier_param,
                          :path => to_path_param(@path),
                          :rev => nil},
                         {:method => :get, :id => 'revision_selector'}) do -%>
               <!-- Branches Dropdown -->
               <% if !@repository.branches.nil? && @repository.branches.length > 0 -%>
                 | <%= l(:label_branch) %>:
                 <%= select_tag :branch,
                                options_for_select([''] + @repository.branches, @rev),
                                :id => 'branch' %>
               <% end -%>
               <% if !@repository.tags.nil? && @repository.tags.length > 0 -%>
                 | <%= l(:label_tag) %>:
                 <%= select_tag :tag,
                                options_for_select([''] + @repository.tags, @rev),
                                :id => 'tag' %>
               <% end -%>
               <% if @repository.supports_all_revisions? %>
                 | <%= l(:label_revision) %>:
                 <%= text_field_tag 'rev', @rev, :size => 8 %>
             	<% end %>
             <% end -%>

app/views/repositories/_revisions.html.erb +1 -1

             <% show_revision_graph = ( @repository.supports_revision_graph? && path.blank? ) %>
             <%= if show_revision_graph && revisions && revisions.any?
                 indexed_commits, graph_space = index_commits(revisions, @repository.branches) do |scmid|
                                          url_for(
                                            :controller => 'repositories',
                                            :action => 'revision',
                                            :id => project,
                                            :repository_id => @repository.identifier_param,
                                            :rev => scmid)
                                      end
                 render :partial => 'revision_graph',
                      :locals => {
                         :commits => indexed_commits,
                         :space => graph_space
                     }
             end %>
-            <% form_tag(
+            <%= form_tag(
                   {:controller => 'repositories', :action => 'diff', :id => project,
                    :repository_id => @repository.identifier_param, :path => to_path_param(path)},
                   :method => :get
                  ) do %>
             <table class="list changesets">
             <thead><tr>
             <th>#</th>
             <th></th>
             <th></th>
             <th><%= l(:label_date) %></th>
             <th><%= l(:field_author) %></th>
             <th><%= l(:field_comments) %></th>
             </tr></thead>
             <tbody>
             <% show_diff = revisions.size > 1 %>
             <% line_num = 1 %>
             <% revisions.each do |changeset| %>
             <tr class="changeset <%= cycle 'odd', 'even' %>">
             <td class="id"<%= show_revision_graph ? " style=\"padding-left:#{(graph_space + 1) * 20}px\"" : '' %>><%= link_to_revision(changeset, @repository) %></td>
             <td class="checkbox"><%= radio_button_tag('rev', changeset.identifier, (line_num==1), :id => "cb-#{line_num}", :onclick => "$('cbto-#{line_num+1}').checked=true;") if show_diff && (line_num < revisions.size) %></td>
             <td class="checkbox"><%= radio_button_tag('rev_to', changeset.identifier, (line_num==2), :id => "cbto-#{line_num}", :onclick => "if ($('cb-#{line_num}').checked==true) {$('cb-#{line_num-1}').checked=true;}") if show_diff && (line_num > 1) %></td>
             <td class="committed_on"><%= format_time(changeset.committed_on) %></td>
             <td class="author"><%= h truncate(changeset.author.to_s, :length => 30) %></td>
             <td class="comments"><%= textilizable(truncate_at_line_break(changeset.comments)) %></td>
             </tr>
             <% line_num += 1 %>
             <% end %>
             </tbody>
             </table>
             <%= submit_tag(l(:label_view_diff), :name => nil) if show_diff %>
             <% end %>

app/views/repositories/committers.html.erb +1 -1

             <h2><%= l(:label_repository) %></h2>
             <%= simple_format(l(:text_repository_usernames_mapping)) %>
             <% if @committers.empty? %>
             <p class="nodata"><%= l(:label_no_data) %></p>
             <% else %>
-            <% form_tag({}) do %>
+            <%= form_tag({}) do %>
             <table class="list">
             <thead>
               <tr>
                 <th><%= l(:field_login) %></th>
                 <th><%= l(:label_user) %></th>
               </tr>
             </thead>
             <tbody>
             <% i = 0 -%>
             <% @committers.each do |committer, user_id| -%>
               <tr class="<%= cycle 'odd', 'even' %>">
                 <td><%=h committer %></td>
                 <td>
                   <%= hidden_field_tag "committers[#{i}][]", committer %>
                   <%= select_tag "committers[#{i}][]",
                                   content_tag(
                                         'option',
                                         "-- #{l :actionview_instancetag_blank_option} --",
                                         :value => ''
                                       ) +
                                     options_from_collection_for_select(
                                         @users, 'id', 'name', user_id.to_i
                                       ) %>
                 </td>
               </tr>
               <% i += 1 -%>
             <% end -%>
             </tbody>
             </table>
             <p><%= submit_tag(l(:button_update)) %></p>
             <% end %>
             <% end %>

app/views/repositories/diff.html.erb +1 -1

             <h2><%= l(:label_revision) %> <%= @diff_format_revisions %> <%=h @path %></h2>
             <!-- Choose view type -->
-            <% form_tag({:path => to_path_param(@path)}, :method => 'get') do %>
+            <%= form_tag({:path => to_path_param(@path)}, :method => 'get') do %>
               <%= hidden_field_tag('rev', params[:rev]) if params[:rev] %>
               <%= hidden_field_tag('rev_to', params[:rev_to]) if params[:rev_to] %>
               <p>
                 <label><%= l(:label_view_diff) %></label>
                 <%= select_tag 'type',
                                 options_for_select(
                                   [[l(:label_diff_inline), "inline"], [l(:label_diff_side_by_side), "sbs"]], @diff_type),
                                 :onchange => "if (this.value != '') {this.form.submit()}" %>
               </p>
             <% end %>
             <% cache(@cache_key) do -%>
             <%= render :partial => 'common/diff', :locals => {:diff => @diff, :diff_type => @diff_type} %>
             <% end -%>
             <% other_formats_links do |f| %>
               <%= f.link_to 'Diff', :url => params, :caption => 'Unified diff' %>
             <% end %>
             <% html_title(with_leading_slash(@path), 'Diff') -%>
             <% content_for :header_tags do %>
             <%= stylesheet_link_tag "scm" %>
             <% end %>

app/views/repositories/edit.html.erb +1 -1

             <h2><%= l(:label_repository) %></h2>
-            <% labelled_form_for :repository, @repository, :url => repository_path(@path), :html => {:method => :put} do |f| %>
+            <%= labelled_form_for :repository, @repository, :url => repository_path(@path), :html => {:method => :put} do |f| %>
               <%= render :partial => 'form', :locals => {:f => f} %>
             <% end %>

app/views/repositories/new.html.erb +1 -1

             <h2><%= l(:label_repository_new) %></h2>
-            <% labelled_form_for :repository, @repository, :url => project_repositories_path(@project) do |f| %>
+            <%= labelled_form_for :repository, @repository, :url => project_repositories_path(@project) do |f| %>
               <%= render :partial => 'form', :locals => {:f => f} %>
             <% end %>

app/views/repositories/revision.html.erb +1 -1

             <div class="contextual">
               &#171;
               <% unless @changeset.previous.nil? -%>
                 <%= link_to_revision(@changeset.previous, @repository, :text => l(:label_previous)) %>
               <% else -%>
                 <%= l(:label_previous) %>
               <% end -%>
             |
               <% unless @changeset.next.nil? -%>
                 <%= link_to_revision(@changeset.next, @repository, :text => l(:label_next)) %>
               <% else -%>
                 <%= l(:label_next) %>
               <% end -%>
               &#187;&nbsp;
-              <% form_tag({:controller => 'repositories',
+              <%= form_tag({:controller => 'repositories',
                            :action     => 'revision',
                            :id         => @project,
                            :repository_id => @repository.identifier_param,
                            :rev        => nil},
                            :method     => :get) do %>
                 <%= text_field_tag 'rev', @rev, :size => 8 %>
                 <%= submit_tag 'OK', :name => nil %>
               <% end %>
             </div>
             <h2><%= avatar(@changeset.user, :size => "24") %><%= l(:label_revision) %> <%= format_revision(@changeset) %></h2>
             <% if @changeset.scmid.present? || @changeset.parents.present? || @changeset.children.present? %>
             <table class="revision-info">
               <% if @changeset.scmid.present? %>
                 <tr>
                   <td>ID</td><td><%= h(@changeset.scmid) %></td>
                 </tr>
               <% end %>
               <% if @changeset.parents.present? %>
                 <tr>
                   <td><%= l(:label_parent_revision) %></td>
                   <td>
                     <%= @changeset.parents.collect{
                           |p| link_to_revision(p, @repository, :text => format_revision(p))
                         }.join(", ").html_safe %>
                   </td>
                 </tr>
               <% end %>
               <% if @changeset.children.present? %>
                 <tr>
                   <td><%= l(:label_child_revision) %></td>
                   <td>
                    <%= @changeset.children.collect{
                           |p| link_to_revision(p, @repository, :text => format_revision(p))
                          }.join(", ").html_safe %>
                   </td>
                 </tr>
               <% end %>
             </table>
             <% end %>
             <p>
             <span class="author">
             <%= authoring(@changeset.committed_on, @changeset.author) %>
             </span>
             </p>
             <%= textilizable @changeset.comments %>
             <% if @changeset.issues.visible.any? || User.current.allowed_to?(:manage_related_issues, @repository.project) %>
               <%= render :partial => 'related_issues' %>
             <% end %>
             <% if User.current.allowed_to?(:browse_repository, @project) %>
             <h3><%= l(:label_attachment_plural) %></h3>
             <ul id="changes-legend">
             <li class="change change-A"><%= l(:label_added)    %></li>
             <li class="change change-M"><%= l(:label_modified) %></li>
             <li class="change change-C"><%= l(:label_copied)   %></li>
             <li class="change change-R"><%= l(:label_renamed)  %></li>
             <li class="change change-D"><%= l(:label_deleted)  %></li>
             </ul>
             <p><%= link_to(l(:label_view_diff),
                            :action => 'diff',
                            :id     => @project,
                            :repository_id => @repository.identifier_param,
                            :path   => "",
                            :rev    => @changeset.identifier) if @changeset.changes.any? %></p>
             <div class="changeset-changes">
             <%= render_changeset_changes %>
             </div>
             <% end %>
             <% content_for :header_tags do %>
             <%= stylesheet_link_tag "scm" %>
             <% end %>
             <% html_title("#{l(:label_revision)} #{format_revision(@changeset)}") -%>

app/views/repositories/revisions.html.erb +2 -2

             <div class="contextual">
-            <% form_tag(
+            <%= form_tag(
-                   {:action => 'revision', :id => @project,
+                   {:controller => 'repositories', :action => 'revision', :id => @project,
                     :repository_id => @repository.identifier_param}
                  ) do %>
               <%= l(:label_revision) %>: <%= text_field_tag 'rev', @rev, :size => 8 %>
               <%= submit_tag 'OK' %>
             <% end %>
             </div>
             <h2><%= l(:label_revision_plural) %></h2>
             <%= render :partial => 'revisions',
                        :locals => {:project   => @project,
                                    :path      => '',
                                    :revisions => @changesets,
                                    :entry     => nil } %>
             <p class="pagination"><%= pagination_links_full @changeset_pages,@changeset_count %></p>
             <% content_for :header_tags do %>
               <%= stylesheet_link_tag "scm" %>
               <%= auto_discovery_link_tag(
                            :atom,
                            params.merge(
                              {:format => 'atom', :page => nil, :key => User.current.rss_key})) %>
             <% end %>
             <% other_formats_links do |f| %>
               <%= f.link_to 'Atom', :url => {:key => User.current.rss_key} %>
             <% end %>
             <% html_title(l(:label_revision_plural)) -%>

app/views/roles/edit.html.erb +1 -1

             <h2><%= link_to l(:label_role_plural), roles_path %> &#187; <%=h @role.name %></h2>
-            <% labelled_form_for @role do |f| %>
+            <%= labelled_form_for @role do |f| %>
             <%= render :partial => 'form', :locals => { :f => f } %>
             <%= submit_tag l(:button_save) %>
             <% end %>

app/views/roles/new.html.erb +1 -1

             <h2><%= link_to l(:label_role_plural), roles_path %> &#187; <%=l(:label_role_new)%></h2>
-            <% labelled_form_for @role do |f| %>
+            <%= labelled_form_for @role do |f| %>
             <%= render :partial => 'form', :locals => { :f => f } %>
             <%= submit_tag l(:button_create) %>
             <% end %>

app/views/roles/permissions.html.erb +1 -1

             <h2><%= link_to l(:label_role_plural), roles_path %> &#187; <%=l(:label_permissions_report)%></h2>
-            <% form_tag(permissions_roles_path, :id => 'permissions_form') do %>
+            <%= form_tag(permissions_roles_path, :id => 'permissions_form') do %>
             <%= hidden_field_tag 'permissions[0]', '', :id => nil %>
             <div class="autoscroll">
             <table class="list permissions">
             <thead>
                 <tr>
                 <th><%=l(:label_permissions)%></th>
                 <% @roles.each do |role| %>
                 <th>
                     <%= content_tag(role.builtin? ? 'em' : 'span', h(role.name)) %>
                     <%= link_to_function(image_tag('toggle_check.png'), "toggleCheckboxesBySelector('input.role-#{role.id}')",
                                                                         :title => "#{l(:button_check_all)}/#{l(:button_uncheck_all)}") %>
                 </th>
                 <% end %>
                 </tr>
             </thead>
             <tbody>
             <% perms_by_module = @permissions.group_by {|p| p.project_module.to_s} %>
             <% perms_by_module.keys.sort.each do |mod| %>
                 <% unless mod.blank? %>
                     <tr class="group open">
                       <td>
                         <span class="expander" onclick="toggleRowGroup(this);">&nbsp;</span>
                         <%= l_or_humanize(mod, :prefix => 'project_module_') %>
                       </td>
                       <% @roles.each do |role| %>
                       <td class="role"><%= h(role.name) %></td>
                       <% end %>
                     </tr>
                 <% end %>
                 <% perms_by_module[mod].each do |permission| %>
                     <tr class="<%= cycle('odd', 'even') %> permission-<%= permission.name %>">
                     <td>
                         <%= link_to_function(image_tag('toggle_check.png'), "toggleCheckboxesBySelector('.permission-#{permission.name} input')",
                                                                             :title => "#{l(:button_check_all)}/#{l(:button_uncheck_all)}") %>
                         <%= l_or_humanize(permission.name, :prefix => 'permission_') %>
                     </td>
                     <% @roles.each do |role| %>
                     <td align="center">
                     <% if role.setable_permissions.include? permission %>
                       <%= check_box_tag "permissions[#{role.id}][]", permission.name, (role.permissions.include? permission.name), :id => nil, :class => "role-#{role.id}" %>
                     <% end %>
                     </td>
                     <% end %>
                     </tr>
                 <% end %>
             <% end %>
             </tbody>
             </table>
             </div>
             <p><%= check_all_links 'permissions_form' %></p>
             <p><%= submit_tag l(:button_save) %></p>
             <% end %>

app/views/search/index.html.erb +1 -1

             <h2><%= l(:label_search) %></h2>
             <div class="box">
-            <% form_tag({}, :method => :get) do %>
+            <%= form_tag({}, :method => :get) do %>
             <%= label_tag "search-input", l(:description_search), :class => "hidden-for-sighted" %>
             <p><%= text_field_tag 'q', @question, :size => 60, :id => 'search-input' %>
             <%= javascript_tag "Field.focus('search-input')" %>
             <%= project_select_tag %>
             <%= hidden_field_tag 'all_words', '', :id => nil %>
             <label><%= check_box_tag 'all_words', 1, @all_words %> <%= l(:label_all_words) %></label>
             <%= hidden_field_tag 'titles_only', '', :id => nil %>
             <label><%= check_box_tag 'titles_only', 1, @titles_only %> <%= l(:label_search_titles_only) %></label>
             </p>
             <p>
             <% @object_types.each do |t| %>
             <label><%= check_box_tag t, 1, @scope.include?(t) %> <%= type_label(t) %></label>
             <% end %>
             </p>
             <p><%= submit_tag l(:button_submit), :name => 'submit' %></p>
             <% end %>
             </div>
             <% if @results %>
                 <div id="search-results-counts">
                 <%= render_results_by_type(@results_by_type) unless @scope.size == 1 %>
                 </div>
                 <h3><%= l(:label_result_plural) %> (<%= @results_by_type.values.sum %>)</h3>
                 <dl id="search-results">
                   <% @results.each do |e| %>
                     <dt class="<%= e.event_type %>"><%= content_tag('span', h(e.project), :class => 'project') unless @project == e.project %> <%= link_to highlight_tokens(truncate(h(e.event_title), :length => 255), @tokens), e.event_url %></dt>
                     <dd><span class="description"><%= highlight_tokens(h(e.event_description), @tokens) %></span>
                     <span class="author"><%= format_time(e.event_datetime) %></span></dd>
                   <% end %>
                 </dl>
             <% end %>
             <p><center>
             <% if @pagination_previous_date %>
             <%= link_to_content_update("\xc2\xab " + l(:label_previous),
                   params.merge(:previous => 1,
                                :offset => @pagination_previous_date.strftime("%Y%m%d%H%M%S"))) %>&nbsp;
             <% end %>
             <% if @pagination_next_date %>
             <%= link_to_content_update(l(:label_next) + " \xc2\xbb",
                   params.merge(:previous => nil,
                                :offset => @pagination_next_date.strftime("%Y%m%d%H%M%S"))) %>
             <% end %>
             </center></p>
             <% html_title(l(:label_search)) -%>

app/views/settings/_authentication.html.erb +1 -1

-            <% form_tag({:action => 'edit', :tab => 'authentication'}) do %>
+            <%= form_tag({:action => 'edit', :tab => 'authentication'}) do %>
             <div class="box tabular settings">
             <p><%= setting_check_box :login_required %></p>
             <p><%= setting_select :autologin, [[l(:label_disabled), 0]] + [1, 7, 30, 365].collect{|days| [l('datetime.distance_in_words.x_days', :count => days), days.to_s]} %></p>
             <p><%= setting_select :self_registration, [[l(:label_disabled), "0"],
                                                        [l(:label_registration_activation_by_email), "1"],
                                                        [l(:label_registration_manual_activation), "2"],
                                                        [l(:label_registration_automatic_activation), "3"]] %></p>
             <p><%= setting_check_box :unsubscribe %></p>
             <p><%= setting_text_field :password_min_length, :size => 6 %></p>
             <p><%= setting_check_box :lost_password, :label => :label_password_lost %></p>
             <p><%= setting_check_box :openid, :disabled => !Object.const_defined?(:OpenID) %></p>
             <p><%= setting_check_box :rest_api_enabled %></p>
             </div>
             <%= submit_tag l(:button_save) %>
             <% end %>

app/views/settings/_display.html.erb +1 -1

-            <% form_tag({:action => 'edit', :tab => 'display'}) do %>
+            <%= form_tag({:action => 'edit', :tab => 'display'}) do %>
             <div class="box tabular settings">
             <p><%= setting_select :ui_theme, Redmine::Themes.themes.collect {|t| [t.name, t.id]}, :blank => :label_default, :label => :label_theme %></p>
             <p><%= setting_select :default_language, lang_options_for_select(false) %></p>
             <p><%= setting_select :start_of_week, [[day_name(1),'1'], [day_name(6),'6'], [day_name(7),'7']], :blank => :label_language_based %></p>
             <p><%= setting_select :date_format, Setting::DATE_FORMATS.collect {|f| [Date.today.strftime(f), f]}, :blank => :label_language_based %></p>
             <p><%= setting_select :time_format, Setting::TIME_FORMATS.collect {|f| [Time.now.strftime(f), f]}, :blank => :label_language_based %></p>
             <p><%= setting_select :user_format, @options[:user_format] %></p>
             <p><%= setting_check_box :gravatar_enabled %></p>
             <p><%= setting_select :gravatar_default, [["Wavatars", 'wavatar'], ["Identicons", 'identicon'], ["Monster ids", 'monsterid'], ["Retro", 'retro'], ["Mystery man", 'mm']], :blank => :label_none %></p>
             </div>
             <%= submit_tag l(:button_save) %>
             <% end %>

app/views/settings/_general.html.erb +1 -1

-            <% form_tag({:action => 'edit'}) do %>
+            <%= form_tag({:action => 'edit'}) do %>
             <div class="box tabular settings">
             <p><%= setting_text_field :app_title, :size => 30 %></p>
             <p><%= setting_text_area :welcome_text, :cols => 60, :rows => 5, :class => 'wiki-edit' %></p>
             <%= wikitoolbar_for 'settings_welcome_text' %>
             <p><%= setting_text_field :attachment_max_size, :size => 6 %> <%= l(:"number.human.storage_units.units.kb") %></p>
             <p><%= setting_text_field :per_page_options, :size => 20 %>
             <em class="info"><%= l(:text_comma_separated) %></em></p>
             <p><%= setting_text_field :activity_days_default, :size => 6 %> <%= l(:label_day_plural) %></p>
             <p><%= setting_text_field :host_name, :size => 60 %>
             <em class="info"><%= l(:label_example) %>: <%= @guessed_host_and_path %></em></p>
             <p><%= setting_select :protocol, [['HTTP', 'http'], ['HTTPS', 'https']] %></p>
             <p><%= setting_select :text_formatting, Redmine::WikiFormatting.format_names.collect{|name| [name, name.to_s]}, :blank => :label_none %></p>
             <p><%= setting_check_box :cache_formatted_text %></p>
             <p><%= setting_select :wiki_compression, [['Gzip', 'gzip']], :blank => :label_none %></p>
             <p><%= setting_text_field :feeds_limit, :size => 6 %></p>
             <p><%= setting_text_field :file_max_size_displayed, :size => 6 %> <%= l(:"number.human.storage_units.units.kb") %></p>
             <p><%= setting_text_field :diff_max_lines_displayed, :size => 6 %></p>
             <p><%= setting_text_field :repositories_encodings, :size => 60 %>
             <em class="info"><%= l(:text_comma_separated) %></em></p>
             <%= call_hook(:view_settings_general_form) %>
             </div>
             <%= submit_tag l(:button_save) %>
             <% end %>

app/views/settings/_issues.html.erb +1 -1

-            <% form_tag({:action => 'edit', :tab => 'issues'}) do %>
+            <%= form_tag({:action => 'edit', :tab => 'issues'}) do %>
             <div class="box tabular settings">
             <p><%= setting_check_box :cross_project_issue_relations %></p>
             <p><%= setting_check_box :issue_group_assignment %></p>
             <p><%= setting_check_box :default_issue_start_date_to_creation_date %></p>
             <p><%= setting_check_box :display_subprojects_issues %></p>
             <p><%= setting_select :issue_done_ratio, Issue::DONE_RATIO_OPTIONS.collect {|i| [l("setting_issue_done_ratio_#{i}"), i]} %></p>
             <p><%= setting_text_field :issues_export_limit, :size => 6 %></p>
             <p><%= setting_text_field :gantt_items_limit, :size => 6 %></p>
             </div>
             <fieldset class="box settings"><legend><%= l(:setting_issue_list_default_columns) %></legend>
             <%= setting_multiselect(:issue_list_default_columns,
                     Query.new.available_columns.collect {|c| [c.caption, c.name.to_s]}, :label => false) %>
             </fieldset>
             <%= submit_tag l(:button_save) %>
             <% end %>

app/views/settings/_mail_handler.html.erb +1 -1

-            <% form_tag({:action => 'edit', :tab => 'mail_handler'}) do %>
+            <%= form_tag({:action => 'edit', :tab => 'mail_handler'}) do %>
             <div class="box tabular settings">
               <p>
                 <%= setting_text_area :mail_handler_body_delimiters, :rows => 5 %>
                 <em class="info"><%= l(:text_line_separated) %></em>
               </p>
             </div>
             <div class="box tabular settings">
             <p><%= setting_check_box :mail_handler_api_enabled,
                      :onclick => "if (this.checked) { Form.Element.enable('settings_mail_handler_api_key'); } else { Form.Element.disable('settings_mail_handler_api_key'); }"%></p>
             <p><%= setting_text_field :mail_handler_api_key, :size => 30,
                                                              :id => 'settings_mail_handler_api_key',
                                                              :disabled => !Setting.mail_handler_api_enabled? %>
               <%= link_to_function l(:label_generate_key), "if ($('settings_mail_handler_api_key').disabled == false) { $('settings_mail_handler_api_key').value = randomKey(20) }" %>
             </p>
             </div>
             <%= submit_tag l(:button_save) %>
             <% end %>

app/views/settings/_notifications.html.erb +1 -1

             <% if @deliveries %>
-            <% form_tag({:action => 'edit', :tab => 'notifications'}) do %>
+            <%= form_tag({:action => 'edit', :tab => 'notifications'}) do %>
             <div class="box tabular settings">
             <p><%= setting_text_field :mail_from, :size => 60 %></p>
             <p><%= setting_check_box :bcc_recipients %></p>
             <p><%= setting_check_box :plain_text_mail %></p>
             <p><%= setting_select(:default_notification_option, User.valid_notification_options.collect {|o| [l(o.last), o.first.to_s]}) %></p>
             </div>
             <fieldset class="box" id="notified_events"><legend><%=l(:text_select_mail_notifications)%></legend>
             <%= hidden_field_tag 'settings[notified_events][]', '' %>
             <% @notifiables.each do |notifiable| %>
             <%= notification_field notifiable %>
             <br />
             <% end %>
             <p><%= check_all_links('notified_events') %></p>
             </fieldset>
             <fieldset class="box"><legend><%= l(:setting_emails_header) %></legend>
             <%= setting_text_area :emails_header, :label => false, :class => 'wiki-edit', :rows => 5 %>
             </fieldset>
             <fieldset class="box"><legend><%= l(:setting_emails_footer) %></legend>
             <%= setting_text_area :emails_footer, :label => false, :class => 'wiki-edit', :rows => 5 %>
             </fieldset>
             <div style="float:right;">
             <%= link_to l(:label_send_test_email), :controller => 'admin', :action => 'test_email' %>
             </div>
             <%= submit_tag l(:button_save) %>
             <% end %>
             <% else %>
             <div class="nodata">
             <%= simple_format(l(:text_email_delivery_not_configured)) %>
             </div>
             <% end %>

app/views/settings/_projects.html.erb +1 -1

-            <% form_tag({:action => 'edit', :tab => 'projects'}) do %>
+            <%= form_tag({:action => 'edit', :tab => 'projects'}) do %>
             <div class="box tabular settings">
             <p><%= setting_check_box :default_projects_public %></p>
             <p><%= setting_multiselect(:default_projects_modules,
                     Redmine::AccessControl.available_project_modules.collect {|m| [l_or_humanize(m, :prefix => "project_module_"), m.to_s]}) %></p>
             <p><%= setting_check_box :sequential_project_identifiers %></p>
             <p><%= setting_select :new_project_user_role_id,
                                   Role.find_all_givable.collect {|r| [r.name, r.id.to_s]},
                                   :blank => "--- #{l(:actionview_instancetag_blank_option)} ---" %></p>
             </div>
             <%= submit_tag l(:button_save) %>
             <% end %>

app/views/settings/_repositories.html.erb +1 -1

-            <% form_tag({:action => 'edit', :tab => 'repositories'}) do %>
+            <%= form_tag({:action => 'edit', :tab => 'repositories'}) do %>
             <fieldset class="box settings enabled_scm">
             <%= hidden_field_tag 'settings[enabled_scm][]', '' %>
             <legend><%= l(:setting_enabled_scm) %></legend>
             <table>
               <tr>
                 <th></th>
                 <th><%= l(:text_scm_command)         %></th>
                 <th><%= l(:text_scm_command_version) %></th>
               </tr>
               <% Redmine::Scm::Base.all.collect do |choice| %>
                 <% scm_class = "Repository::#{choice}".constantize %>
                 <% text, value = (choice.is_a?(Array) ? choice : [choice, choice]) %>
                 <% setting = :enabled_scm %>
             		<% enabled = Setting.send(setting).include?(value) %>
                 <tr>
                   <td class="scm_name">
                     <%=
                       check_box_tag(
                           "settings[#{setting}][]",
                            value,
                            enabled)
                      %>
                     <%= text.to_s %>
                   </td>
                   <td>
                      <% if enabled %>
                      <%=
                        image_tag(
                           (scm_class.scm_available ? 'true.png' : 'exclamation.png'),
                           :style => "vertical-align:bottom;"
                        )
                        %>
                       <%= scm_class.scm_command %>
             					<% end %>
                    </td>
                    <td>
                       <%= scm_class.scm_version_string if enabled %>
                    </td>
                  </tr>
               <% end %>
             </table>
             <p><em class="info"><%= l(:text_scm_config) %></em></p>
             </fieldset>
             <div class="box tabular settings">
             <p><%= setting_check_box :autofetch_changesets %></p>
             <p><%= setting_check_box :sys_api_enabled,
                                      :onclick =>
                                          "if (this.checked) { Form.Element.enable('settings_sys_api_key'); } else { Form.Element.disable('settings_sys_api_key'); }" %></p>
             <p><%= setting_text_field :sys_api_key,
                                       :size     => 30,
                                       :id       => 'settings_sys_api_key',
                                       :disabled => !Setting.sys_api_enabled?,
                                       :label    => :setting_mail_handler_api_key %>
               <%= link_to_function l(:label_generate_key),
                                    "if ($('settings_sys_api_key').disabled == false) { $('settings_sys_api_key').value = randomKey(20) }" %>
             </p>
             <p><%= setting_text_field :repository_log_display_limit, :size => 6 %></p>
             </div>
             <fieldset class="box tabular settings">
             <legend><%= l(:text_issues_ref_in_commit_messages) %></legend>
             <p><%= setting_text_field :commit_ref_keywords, :size => 30 %>
             <em class="info"><%= l(:text_comma_separated) %></em></p>
             <p><%= setting_text_field :commit_fix_keywords, :size => 30 %>
             &nbsp;<%= l(:label_applied_status) %>: <%= setting_select :commit_fix_status_id,
                                                                       [["", 0]] +
                                                                           IssueStatus.find(:all).collect{
                                                                              |status| [status.name, status.id.to_s]
                                                                           },
                                                                       :label => false %>
             &nbsp;<%= l(:field_done_ratio) %>: <%= setting_select :commit_fix_done_ratio,
                                                                    (0..10).to_a.collect {|r| ["#{r*10} %", "#{r*10}"] },
                                                                    :blank => :label_no_change_option,
                                                                    :label => false %>
             <em class="info"><%= l(:text_comma_separated) %></em></p>
             <p><%= setting_check_box :commit_cross_project_ref %></p>
             <p><%= setting_check_box :commit_logtime_enabled,
                                      :onclick =>
                                         "if (this.checked) { Form.Element.enable('settings_commit_logtime_activity_id'); } else { Form.Element.disable('settings_commit_logtime_activity_id'); }"%></p>
             <p><%= setting_select :commit_logtime_activity_id,
                                   [[l(:label_default), 0]] +
                                       TimeEntryActivity.shared.active.collect{|activity| [activity.name, activity.id.to_s]},
                                   :disabled => !Setting.commit_logtime_enabled?%></p>
             </fieldset>
             <%= submit_tag l(:button_save) %>
             <% end %>

app/views/settings/plugin.html.erb +1 -1

             <h2><%= l(:label_settings) %>: <%=h @plugin.name %></h2>
             <div id="settings">
-            <% form_tag({:action => 'plugin'}) do %>
+            <%= form_tag({:action => 'plugin'}) do %>
             <div class="box tabular">
             <%= render :partial => @partial, :locals => {:settings => @settings}%>
             </div>
             <%= submit_tag l(:button_apply) %>
             <% end %>
             </div>

app/views/timelog/_date_range.html.erb +2 -2

             <fieldset id="date-range" class="collapsible">
             <legend onclick="toggleFieldset(this);"><%= l(:label_date_range) %></legend>
             <div>
             <p>
             <%= label_tag "period_type_list", l(:description_date_range_list), :class => "hidden-for-sighted" %>
             <%= radio_button_tag 'period_type', '1', !@free_period, :onclick => 'Form.Element.disable("from");Form.Element.disable("to");Form.Element.enable("period");', :id => "period_type_list"%>
             <%= select_tag 'period', options_for_period_select(params[:period]),
                                      :onchange => 'this.form.submit();',
                                      :onfocus => '$("period_type_1").checked = true;',
                                      :disabled => @free_period %>
             </p>
             <p>
             <%= label_tag "period_type_interval", l(:description_date_range_interval), :class => "hidden-for-sighted" %>
             <%= radio_button_tag 'period_type', '2', @free_period, :onclick => 'Form.Element.enable("from");Form.Element.enable("to");Form.Element.disable("period");', :id => "period_type_interval" %>
             <span onclick="$('period_type_interval').checked = true;Form.Element.enable('from');Form.Element.enable('to');Form.Element.disable('period');">
             <%= l(:label_date_from_to,
                     :start => ((label_tag "from", l(:description_date_from), :class => "hidden-for-sighted") +
                         text_field_tag('from', @from, :size => 10, :disabled => !@free_period) + calendar_for('from')),
                     :end => ((label_tag "to", l(:description_date_to), :class => "hidden-for-sighted") +
                         text_field_tag('to', @to, :size => 10, :disabled => !@free_period) + calendar_for('to'))).html_safe %>
             </span>
             </p>
             </div>
             </fieldset>
             <p class="buttons">
               <%= link_to_function l(:button_apply), '$("query_form").submit()', :class => 'icon icon-checked' %>
               <%= link_to l(:button_clear), {:controller => controller_name, :action => action_name, :project_id => @project, :issue_id => @issue}, :class => 'icon icon-reload' %>
             </p>
             <div class="tabs">
             <% url_params = @free_period ? { :from => @from, :to => @to } : { :period => params[:period] } %>
             <ul>
                 <li><%= link_to(l(:label_details), url_params.merge({:controller => 'timelog', :action => 'index', :project_id => @project, :issue_id => @issue }),
-                                                   :class => (@controller.action_name == 'index' ? 'selected' : nil)) %></li>
+                                                   :class => (action_name == 'index' ? 'selected' : nil)) %></li>
                 <li><%= link_to(l(:label_report), url_params.merge({:controller => 'timelog', :action => 'report', :project_id => @project, :issue_id => @issue}),
-                                                   :class => (@controller.action_name == 'report' ? 'selected' : nil)) %></li>
+                                                   :class => (action_name == 'report' ? 'selected' : nil)) %></li>
             </ul>
             </div>

app/views/timelog/_list.html.erb +1 -1

-            <% form_tag({}) do -%>
+            <%= form_tag({}) do -%>
             <%= hidden_field_tag 'back_url', url_for(params) %>
             <div class="autoscroll">
             <table class="list time-entries">
             <thead>
             <tr>
             <th class="checkbox hide-when-print">
               <%= link_to image_tag('toggle_check.png'),
                 {},
                 :onclick => 'toggleIssuesSelection(Element.up(this, "form")); return false;',
                 :title => "#{l(:button_check_all)}/#{l(:button_uncheck_all)}" %>
             </th>
             <%= sort_header_tag('spent_on', :caption => l(:label_date), :default_order => 'desc') %>
             <%= sort_header_tag('user', :caption => l(:label_member)) %>
             <%= sort_header_tag('activity', :caption => l(:label_activity)) %>
             <%= sort_header_tag('project', :caption => l(:label_project)) %>
             <%= sort_header_tag('issue', :caption => l(:label_issue), :default_order => 'desc') %>
             <th><%= l(:field_comments) %></th>
             <%= sort_header_tag('hours', :caption => l(:field_hours)) %>
             <th></th>
             </tr>
             </thead>
             <tbody>
             <% entries.each do |entry| -%>
             <tr class="time-entry <%= cycle("odd", "even") %> hascontextmenu">
             <td class="checkbox hide-when-print"><%= check_box_tag("ids[]", entry.id, false, :id => nil) %></td>
             <td class="spent_on"><%= format_date(entry.spent_on) %></td>
             <td class="user"><%= link_to_user(entry.user) %></td>
             <td class="activity"><%=h entry.activity %></td>
             <td class="project"><%= link_to_project(entry.project) %></td>
             <td class="subject">
             <% if entry.issue -%>
             <%= entry.issue.visible? ? link_to_issue(entry.issue, :truncate => 50) : "##{entry.issue.id}" -%>
             <% end -%>
             </td>
             <td class="comments"><%=h entry.comments %></td>
             <td class="hours"><%= html_hours("%.2f" % entry.hours) %></td>
             <td align="center">
             <% if entry.editable_by?(User.current) -%>
                 <%= link_to image_tag('edit.png'), {:controller => 'timelog', :action => 'edit', :id => entry, :project_id => nil},
                                                    :title => l(:button_edit) %>
                 <%= link_to image_tag('delete.png'), {:controller => 'timelog', :action => 'destroy', :id => entry, :project_id => nil},
                                                      :confirm => l(:text_are_you_sure),
                                                      :method => :delete,
                                                      :title => l(:button_delete) %>
             <% end -%>
             </td>
             </tr>
             <% end -%>
             </tbody>
             </table>
             </div>
             <% end -%>
             <%= context_menu time_entries_context_menu_path %>

app/views/timelog/bulk_edit.html.erb +1 -1

             <h2><%= l(:label_bulk_edit_selected_time_entries) %></h2>
             <ul>
             <%= @time_entries.collect {|i| content_tag('li',
                     link_to(h("#{i.spent_on.strftime("%Y-%m-%d")} - #{i.project}:  #{l(:label_f_hour_plural, :value => i.hours)}"),
                             { :action => 'edit', :id => i })
                  )}.join("\n").html_safe %>
             </ul>
-            <% form_tag(:action => 'bulk_update') do %>
+            <%= form_tag(:action => 'bulk_update') do %>
             <%= @time_entries.collect {|i| hidden_field_tag('ids[]', i.id)}.join.html_safe %>
             <div class="box tabular">
               <div>
                 <p>
                   <label><%= l(:field_issue) %></label>
                   <%= text_field :time_entry, :issue_id, :size => 6 %>
                 </p>
                 <p>
                   <label><%= l(:field_spent_on) %></label>
                   <%= text_field :time_entry, :spent_on, :size => 10 %><%= calendar_for('time_entry_spent_on') %>
                 </p>
                 <p>
                   <label><%= l(:field_hours) %></label>
                   <%= text_field :time_entry, :hours, :size => 6 %>
                 </p>
                 <% if @available_activities.any? %>
                 <p>
                   <label><%= l(:field_activity) %></label>
                   <%= select_tag('time_entry[activity_id]', "<option value=\"\">#{l(:label_no_change_option)}</option>" + options_from_collection_for_select(@available_activities, :id, :name)) %>
                 </p>
                 <% end %>
                 <p>
                   <label><%= l(:field_comments) %></label>
                   <%= text_field(:time_entry, :comments, :size => 100) %>
                 </p>
                 <% @custom_fields.each do |custom_field| %>
                   <p><label><%= h(custom_field.name) %></label> <%= custom_field_tag_for_bulk_edit('time_entry', custom_field, @projects) %></p>
                 <% end %>
                 <%= call_hook(:view_time_entries_bulk_edit_details_bottom, { :time_entries => @time_entries }) %>
               </div>
             </div>
             <p><%= submit_tag l(:button_submit) %></p>
             <% end %>

app/views/timelog/edit.html.erb +1 -1

             <h2><%= l(:label_spent_time) %></h2>
-            <% labelled_form_for @time_entry, :url => project_time_entry_path(@time_entry.project, @time_entry) do |f| %>
+            <%= labelled_form_for @time_entry, :url => project_time_entry_path(@time_entry.project, @time_entry) do |f| %>
               <%= render :partial => 'form', :locals => {:f => f} %>
               <%= submit_tag l(:button_save) %>
             <% end %>

app/views/timelog/index.html.erb +1 -1

             <div class="contextual">
             <%= link_to l(:button_log_time),
                         {:controller => 'timelog', :action => 'new', :project_id => @project, :issue_id => @issue},
                         :class => 'icon icon-time-add' if User.current.allowed_to?(:log_time, @project, :global => true) %>
             </div>
             <%= render_timelog_breadcrumb %>
             <h2><%= l(:label_spent_time) %></h2>
-            <% form_tag({:controller => 'timelog', :action => 'index', :project_id => @project, :issue_id => @issue}, :method => :get, :id => 'query_form') do %>
+            <%= form_tag({:controller => 'timelog', :action => 'index', :project_id => @project, :issue_id => @issue}, :method => :get, :id => 'query_form') do %>
             <%= render :partial => 'date_range' %>
             <% end %>
             <div class="total-hours">
             <p><%= l(:label_total) %>: <%= html_hours(l_hours(@total_hours)) %></p>
             </div>
             <% unless @entries.empty? %>
             <%= render :partial => 'list', :locals => { :entries => @entries }%>
             <p class="pagination"><%= pagination_links_full @entry_pages, @entry_count %></p>
             <% other_formats_links do |f| %>
               <%= f.link_to 'Atom', :url => params.merge({:issue_id => @issue, :key => User.current.rss_key}) %>
               <%= f.link_to 'CSV', :url => params %>
             <% end %>
             <% end %>
             <% html_title l(:label_spent_time), l(:label_details) %>
             <% content_for :header_tags do %>
                 <%= auto_discovery_link_tag(:atom, {:issue_id => @issue, :format => 'atom', :key => User.current.rss_key}, :title => l(:label_spent_time)) %>
             <% end %>

app/views/timelog/new.html.erb +1 -1

             <h2><%= l(:label_spent_time) %></h2>
-            <% labelled_form_for @time_entry, :url => time_entries_path do |f| %>
+            <%= labelled_form_for @time_entry, :url => time_entries_path do |f| %>
               <%= render :partial => 'form', :locals => {:f => f} %>
               <%= submit_tag l(:button_create) %>
               <%= submit_tag l(:button_create_and_continue), :name => 'continue' %>
             <% end %>

app/views/timelog/report.html.erb +3 -1

             <div class="contextual">
             <%= link_to_if_authorized l(:button_log_time), {:controller => 'timelog', :action => 'new', :project_id => @project, :issue_id => @issue}, :class => 'icon icon-time-add' %>
             </div>
             <%= render_timelog_breadcrumb %>
             <h2><%= l(:label_spent_time) %></h2>
-            <% form_tag({:controller => 'timelog', :action => 'report', :project_id => @project, :issue_id => @issue}, :method => :get, :id => 'query_form') do %>
+            <%= form_tag({:controller => 'timelog', :action => 'report',
+                          :project_id => @project, :issue_id => @issue},
+                        :method => :get, :id => 'query_form') do %>
               <% @report.criteria.each do |criterion| %>
                 <%= hidden_field_tag 'criteria[]', criterion, :id => nil %>
               <% end %>
               <%= render :partial => 'timelog/date_range' %>
               <p><label for='columns'><%= l(:label_details) %></label>: <%= select_tag 'columns', options_for_select([[l(:label_year), 'year'],
                                                                                         [l(:label_month), 'month'],
                                                                                         [l(:label_week), 'week'],
                                                                                         [l(:label_day_plural).titleize, 'day']], @report.columns),
                                                                     :onchange => "this.form.submit();" %>
               <label for='criterias'><%= l(:button_add) %></label>: <%= select_tag('criteria[]', options_for_select([[]] + (@report.available_criteria.keys - @report.criteria).collect{|k| [l_or_humanize(@report.available_criteria[k][:label]), k]}),
                                                                       :onchange => "this.form.submit();",
                                                                       :style => 'width: 200px',
                                                                       :id => nil,
                                                                       :disabled => (@report.criteria.length >= 3), :id => "criterias") %>
                  <%= link_to l(:button_clear), {:project_id => @project, :issue_id => @issue, :period_type => params[:period_type], :period => params[:period], :from => @from, :to => @to, :columns => @report.columns}, :class => 'icon icon-reload' %></p>
             <% end %>
             <% unless @report.criteria.empty? %>
             <div class="total-hours">
             <p><%= l(:label_total) %>: <%= html_hours(l_hours(@report.total_hours)) %></p>
             </div>
             <% unless @report.hours.empty? %>
             <div class="autoscroll">
             <table class="list" id="time-report">
             <thead>
             <tr>
             <% @report.criteria.each do |criteria| %>
               <th><%= l_or_humanize(@report.available_criteria[criteria][:label]) %></th>
             <% end %>
             <% columns_width = (40 / (@report.periods.length+1)).to_i %>
             <% @report.periods.each do |period| %>
               <th class="period" width="<%= columns_width %>%"><%= period %></th>
             <% end %>
               <th class="total" width="<%= columns_width %>%"><%= l(:label_total) %></th>
             </tr>
             </thead>
             <tbody>
             <%= render :partial => 'report_criteria', :locals => {:criterias => @report.criteria, :hours => @report.hours, :level => 0} %>
               <tr class="total">
               <td><%= l(:label_total) %></td>
               <%= ('<td></td>' * (@report.criteria.size - 1)).html_safe %>
               <% total = 0 -%>
               <% @report.periods.each do |period| -%>
                 <% sum = sum_hours(select_hours(@report.hours, @report.columns, period.to_s)); total += sum -%>
                 <td class="hours"><%= html_hours("%.2f" % sum) if sum > 0 %></td>
               <% end -%>
               <td class="hours"><%= html_hours("%.2f" % total) if total > 0 %></td>
               </tr>
             </tbody>
             </table>
             </div>
             <% other_formats_links do |f| %>
               <%= f.link_to 'CSV', :url => params %>
             <% end %>
             <% end %>
             <% end %>
             <% html_title l(:label_spent_time), l(:label_report) %>

app/views/trackers/edit.html.erb +1 -1

             <h2><%= link_to l(:label_tracker_plural), trackers_path %> &#187; <%=h @tracker %></h2>
-            <% labelled_form_for @tracker do |f| %>
+            <%= labelled_form_for @tracker do |f| %>
             <%= render :partial => 'form', :locals => { :f => f } %>
             <% end %>

app/views/trackers/new.html.erb +1 -1

             <h2><%= link_to l(:label_tracker_plural), trackers_path %> &#187; <%=l(:label_tracker_new)%></h2>
-            <% labelled_form_for @tracker do |f| %>
+            <%= labelled_form_for @tracker do |f| %>
             <%= render :partial => 'form', :locals => { :f => f } %>
             <% end %>

app/views/users/_general.html.erb +1 -1

-            <% labelled_form_for @user do |f| %>
+            <%= labelled_form_for @user do |f| %>
               <%= render :partial => 'form', :locals => { :f => f } %>
               <% if @user.active? && email_delivery_enabled? -%>
                 <p><label><%= check_box_tag 'send_information', 1, true %> <%= l(:label_send_information) %></label></p>
               <% end -%>
               <p><%= submit_tag l(:button_save) %></p>
             <% end %>

app/views/users/_groups.html.erb +1 -1

-            <% form_for(:user, :url => { :action => 'update' }, :html => {:method => :put}) do %>
+            <%= form_for(:user, :url => { :action => 'update' }, :html => {:method => :put}) do %>
             <div class="box">
             <% Group.all.sort.each do |group| %>
             <label><%= check_box_tag 'user[group_ids][]', group.id, @user.groups.include?(group) %> <%=h group %></label><br />
             <% end %>
             <%= hidden_field_tag 'user[group_ids][]', '' %>
             </div>
             <%= submit_tag l(:button_save) %>
             <% end %>

app/views/users/_memberships.html.erb +5 -3

             <% roles = Role.find_all_givable %>
             <% projects = Project.active.find(:all, :order => 'lft') %>
             <div class="splitcontentleft">
             <% if @user.memberships.any? %>
             <table class="list memberships">
               <thead><tr>
                 <th><%= l(:label_project) %></th>
                 <th><%= l(:label_role_plural) %></th>
                 <th style="width:15%"></th>
                   <%= call_hook(:view_users_memberships_table_header, :user => @user )%>
               </tr></thead>
               <tbody>
               <% @user.memberships.each do |membership| %>
               <% next if membership.new_record? %>
               <tr id="member-<%= membership.id %>" class="<%= cycle 'odd', 'even' %> class">
               <td class="project">
                 <%= link_to_project membership.project %>
               </td>
               <td class="roles">
                 <span id="member-<%= membership.id %>-roles"><%=h membership.roles.sort.collect(&:to_s).join(', ') %></span>
-                <% remote_form_for(:membership, :url => user_membership_path(@user, membership), :method => :put,
+                <%= form_for(:membership, :remote => true,
-                                                :html => { :id => "member-#{membership.id}-roles-form", :style => 'display:none;'}) do %>
+                             :url => user_membership_path(@user, membership), :method => :put,
+                             :html => {:id => "member-#{membership.id}-roles-form",
+                                       :style => 'display:none;'}) do %>
                     <p><% roles.each do |role| %>
                     <label><%= check_box_tag 'membership[role_ids][]', role.id, membership.roles.include?(role),
                                                                        :disabled => membership.member_roles.detect {|mr| mr.role_id == role.id && !mr.inherited_from.nil?} %> <%=h role %></label><br />
                     <% end %></p>
                     <%= hidden_field_tag 'membership[role_ids][]', '' %>
                     <p><%= submit_tag l(:button_change) %>
                     <%= link_to_function l(:button_cancel),
                                          "$('member-#{membership.id}-roles').show(); $('member-#{membership.id}-roles-form').hide(); return false;"
                         %></p>
                 <% end %>
               </td>
               <td class="buttons">
                   <%= link_to_function l(:button_edit),
                                        "$('member-#{membership.id}-roles').hide(); $('member-#{membership.id}-roles-form').show(); return false;",
                                        :class => 'icon icon-edit'
                       %>
                   <%= link_to_remote(
                         l(:button_delete),
                         { :url => user_membership_path(@user, membership),
                           :method => :delete },
                         :class => 'icon icon-del'
                       ) if membership.deletable? %>
               </td>
                   <%= call_hook(:view_users_memberships_table_row, :user => @user, :membership => membership, :roles => roles, :projects => projects )%>
               </tr>
               <% end; reset_cycle %>
               </tbody>
             </table>
             <% else %>
             <p class="nodata"><%= l(:label_no_data) %></p>
             <% end %>
             </div>
             <div class="splitcontentright">
             <% if projects.any? %>
             <fieldset><legend><%=l(:label_project_new)%></legend>
-            <% remote_form_for(:membership, :url => user_memberships_path(@user)) do %>
+            <%= form_for(:membership, :remote => true, :url => user_memberships_path(@user)) do %>
             <%= select_tag 'membership[project_id]', options_for_membership_project_select(@user, projects) %>
             <p><%= l(:label_role_plural) %>:
             <% roles.each do |role| %>
               <label><%= check_box_tag 'membership[role_ids][]', role.id %> <%=h role %></label>
             <% end %></p>
             <p><%= submit_tag l(:button_add) %></p>
             <% end %>
             </fieldset>
             <% end %>
             </div>

app/views/users/_preferences.html.erb +1 -1

-            <% labelled_fields_for :pref, @user.pref do |pref_fields| %>
+            <%= labelled_fields_for :pref, @user.pref do |pref_fields| %>
             <p><%= pref_fields.check_box :hide_mail %></p>
             <p><%= pref_fields.select :time_zone, ActiveSupport::TimeZone.all.collect {|z| [ z.to_s, z.name ]}, :include_blank => true %></p>
             <p><%= pref_fields.select :comments_sorting, [[l(:label_chronological_order), 'asc'], [l(:label_reverse_chronological_order), 'desc']] %></p>
             <p><%= pref_fields.check_box :warn_on_leaving_unsaved %></p>
             <% end %>

app/views/users/index.html.erb +1 -1

             <div class="contextual">
             <%= link_to l(:label_user_new), new_user_path, :class => 'icon icon-add' %>
             </div>
             <h2><%=l(:label_user_plural)%></h2>
-            <% form_tag({}, :method => :get) do %>
+            <%= form_tag({}, :method => :get) do %>
             <fieldset><legend><%= l(:label_filter_plural) %></legend>
             <label for='status'><%= l(:field_status) %>:</label>
             <%= select_tag 'status', users_status_options_for_select(@status), :class => "small", :onchange => "this.form.submit(); return false;"  %>
             <% if @groups.present? %>
             <label for='group_id'><%= l(:label_group) %>:</label>
             <%= select_tag 'group_id', '<option></option>' + options_from_collection_for_select(@groups, :id, :name, params[:group_id].to_i), :onchange => "this.form.submit(); return false;"  %>
             <% end %>
             <label for='name'><%= l(:label_user) %>:</label>
             <%= text_field_tag 'name', params[:name], :size => 30 %>
             <%= submit_tag l(:button_apply), :class => "small", :name => nil %>
             <%= link_to l(:button_clear), users_path, :class => 'icon icon-reload' %>
             </fieldset>
             <% end %>
             &nbsp;
             <div class="autoscroll">
             <table class="list">
               <thead><tr>
               <%= sort_header_tag('login', :caption => l(:field_login)) %>
               <%= sort_header_tag('firstname', :caption => l(:field_firstname)) %>
               <%= sort_header_tag('lastname', :caption => l(:field_lastname)) %>
               <%= sort_header_tag('mail', :caption => l(:field_mail)) %>
               <%= sort_header_tag('admin', :caption => l(:field_admin), :default_order => 'desc') %>
               <%= sort_header_tag('created_on', :caption => l(:field_created_on), :default_order => 'desc') %>
               <%= sort_header_tag('last_login_on', :caption => l(:field_last_login_on), :default_order => 'desc') %>
                 <th></th>
               </tr></thead>
               <tbody>
             <% for user in @users -%>
               <tr class="user <%= cycle("odd", "even") %> <%= %w(anon active registered locked)[user.status] %>">
               <td class="username"><%= avatar(user, :size => "14") %><%= link_to h(user.login), edit_user_path(user) %></td>
               <td class="firstname"><%= h(user.firstname) %></td>
               <td class="lastname"><%= h(user.lastname) %></td>
               <td class="email"><%= mail_to(h(user.mail)) %></td>
               <td align="center"><%= checked_image user.admin? %></td>
               <td class="created_on" align="center"><%= format_time(user.created_on) %></td>
               <td class="last_login_on" align="center"><%= format_time(user.last_login_on) unless user.last_login_on.nil? %></td>
                 <td class="buttons">
                   <%= change_status_link(user) %>
                   <%= link_to(l(:button_delete), user_path(user), :confirm => l(:text_are_you_sure), :method => :delete, :class => 'icon icon-del') unless User.current == user %>
                 </td>
               </tr>
             <% end -%>
               </tbody>
             </table>
             </div>
             <p class="pagination"><%= pagination_links_full @user_pages, @user_count %></p>
             <% html_title(l(:label_user_plural)) -%>

app/views/users/new.html.erb +1 -1

             <h2><%= link_to l(:label_user_plural), users_path %> &#187; <%=l(:label_user_new)%></h2>
-            <% labelled_form_for @user do |f| %>
+            <%= labelled_form_for @user do |f| %>
               <%= render :partial => 'form', :locals => { :f => f } %>
               <% if email_delivery_enabled? %>
               <p><label><%= check_box_tag 'send_information', 1, true %> <%= l(:label_send_information) %></label></p>
               <% end %>
               <p>
                 <%= submit_tag l(:button_create) %>
                 <%= submit_tag l(:button_create_and_continue), :name => 'continue' %>
               </p>
             <% end %>

app/views/versions/_issue_counts.html.erb +1 -1

-            <% form_tag({}, :id => "status_by_form") do -%>
+            <%= form_tag({}, :id => "status_by_form") do -%>
             <fieldset>
             <legend>
             <%= l(:label_issues_by,
                    select_tag('status_by',
                                status_by_options_for_select(criteria),
                                :id => 'status_by_select',
                                :onchange => remote_function(:url => status_by_version_path(version),
                                                             :with => "Form.serialize('status_by_form')"))).html_safe %>
             </legend>
             <% if counts.empty? %>
                 <p><em><%= l(:label_no_data) %></em></p>
             <% else %>
                 <table>
                 <% counts.each do |count| %>
                 <tr>
                     <td width="130px" align="right" >
                         <%= link_to h(count[:group]), {:controller => 'issues',
                                                     :action => 'index',
                                                     :project_id => version.project,
                                                     :set_filter => 1,
                                                     :status_id => '*',
                                                     :fixed_version_id => version}.merge("#{criteria}_id".to_sym => count[:group]) %>
                     </td>
                     <td width="240px">
                         <%= progress_bar((count[:closed].to_f / count[:total])*100,
                               :legend => "#{count[:closed]}/#{count[:total]}",
                               :width => "#{(count[:total].to_f / max * 200).floor}px;") %>
                     </td>
                 </tr>
                 <% end %>
                 </table>
             <% end %>
             </fieldset>
             <% end %>

app/views/versions/_new_modal.html.erb +1 -1

             <h3 class="title"><%=l(:label_version_new)%></h3>
-            <% labelled_remote_form_for @version, :url => project_versions_path(@project) do |f| %>
+            <%= labelled_remote_form_for :version, @version, :url => project_versions_path(@project) do |f| %>
             <%= render :partial => 'versions/form', :locals => { :f => f } %>
               <p class="buttons">
                 <%= submit_tag l(:button_create), :name => nil %>
                 <%= submit_tag l(:button_cancel), :name => nil, :onclick => "hideModal(this);", :type => 'button' %>
               </p>
             <% end %>

app/views/versions/edit.html.erb +1 -1

             <h2><%=l(:label_version)%></h2>
-            <% labelled_form_for @version do |f| %>
+            <%= labelled_form_for @version do |f| %>
             <%= render :partial => 'form', :locals => { :f => f } %>
             <%= submit_tag l(:button_save) %>
             <% end %>

app/views/versions/index.html.erb +2 -2

             <div class="contextual">
               <%= link_to l(:label_version_new), new_project_version_path(@project), :class => 'icon icon-add' if User.current.allowed_to?(:manage_versions, @project) %>
             </div>
             <h2><%=l(:label_roadmap)%></h2>
             <% if @versions.empty? %>
             <p class="nodata"><%= l(:label_no_data) %></p>
             <% else %>
             <div id="roadmap">
             <% @versions.each do |version| %>
                 <h3 class="version"><%= tag 'a', :name => anchor(version.name) %><%= link_to_version version %></h3>
                 <%= render :partial => 'versions/overview', :locals => {:version => version} %>
                 <%= render(:partial => "wiki/content", :locals => {:content => version.wiki_page.content}) if version.wiki_page %>
                 <% if (issues = @issues_by_version[version]) && issues.size > 0 %>
-                <% form_tag({}) do -%>
+                <%= form_tag({}) do -%>
                 <table class="list related-issues">
                 <caption><%= l(:label_related_issues) %></caption>
                 <% issues.each do |issue| -%>
                   <tr class="hascontextmenu">
                     <td class="checkbox"><%= check_box_tag 'ids[]', issue.id, false, :id => nil %></td>
                     <td><%= link_to_issue(issue, :project => (@project != issue.project)) %></td>
                   </tr>
                 <% end -%>
                 </table>
                 <% end %>
                 <% end %>
                 <%= call_hook :view_projects_roadmap_version_bottom, :version => version %>
             <% end %>
             </div>
             <% end %>
             <% content_for :sidebar do %>
-            <% form_tag({}, :method => :get) do %>
+            <%= form_tag({}, :method => :get) do %>
             <h3><%= l(:label_roadmap) %></h3>
             <% @trackers.each do |tracker| %>
               <label><%= check_box_tag "tracker_ids[]", tracker.id, (@selected_tracker_ids.include? tracker.id.to_s), :id => nil %>
               <%=h tracker.name %></label><br />
             <% end %>
             <br />
             <label for="completed"><%= check_box_tag "completed", 1, params[:completed] %> <%= l(:label_show_completed_versions) %></label>
             <% if @project.descendants.active.any? %>
               <%= hidden_field_tag 'with_subprojects', 0 %>
               <br /><label><%= check_box_tag 'with_subprojects', 1, @with_subprojects %> <%=l(:label_subproject_plural)%></label>
             <% end %>
             <p><%= submit_tag l(:button_apply), :class => 'button-small', :name => nil %></p>
             <% end %>
             <h3><%= l(:label_version_plural) %></h3>
             <% @versions.each do |version| %>
             <%= link_to format_version_name(version), "##{anchor(version.name)}" %><br />
             <% end %>
             <% if @completed_versions.present? %>
             <p>
             	<%= link_to_function l(:label_completed_versions),
             	                     'Element.toggleClassName("toggle-completed-versions", "collapsed"); Element.toggle("completed-versions")',
             	                     :id => 'toggle-completed-versions', :class => 'collapsible collapsed' %><br />
             	<span id="completed-versions" style="display:none;">
             	  <%= @completed_versions.map {|version| link_to format_version_name(version), version_path(version)}.join("<br />\n").html_safe %>
             	</span>
             </p>
             <% end %>
             <% end %>
             <% html_title(l(:label_roadmap)) %>
             <%= context_menu issues_context_menu_path %>

app/views/versions/new.html.erb +1 -1

             <h2><%=l(:label_version_new)%></h2>
-            <% labelled_form_for @version, :url => project_versions_path(@project) do |f| %>
+            <%= labelled_form_for @version, :url => project_versions_path(@project) do |f| %>
             <%= render :partial => 'versions/form', :locals => { :f => f } %>
             <%= submit_tag l(:button_create) %>
             <% end %>

app/views/versions/show.html.erb +1 -1

             <div class="contextual">
             <%= link_to(l(:button_edit), edit_version_path(@version), :class => 'icon icon-edit') if User.current.allowed_to?(:manage_versions, @version.project) %>
             <%= link_to_if_authorized(l(:button_edit_associated_wikipage, :page_title => @version.wiki_page_title), {:controller => 'wiki', :action => 'edit', :project_id => @version.project, :id => Wiki.titleize(@version.wiki_page_title)}, :class => 'icon icon-edit') unless @version.wiki_page_title.blank? || @version.project.wiki.nil? %>
             <%= link_to(l(:button_delete), version_path(@version, :back_url => url_for(:controller => 'versions', :action => 'index', :project_id => @version.project)),
               :confirm => l(:text_are_you_sure), :method => :delete, :class => 'icon icon-del') if User.current.allowed_to?(:manage_versions, @version.project) %>
             <%= call_hook(:view_versions_show_contextual, { :version => @version, :project => @project }) %>
             </div>
             <h2><%= h(@version.name) %></h2>
             <div id="roadmap">
             <%= render :partial => 'versions/overview', :locals => {:version => @version} %>
             <%= render(:partial => "wiki/content", :locals => {:content => @version.wiki_page.content}) if @version.wiki_page %>
             <div id="version-summary">
             <% if @version.estimated_hours > 0 || User.current.allowed_to?(:view_time_entries, @project) %>
             <fieldset class="time-tracking"><legend><%= l(:label_time_tracking) %></legend>
             <table>
             <tr>
                 <th><%= l(:field_estimated_hours) %></th>
                 <td class="total-hours"><%= html_hours(l_hours(@version.estimated_hours)) %></td>
             </tr>
             <% if User.current.allowed_to?(:view_time_entries, @project) %>
             <tr>
                 <th><%= l(:label_spent_time) %></th>
                 <td class="total-hours"><%= html_hours(l_hours(@version.spent_hours)) %></td>
             </tr>
             <% end %>
             </table>
             </fieldset>
             <% end %>
             <div id="status_by">
             <%= render_issue_status_by(@version, params[:status_by]) if @version.fixed_issues.count > 0 %>
             </div>
             </div>
             <% if @issues.present? %>
-            <% form_tag({}) do -%>
+            <%= form_tag({}) do -%>
               <table class="list related-issues">
               <caption><%= l(:label_related_issues) %></caption>
               <%- @issues.each do |issue| -%>
                 <tr class="hascontextmenu">
                   <td class="checkbox"><%= check_box_tag 'ids[]', issue.id, false, :id => nil %></td>
                   <td><%= link_to_issue(issue, :project => (@project != issue.project)) %></td>
                 </tr>
               <% end %>
               </table>
             <% end %>
             <%= context_menu issues_context_menu_path %>
             <% end %>
             </div>
             <%= call_hook :view_versions_show_bottom, :version => @version %>
             <% html_title @version.name %>

app/views/watchers/_new.html.erb +1 -1

             <h3 class="title"><%= l(:permission_add_issue_watchers) %></h3>
-            <% form_remote_tag :url => {:controller => 'watchers',
+            <%= form_remote_tag :url => {:controller => 'watchers',
                                         :action => (watched ? 'create' : 'append'),
                                         :object_type => watched.class.name.underscore,
                                         :object_id => watched},
                                  :method => :post,
                                  :html => {:id => 'new-watcher-form'} do %>
               <p><%= label_tag 'user_search', l(:label_user_search) %><%= text_field_tag 'user_search', nil %></p>
               <%= observe_field(:user_search,
                            :frequency => 0.5,
                            :update => :users_for_watcher,
                            :method => :get,
                            :before => '$("user_search").addClassName("ajax-loading")',
                            :complete => '$("user_search").removeClassName("ajax-loading")',
                            :url => {
                              :controller => 'watchers',
                              :action => 'autocomplete_for_user',
                              :object_type => watched.class.name.underscore,
                              :object_id => watched},
                            :with => 'q') %>
               <div id="users_for_watcher">
                 <%= principals_check_box_tags 'watcher[user_ids][]', (watched ? watched.addable_watcher_users : User.active.all(:limit => 100)) %>
               </div>
               <p class="buttons">
                 <%= submit_tag l(:button_add), :name => nil, :onclick => "hideModal(this);" %>
                 <%= submit_tag l(:button_cancel), :name => nil, :onclick => "hideModal(this);", :type => 'button' %>
               </p>
             <% end %>

app/views/wiki/_sidebar.html.erb +1 -1

             <% if @wiki && @wiki.sidebar -%>
               <%= textilizable @wiki.sidebar.content, :text %>
             <% end -%>
             <h3><%= l(:label_wiki) %></h3>
             <%= link_to l(:field_start_page), {:action => 'show', :id => nil} %><br />
             <%= link_to l(:label_index_by_title), {:action => 'index'} %><br />
-            <%= link_to l(:label_index_by_date), {:action => 'date_index'} %><br />
+            <%= link_to l(:label_index_by_date), {:controller => 'wiki', :project_id => @project, :action => 'date_index'} %><br />

app/views/wiki/destroy.html.erb +1 -1

             <%= wiki_page_breadcrumb(@page) %>
             <h2><%=h @page.pretty_title %></h2>
-            <% form_tag({}, :method => :delete) do %>
+            <%= form_tag({}, :method => :delete) do %>
             <div class="box">
             <p><strong><%= l(:text_wiki_page_destroy_question, :descendants => @descendants_count) %></strong></p>
             <p><label><%= radio_button_tag 'todo', 'nullify', true %> <%= l(:text_wiki_page_nullify_children) %></label><br />
             <label><%= radio_button_tag 'todo', 'destroy', false %> <%= l(:text_wiki_page_destroy_children) %></label>
             <% if @reassignable_to.any? %>
             <br />
             <label><%= radio_button_tag 'todo', 'reassign', false %> <%= l(:text_wiki_page_reassign_children) %></label>:
             <%= label_tag "reassign_to_id", l(:description_wiki_subpages_reassign), :class => "hidden-for-sighted" %>
             <%= select_tag 'reassign_to_id', wiki_page_options_for_select(@reassignable_to),
                                              :onclick => "$('todo_reassign').checked = true;" %>
             <% end %>
             </p>
             </div>
             <%= submit_tag l(:button_apply) %>
             <%= link_to l(:button_cancel), :controller => 'wiki', :action => 'show', :project_id => @project, :id => @page.title %>
             <% end %>

app/views/wiki/edit.html.erb +3 -3

             <%= wiki_page_breadcrumb(@page) %>
             <h2><%= h @page.pretty_title %></h2>
-            <% form_for :content, @content,
+            <%= form_for @content, :as => :content,
                         :url => {:action => 'update', :id => @page.title},
                         :html => {:method => :put, :multipart => true, :id => 'wiki_form'} do |f| %>
             <%= f.hidden_field :version %>
             <% if @section %>
             <%= hidden_field_tag 'section', @section %>
             <%= hidden_field_tag 'section_hash', @section_hash %>
             <% end %>
             <%= error_messages_for 'content' %>
             <div class="box tabular">
             <%= text_area_tag 'content[text]', @text, :cols => 100, :rows => 25, :class => 'wiki-edit', :accesskey => accesskey(:edit) %>
             <% if @page.safe_attribute_names.include?('parent_id') && @wiki.pages.any? %>
-              <% fields_for @page do |fp| %>
+              <%= fields_for @page do |fp| %>
                 <p>
                   <label><%= l(:field_parent_title) %></label>
-                  <%= fp.select :parent_id, "<option value=''></option>" + wiki_page_options_for_select(@wiki.pages.all(:include => :parent) - @page.self_and_descendants, @page.parent) %>
+                  <%= fp.select :parent_id, content_tag('option', '', :value => '') + wiki_page_options_for_select(@wiki.pages.all(:include => :parent) - @page.self_and_descendants, @page.parent) %>
                 </p>
               <% end %>
             <% end %>
             <p><label><%= l(:field_comments) %></label><%= f.text_field :comments, :size => 120 %></p>
             <p><label><%=l(:label_attachment_plural)%></label><%= render :partial => 'attachments/form' %></p>
             </div>
             <p><%= submit_tag l(:button_save) %>
                <%= link_to_remote l(:label_preview),
                                    { :url => { :controller => 'wiki', :action => 'preview', :project_id => @project, :id => @page.title },
                                      :method => :post,
                                      :update => 'preview',
                                      :with => "Form.serialize('wiki_form')",
                                      :complete => "Element.scrollTo('preview')"
                                    }, :accesskey => accesskey(:preview) %></p>
             <%= wikitoolbar_for 'content_text' %>
             <% end %>
             <div id="preview" class="wiki"></div>
             <% content_for :header_tags do %>
               <%= stylesheet_link_tag 'scm' %>
               <%= robot_exclusion_tag %>
             <% end %>
             <% html_title @page.pretty_title %>

app/views/wiki/history.html.erb +3 -1

             <%= wiki_page_breadcrumb(@page) %>
             <h2><%= h(@page.pretty_title) %></h2>
             <h3><%= l(:label_history) %></h3>
-            <% form_tag({:controller => 'wiki', :action => 'diff', :project_id => @page.project, :id => @page.title}, :method => :get) do %>
+            <%= form_tag({:controller => 'wiki', :action => 'diff',
+                          :project_id => @page.project, :id => @page.title},
+                          :method => :get) do %>
             <table class="list wiki-page-versions">
             <thead><tr>
                 <th>#</th>
                 <th></th>
                 <th></th>
                 <th><%= l(:field_updated_on) %></th>
                 <th><%= l(:field_author) %></th>
                 <th><%= l(:field_comments) %></th>
                 <th></th>
             </tr></thead>
             <tbody>
             <% show_diff = @versions.size > 1 %>
             <% line_num = 1 %>
             <% @versions.each do |ver| %>
             <tr class="wiki-page-version <%= cycle("odd", "even") %>">
                 <td class="id"><%= link_to h(ver.version), :action => 'show', :id => @page.title, :project_id => @page.project, :version => ver.version %></td>
                 <td class="checkbox"><%= radio_button_tag('version', ver.version, (line_num==1), :id => "cb-#{line_num}", :onclick => "$('cbto-#{line_num+1}').checked=true;") if show_diff && (line_num < @versions.size) %></td>
                 <td class="checkbox"><%= radio_button_tag('version_from', ver.version, (line_num==2), :id => "cbto-#{line_num}") if show_diff && (line_num > 1) %></td>
                 <td class="updated_on"><%= format_time(ver.updated_on) %></td>
                 <td class="author"><%= link_to_user ver.author %></td>
                 <td class="comments"><%=h ver.comments %></td>
                 <td class="buttons"><%= link_to l(:button_annotate), :action => 'annotate', :id => @page.title, :version => ver.version %></td>
             </tr>
             <% line_num += 1 %>
             <% end %>
             </tbody>
             </table>
             <%= submit_tag l(:label_view_diff), :class => 'small' if show_diff %>
             <span class="pagination"><%= pagination_links_full @version_pages, @version_count, :page_param => :p %></span>
             <% end %>

app/views/wiki/rename.html.erb +2 -2

             <%= wiki_page_breadcrumb(@page) %>
             <h2><%= h @original_title %></h2>
             <%= error_messages_for 'page' %>
-            <% labelled_form_for :wiki_page, @page,
+            <%= labelled_form_for :wiki_page, @page,
                                  :url => { :action => 'rename' },
                                  :html => { :method => :post } do |f| %>
             <div class="box tabular">
             <p><%= f.text_field :title, :required => true, :size => 100  %></p>
             <p><%= f.check_box :redirect_existing_links %></p>
             <p><%= f.select :parent_id,
-                            "<option value=''></option>" +
+                            content_tag('option', '', :value => '') +
                               wiki_page_options_for_select(
                                 @wiki.pages.all(:include => :parent) - @page.self_and_descendants,
                                 @page.parent),
                             :label => :field_parent_title %></p>
             </div>
             <%= submit_tag l(:button_rename) %>
             <% end %>

app/views/wiki/show.html.erb +4 -1

             <div class="contextual">
             <% if @editable %>
             <%= link_to_if_authorized(l(:button_edit), {:action => 'edit', :id => @page.title}, :class => 'icon icon-edit', :accesskey => accesskey(:edit)) if @content.current_version? %>
             <%= watcher_tag(@page, User.current) %>
             <%= link_to_if_authorized(l(:button_lock), {:action => 'protect', :id => @page.title, :protected => 1}, :method => :post, :class => 'icon icon-lock') if !@page.protected? %>
             <%= link_to_if_authorized(l(:button_unlock), {:action => 'protect', :id => @page.title, :protected => 0}, :method => :post, :class => 'icon icon-unlock') if @page.protected? %>
             <%= link_to_if_authorized(l(:button_rename), {:action => 'rename', :id => @page.title}, :class => 'icon icon-move') if @content.current_version? %>
             <%= link_to_if_authorized(l(:button_delete), {:action => 'destroy', :id => @page.title}, :method => :delete, :confirm => l(:text_are_you_sure), :class => 'icon icon-del') %>
             <%= link_to_if_authorized(l(:button_rollback), {:action => 'edit', :id => @page.title, :version => @content.version }, :class => 'icon icon-cancel') unless @content.current_version? %>
             <% end %>
             <%= link_to_if_authorized(l(:label_history), {:action => 'history', :id => @page.title}, :class => 'icon icon-history') %>
             </div>
             <%= wiki_page_breadcrumb(@page) %>
             <% unless @content.current_version? %>
                 <p>
                 <%= link_to(("\xc2\xab " + l(:label_previous)),
                             :action => 'show', :id => @page.title, :project_id => @page.project,
                             :version => (@content.version - 1)) + " - " if @content.version > 1 %>
                 <%= "#{l(:label_version)} #{@content.version}/#{@page.content.version}" %>
                 <%= '('.html_safe + link_to(l(:label_diff), :controller => 'wiki', :action => 'diff',
                                   :id => @page.title, :project_id => @page.project,
                                   :version => @content.version) + ')'.html_safe if @content.version > 1 %> -
                 <%= link_to((l(:label_next) + " \xc2\xbb"), :action => 'show',
                             :id => @page.title, :project_id => @page.project,
                             :version => (@content.version + 1)) + " - " if @content.version < @page.content.version %>
                 <%= link_to(l(:label_current_version), :action => 'show', :id => @page.title, :project_id => @page.project) %>
                 <br />
                 <em><%= @content.author ? link_to_user(@content.author) : l(:label_user_anonymous)
                      %>, <%= format_time(@content.updated_on) %> </em><br />
                 <%=h @content.comments %>
                 </p>
                 <hr />
             <% end %>
             <%= render(:partial => "wiki/content", :locals => {:content => @content}) %>
             <%= link_to_attachments @page %>
             <% if @editable && authorize_for('wiki', 'add_attachment') %>
             <div id="wiki_add_attachment">
             <p><%= link_to l(:label_attachment_new), {}, :onclick => "Element.show('add_attachment_form'); Element.hide(this); Element.scrollTo('add_attachment_form'); return false;",
                                                          :id => 'attach_files_link' %></p>
-            <% form_tag({ :controller => 'wiki', :action => 'add_attachment', :project_id => @project, :id => @page.title }, :multipart => true, :id => "add_attachment_form", :style => "display:none;") do %>
+            <%= form_tag({:controller => 'wiki', :action => 'add_attachment',
+                          :project_id => @project, :id => @page.title},
+                         :multipart => true, :id => "add_attachment_form",
+                         :style => "display:none;") do %>
               <div class="box">
               <p><%= render :partial => 'attachments/form' %></p>
               </div>
             <%= submit_tag l(:button_add) %>
             <%= link_to l(:button_cancel), {}, :onclick => "Element.hide('add_attachment_form'); Element.show('attach_files_link'); return false;" %>
             <% end %>
             </div>
             <% end %>
             <% other_formats_links do |f| %>
               <%= f.link_to 'PDF', :url => {:id => @page.title, :version => params[:version]} %>
               <%= f.link_to 'HTML', :url => {:id => @page.title, :version => params[:version]} %>
               <%= f.link_to 'TXT', :url => {:id => @page.title, :version => params[:version]} %>
             <% end if User.current.allowed_to?(:export_wiki_pages, @project) %>
             <% content_for :header_tags do %>
               <%= stylesheet_link_tag 'scm' %>
             <% end %>
             <% content_for :sidebar do %>
               <%= render :partial => 'sidebar' %>
             <% end %>
             <% html_title @page.pretty_title %>

app/views/wikis/destroy.html.erb +1 -1

             <h2><%=l(:label_confirmation)%></h2>
             <div class="box"><center>
             <p><strong><%= h(@project.name) %></strong><br /><%=l(:text_wiki_destroy_confirmation)%></p>
-            <% form_tag({:controller => 'wikis', :action => 'destroy', :id => @project}) do %>
+            <%= form_tag({:controller => 'wikis', :action => 'destroy', :id => @project}) do %>
             <%= hidden_field_tag "confirm", 1 %>
             <%= submit_tag l(:button_delete) %>
             <% end %>
             </center></div>

app/views/workflows/copy.html.erb +1 -1

             <%= render :partial => 'action_menu' %>
             <h2><%=l(:label_workflow)%></h2>
-            <% form_tag({}, :id => 'workflow_copy_form') do %>
+            <%= form_tag({}, :id => 'workflow_copy_form') do %>
             <fieldset class="tabular box">
             <legend><%= l(:label_copy_source) %></legend>
             <p>
               <label><%= l(:label_tracker) %></label>
               <%= select_tag('source_tracker_id',
                               "<option value=\"\">--- #{l(:actionview_instancetag_blank_option)} ---</option>" +
                               "<option value=\"any\">--- #{ l(:label_copy_same_as_target) } ---</option>" +
                               options_from_collection_for_select(@trackers, 'id', 'name', @source_tracker && @source_tracker.id)) %>
             </p>
             <p>
               <label><%= l(:label_role) %></label>
               <%= select_tag('source_role_id',
                               "<option value=\"\">--- #{l(:actionview_instancetag_blank_option)} ---</option>" +
                               "<option value=\"any\">--- #{ l(:label_copy_same_as_target) } ---</option>" +
                               options_from_collection_for_select(@roles, 'id', 'name', @source_role && @source_role.id)) %>
             </p>
             </fieldset>
             <fieldset class="tabular box">
             <legend><%= l(:label_copy_target) %></legend>
             <p>
               <label><%= l(:label_tracker) %></label>
               <%= select_tag 'target_tracker_ids',
                               "<option value=\"\" disabled=\"disabled\">--- #{l(:actionview_instancetag_blank_option)} ---</option>" +
                               options_from_collection_for_select(@trackers, 'id', 'name', @target_trackers && @target_trackers.map(&:id)), :multiple => true %>
             </p>
             <p>
               <label><%= l(:label_role) %></label>
               <%= select_tag 'target_role_ids',
                               "<option value=\"\" disabled=\"disabled\">--- #{l(:actionview_instancetag_blank_option)} ---</option>" +
                               options_from_collection_for_select(@roles, 'id', 'name', @target_roles && @target_roles.map(&:id)), :multiple => true %>
             </p>
             </fieldset>
             <%= submit_tag l(:button_copy) %>
             <% end %>

app/views/workflows/edit.html.erb +2 -2

             <%= render :partial => 'action_menu' %>
             <h2><%=l(:label_workflow)%></h2>
             <p><%=l(:text_workflow_edit)%>:</p>
-            <% form_tag({}, :method => 'get') do %>
+            <%= form_tag({}, :method => 'get') do %>
             <p>
               <label><%=l(:label_role)%>:
               <%= select_tag 'role_id', options_from_collection_for_select(@roles, "id", "name", @role && @role.id) %></label>
               <label><%=l(:label_tracker)%>:
               <%= select_tag 'tracker_id', options_from_collection_for_select(@trackers, "id", "name", @tracker && @tracker.id) %></label>
               <%= hidden_field_tag 'used_statuses_only', '0' %>
               <label><%= check_box_tag 'used_statuses_only', '1', @used_statuses_only %> <%= l(:label_display_used_statuses_only) %></label>
             </p>
             <p>
             <%= submit_tag l(:button_edit), :name => nil %>
             </p>
             <% end %>
             <% if @tracker && @role && @statuses.any? %>
-              <% form_tag({}, :id => 'workflow_form' ) do %>
+              <%= form_tag({}, :id => 'workflow_form' ) do %>
                 <%= hidden_field_tag 'tracker_id', @tracker.id %>
                 <%= hidden_field_tag 'role_id', @role.id %>
                 <div class="autoscroll">
                   <%= render :partial => 'form', :locals => {:name => 'always', :workflows => @workflows['always']} %>
                   <fieldset class="collapsible" style="padding: 0; margin-top: 0.5em;">
                     <legend onclick="toggleFieldset(this);"><%= l(:label_additional_workflow_transitions_for_author) %></legend>
                     <div id="author_workflows" style="margin: 0.5em 0 0.5em 0;">
                       <%= render :partial => 'form', :locals => {:name => 'author', :workflows => @workflows['author']} %>
                     </div>
                   </fieldset>
                   <%= javascript_tag "hideFieldset($('author_workflows'))" unless @workflows['author'].present? %>
                   <fieldset class="collapsible" style="padding: 0;">
                     <legend onclick="toggleFieldset(this);"><%= l(:label_additional_workflow_transitions_for_assignee) %></legend>
                     <div id="assignee_workflows" style="margin: 0.5em 0 0.5em 0;">
                   <%= render :partial => 'form', :locals => {:name => 'assignee', :workflows => @workflows['assignee']} %>
                     </div>
                   </fieldset>
                   <%= javascript_tag "hideFieldset($('assignee_workflows'))" unless @workflows['assignee'].present? %>
                 </div>
                 <%= submit_tag l(:button_save) %>
               <% end %>
             <% end %>
             <% html_title(l(:label_workflow)) -%>

config/boot.rb +4 -122

@@ -1,124 +1,6
1	# Don't change this file!	1	require 'rubygems'
2	# Configure your app in config/environment.rb and config/environments/*.rb
3		2
4	if RUBY_VERSION >= '1.9'	3	# Set up gems listed in the Gemfile.
5	require 'yaml'	4	ENV['BUNDLE_GEMFILE'] \|\|= File.expand_path('../../Gemfile', __FILE__)
6	YAML::ENGINE.yamler = 'syck'
7	end
8		5
9	RAILS_ROOT = "#{File.dirname(__FILE__)}/.." unless defined?(RAILS_ROOT)	6	require 'bundler/setup' if File.exists?(ENV['BUNDLE_GEMFILE'])
10
11	module Rails
12	class << self
13	def boot!
14	unless booted?
15	preinitialize
16	pick_boot.run
17	end
18	end
19
20	def booted?
21	defined? Rails::Initializer
22	end
23
24	def pick_boot
25	(vendor_rails? ? VendorBoot : GemBoot).new
26	end
27
28	def vendor_rails?
29	File.exist?("#{RAILS_ROOT}/vendor/rails")
30	end
31
32	def preinitialize
33	load(preinitializer_path) if File.exist?(preinitializer_path)
34	end
35
36	def preinitializer_path
37	"#{RAILS_ROOT}/config/preinitializer.rb"
38	end
39	end
40
41	class Boot
42	def run
43	load_initializer
44	Rails::Initializer.class_eval do
45	def load_gems
46	@bundler_loaded \|\|= Bundler.require :default, Rails.env
47	end
48	end
49	Rails::Initializer.run(:set_load_path)
50	end
51	end
52
53	class VendorBoot < Boot
54	def load_initializer
55	require "#{RAILS_ROOT}/vendor/rails/railties/lib/initializer"
56	Rails::Initializer.run(:install_gem_spec_stubs)
57	Rails::GemDependency.add_frozen_gem_path
58	end
59	end
60
61	class GemBoot < Boot
62	def load_initializer
63	self.class.load_rubygems
64	load_rails_gem
65	require 'initializer'
66	end
67
68	def load_rails_gem
69	if version = self.class.gem_version
70	gem 'rails', version
71	else
72	gem 'rails'
73	end
74	rescue Gem::LoadError => load_error
75	if load_error.message =~ /Could not find RubyGem rails/
76	STDERR.puts %(Missing the Rails #{version} gem. Please `gem install -v=#{version} rails`, update your RAILS_GEM_VERSION setting in config/environment.rb for the Rails version you do have installed, or comment out RAILS_GEM_VERSION to use the latest version installed.)
77	exit 1
78	else
79	raise
80	end
81	end
82
83	class << self
84	def rubygems_version
85	Gem::RubyGemsVersion rescue nil
86	end
87
88	def gem_version
89	if defined? RAILS_GEM_VERSION
90	RAILS_GEM_VERSION
91	elsif ENV.include?('RAILS_GEM_VERSION')
92	ENV['RAILS_GEM_VERSION']
93	else
94	parse_gem_version(read_environment_rb)
95	end
96	end
97
98	def load_rubygems
99	min_version = '1.3.2'
100	require 'rubygems'
101	unless rubygems_version >= min_version
102	$stderr.puts %Q(Rails requires RubyGems >= #{min_version} (you have #{rubygems_version}). Please `gem update --system` and try again.)
103	exit 1
104	end
105
106	rescue LoadError
107	$stderr.puts %Q(Rails requires RubyGems >= #{min_version}. Please install RubyGems and try again: http://rubygems.rubyforge.org)
108	exit 1
109	end
110
111	def parse_gem_version(text)
112	$1 if text =~ /^[^#]RAILS_GEM_VERSION\s=\s["']([!~<>=]\s*[\d.]+)["']/
113	end
114
115	private
116	def read_environment_rb
117	File.read("#{RAILS_ROOT}/config/environment.rb")
118	end
119	end
120	end
121	end
122
123	# All that for this:
124	Rails.boot!

config/environment.rb +4 -58

@@ -1,59 +1,5
1	# Be sure to restart your web server when you modify this file.	1	# Load the rails application
		2	require File.expand_path('../application', __FILE__)
2		3
3	# Uncomment below to force Rails into production mode when	4	# Initialize the rails application
4	# you don't control web/app server and can't set it the proper way	5	RedmineApp::Application.initialize!
5	# ENV['RAILS_ENV'] \|\|= 'production'
6
7	# Bootstrap the Rails environment, frameworks, and default configuration
8	require File.join(File.dirname(__FILE__), 'boot')
9
10	if RUBY_VERSION >= '1.9' && defined?(Rails) && Rails::VERSION::MAJOR < 3
11	Encoding.default_external = 'UTF-8'
12	end
13
14	# Load Engine plugin if available
15	begin
16	require File.join(File.dirname(__FILE__), '../vendor/plugins/engines/boot')
17	rescue LoadError
18	# Not available
19	end
20
21	Rails::Initializer.run do \|config\|
22	# Settings in config/environments/* take precedence those specified here
23
24	# Skip frameworks you're not going to use
25	# config.frameworks -= [ :action_web_service, :action_mailer ]
26
27	# Add additional load paths for sweepers
28	config.autoload_paths += %W( #{RAILS_ROOT}/app/sweepers )
29
30	# Force all environments to use the same logger level
31	# (by default production uses :info, the others :debug)
32	# config.log_level = :debug
33
34	# Enable page/fragment caching by setting a file-based store
35	# (remember to create the caching directory and make it readable to the application)
36	# config.action_controller.cache_store = :file_store, "#{RAILS_ROOT}/tmp/cache"
37
38	# Activate observers that should always be running
39	# config.active_record.observers = :cacher, :garbage_collector
40	config.active_record.observers = :message_observer, :issue_observer, :journal_observer, :news_observer, :document_observer, :wiki_content_observer, :comment_observer
41
42	# Make Active Record use UTC-base instead of local time
43	# config.active_record.default_timezone = :utc
44
45	# Use Active Record's schema dumper instead of SQL when creating the test database
46	# (enables use of different database adapters for development and test environments)
47	# config.active_record.schema_format = :ruby
48
49	# Deliveries are disabled by default. Do NOT modify this section.
50	# Define your email configuration in configuration.yml instead.
51	# It will automatically turn deliveries on
52	config.action_mailer.perform_deliveries = false
53
54	# Load any local configuration that is kept out of source control
55	# (e.g. gems, patches).
56	if File.exists?(File.join(File.dirname(__FILE__), 'additional_environment.rb'))
57	instance_eval File.read(File.join(File.dirname(__FILE__), 'additional_environment.rb'))
58	end
59	end

config/environments/development.rb +14 -11

@@ -1,16 +1,19
1	# Settings specified here will take precedence over those in config/environment.rb	1	# Settings specified here will take precedence over those in config/environment.rb
		2	RedmineApp::Application.configure do
		3	# In the development environment your application's code is reloaded on
		4	# every request. This slows down response time but is perfect for development
		5	# since you don't have to restart the webserver when you make code changes.
		6	config.cache_classes = false
2		7
3	# In the development environment your application's code is reloaded on	8	# Log error messages when you accidentally call methods on nil.
4	# every request. This slows down response time but is perfect for development	9	config.whiny_nils = true
5	# since you don't have to restart the webserver when you make code changes.
6	config.cache_classes = false
7		10
8	# Log error messages when you accidentally call methods on nil.	11	# Show full error reports and disable caching
9	config.whiny_nils = true	12	#config.action_controller.consider_all_requests_local = true
		13	config.action_controller.perform_caching = false
10		14
11	# Show full error reports and disable caching	15	# Don't care if the mailer can't send
12	config.action_controller.consider_all_requests_local = true	16	config.action_mailer.raise_delivery_errors = false
13	config.action_controller.perform_caching = false
14		17
15	# Don't care if the mailer can't send	18	config.active_support.deprecation = :log
16	config.action_mailer.raise_delivery_errors = false	19	end

config/environments/production.rb +25 -23

@@ -1,30 +1,32
1	# Settings specified here will take precedence over those in config/environment.rb	1	# Settings specified here will take precedence over those in config/environment.rb
		2	RedmineApp::Application.configure do
		3	# The production environment is meant for finished, "live" apps.
		4	# Code is not reloaded between requests
		5	config.cache_classes = true
2		6
3	# The production environment is meant for finished, "live" apps.	7	#####
4	# Code is not reloaded between requests	8	# Customize the default logger (http://ruby-doc.org/core/classes/Logger.html)
5	config.cache_classes = true	9	#
		10	# Use a different logger for distributed setups
		11	# config.logger = SyslogLogger.new
		12	#
		13	# Rotate logs bigger than 1MB, keeps no more than 7 rotated logs around.
		14	# When setting a new Logger, make sure to set it's log level too.
		15	#
		16	# config.logger = Logger.new(config.log_path, 7, 1048576)
		17	# config.logger.level = Logger::INFO
6		18
7	#####	19	# Full error reports are disabled and caching is turned on
8	# Customize the default logger (http://ruby-doc.org/core/classes/Logger.html)	20	config.action_controller.perform_caching = true
9	#
10	# Use a different logger for distributed setups
11	# config.logger = SyslogLogger.new
12	#
13	# Rotate logs bigger than 1MB, keeps no more than 7 rotated logs around.
14	# When setting a new Logger, make sure to set it's log level too.
15	#
16	# config.logger = Logger.new(config.log_path, 7, 1048576)
17	# config.logger.level = Logger::INFO
18		21
19	# Full error reports are disabled and caching is turned on	22	# Enable serving of images, stylesheets, and javascripts from an asset server
20	config.action_controller.consider_all_requests_local = false	23	# config.action_controller.asset_host = "http://assets.example.com"
21	config.action_controller.perform_caching = true
22		24
23	# Enable serving of images, stylesheets, and javascripts from an asset server	25	# Disable delivery errors if you bad email addresses should just be ignored
24	# config.action_controller.asset_host = "http://assets.example.com"	26	config.action_mailer.raise_delivery_errors = false
25		27
26	# Disable delivery errors if you bad email addresses should just be ignored	28	# No email in production log
27	config.action_mailer.~~raise_delivery_errors~~ = ~~false~~	29	config.action_mailer.logger = nil
28		30
29	# No email in production log	31	config.active_support.deprecation = :log
30	config.action_mailer.logger = nil	32	end

config/environments/test.rb +18 -18

@@ -1,25 +1,25
1	# Settings specified here will take precedence over those in config/environment.rb	1	# Settings specified here will take precedence over those in config/environment.rb
		2	RedmineApp::Application.configure do
		3	# The test environment is used exclusively to run your application's
		4	# test suite. You never need to work with it otherwise. Remember that
		5	# your test database is "scratch space" for the test suite and is wiped
		6	# and recreated between test runs. Don't rely on the data there!
		7	config.cache_classes = true
2		8
3	# The test environment is used exclusively to run your application's	9	# Log error messages when you accidentally call methods on nil.
4	# test suite. You never need to work with it otherwise. Remember that	10	config.whiny_nils = true
5	# your test database is "scratch space" for the test suite and is wiped
6	# and recreated between test runs. Don't rely on the data there!
7	config.cache_classes = true
8		11
9	# Log error messages when you accidentally call methods on nil.	12	# Show full error reports and disable caching
10	config.whiny_nils = true	13	#config.action_controller.consider_all_requests_local = true
		14	config.action_controller.perform_caching = false
11		15
12	# Show full error reports and disable caching	16	config.action_mailer.perform_deliveries = true
13	config.action_controller.consider_all_requests_local = true	17	config.action_mailer.delivery_method = :test
14	config.action_controller.perform_caching = false
15		18
16	config.action_mailer.perform_deliveries = true	19	# Skip protect_from_forgery in requests http://m.onkey.org/2007/9/28/csrf-protection-for-your-existing-rails-application
17	config.action_mailer.delivery_method = :test	20	config.action_controller.allow_forgery_protection = false
18		21
19	config.action_controller.session = {	22	config.active_support.deprecation = :log
20	:key => "_test_session",
21	:secret => "some secret phrase for the tests."
22	}
23		23
24	# Skip protect_from_forgery in requests http://m.onkey.org/2007/9/28/csrf-protection-for-your-existing-rails-application	24	config.secret_token = 'a secret token for running the tests'
25	config.action_controller.allow_forgery_protection = false	25	end

config/initializers/10-patches.rb +16 -18

             # Patches active_support/core_ext/load_error.rb to support 1.9.3 LoadError message
             if RUBY_VERSION >= '1.9.3'
               MissingSourceFile::REGEXPS << [/^cannot load such file -- (.+)$/i, 1]
             end
             require 'active_record'
             module ActiveRecord
               class Base
                 include Redmine::I18n
+                def self.named_scope(*args)
+                  scope(*args)
+                end
                 # Translate attribute names for validation errors display
                 def self.human_attribute_name(attr, *args)
                   l("field_#{attr.to_s.gsub(/_id$/, '')}", :default => attr)
                 end
               end
             end
             module ActionView
               module Helpers
                 module DateHelper
                   # distance_of_time_in_words breaks when difference is greater than 30 years
                   def distance_of_date_in_words(from_date, to_date = 0, options = {})
                     from_date = from_date.to_date if from_date.respond_to?(:to_date)
                     to_date = to_date.to_date if to_date.respond_to?(:to_date)
                     distance_in_days = (to_date - from_date).abs
                     I18n.with_options :locale => options[:locale], :scope => :'datetime.distance_in_words' do |locale|
                       case distance_in_days
                         when 0..60     then locale.t :x_days,             :count => distance_in_days.round
                         when 61..720   then locale.t :about_x_months,     :count => (distance_in_days / 30).round
                         else                locale.t :over_x_years,       :count => (distance_in_days / 365).floor
                       end
                     end
                   end
                 end
               end
+              class Resolver
+                def find_all(name, prefix=nil, partial=false, details={}, key=nil, locals=[])
+                  cached(key, [name, prefix, partial], details, locals) do
+                    if details[:formats] & [:xml, :json]
+                      details = details.dup
+                      details[:formats] = details[:formats].dup + [:api]
+                    end
+                    find_templates(name, prefix, partial, details)
+                  end
+                end
+              end
             end
             ActionView::Base.field_error_proc = Proc.new{ |html_tag, instance| "#{html_tag}" }
             module AsynchronousMailer
               # Adds :async_smtp and :async_sendmail delivery methods
               # to perform email deliveries asynchronously
               %w(smtp sendmail).each do |type|
                 define_method("perform_delivery_async_#{type}") do |mail|
                   Thread.start do
                     send "perform_delivery_#{type}", mail
                   end
                 end
               end
               # Adds a delivery method that writes emails in tmp/emails for testing purpose
               def perform_delivery_tmp_file(mail)
                 dest_dir = File.join(Rails.root, 'tmp', 'emails')
                 Dir.mkdir(dest_dir) unless File.directory?(dest_dir)
                 File.open(File.join(dest_dir, mail.message_id.gsub(/[<>]/, '') + '.eml'), 'wb') {|f| f.write(mail.encoded) }
               end
             end
             ActionMailer::Base.send :include, AsynchronousMailer
-            module TMail
-              # TMail::Unquoter.convert_to_with_fallback_on_iso_8859_1 introduced in TMail 1.2.7
-              # triggers a test failure in test_add_issue_with_japanese_keywords(MailHandlerTest)
-              class Unquoter
-                class << self
-                  alias_method :convert_to, :convert_to_without_fallback_on_iso_8859_1
-                end
-              end
-              # Patch for TMail 1.2.7. See http://www.redmine.org/issues/8751
-              class Encoder
-                def puts_meta(str)
-                  add_text str
-                end
-              end
-            end
             module ActionController
               module MimeResponds
-                class Responder
+                class Collector
                   def api(&block)
                     any(:xml, :json, &block)
                   end
                 end
               end
             end

config/initializers/20-mime_types.rb +1 -2

             # Add new mime types for use in respond_to blocks:
             Mime::SET << Mime::CSV unless Mime::SET.include?(Mime::CSV)
-            Mime::Type.register 'application/pdf', :pdf
-            Mime::Type.register 'image/png', :png

config/initializers/30-redmine.rb +2 0

             I18n.default_locale = 'en'
             # Adds fallback to default locale for untranslated strings
             I18n::Backend::Simple.send(:include, I18n::Backend::Fallbacks)
             require 'redmine'
+            Redmine::Plugin.load

config/routes.rb 0 0

	1	NO CONTENT: modified file			NO CONTENT: modified file
The requested commit or file is too big and content was truncated. Show full diff

extra/sample_plugin/README 0 0

	1	NO CONTENT: modified file			NO CONTENT: modified file
The requested commit or file is too big and content was truncated. Show full diff

extra/sample_plugin/app/views/example/say_goodbye.html.erb 0 0

	1	NO CONTENT: modified file			NO CONTENT: modified file
The requested commit or file is too big and content was truncated. Show full diff

extra/sample_plugin/app/views/example/say_hello.html.erb 0 0

	1	NO CONTENT: modified file			NO CONTENT: modified file
The requested commit or file is too big and content was truncated. Show full diff

extra/sample_plugin/init.rb 0 0

	1	NO CONTENT: modified file			NO CONTENT: modified file
The requested commit or file is too big and content was truncated. Show full diff

lib/generators/redmine_plugin/USAGE 0 0

	1	NO CONTENT: modified file			NO CONTENT: modified file
The requested commit or file is too big and content was truncated. Show full diff

lib/generators/redmine_plugin/redmine_plugin_generator.rb 0 0

	1	NO CONTENT: modified file			NO CONTENT: modified file
The requested commit or file is too big and content was truncated. Show full diff

lib/generators/redmine_plugin/templates/init.rb.erb 0 0

	1	NO CONTENT: modified file			NO CONTENT: modified file
The requested commit or file is too big and content was truncated. Show full diff

lib/generators/redmine_plugin_controller/USAGE 0 0

	1	NO CONTENT: modified file			NO CONTENT: modified file
The requested commit or file is too big and content was truncated. Show full diff

lib/generators/redmine_plugin_controller/redmine_plugin_controller_generator.rb 0 0

	1	NO CONTENT: modified file			NO CONTENT: modified file
The requested commit or file is too big and content was truncated. Show full diff

lib/generators/redmine_plugin_controller/templates/controller.rb.erb 0 0

	1	NO CONTENT: modified file			NO CONTENT: modified file
The requested commit or file is too big and content was truncated. Show full diff

lib/generators/redmine_plugin_controller/templates/functional_test.rb.erb 0 0

	1	NO CONTENT: modified file			NO CONTENT: modified file
The requested commit or file is too big and content was truncated. Show full diff

lib/generators/redmine_plugin_controller/templates/helper.rb.erb 0 0

	1	NO CONTENT: modified file			NO CONTENT: modified file
The requested commit or file is too big and content was truncated. Show full diff

lib/generators/redmine_plugin_controller/templates/view.html.erb 0 0

	1	NO CONTENT: modified file			NO CONTENT: modified file
The requested commit or file is too big and content was truncated. Show full diff

lib/generators/redmine_plugin_model/USAGE 0 0

	1	NO CONTENT: modified file			NO CONTENT: modified file
The requested commit or file is too big and content was truncated. Show full diff

lib/generators/redmine_plugin_model/redmine_plugin_model_generator.rb 0 0

	1	NO CONTENT: modified file			NO CONTENT: modified file
The requested commit or file is too big and content was truncated. Show full diff

lib/generators/redmine_plugin_model/templates/model.rb.erb 0 0

	1	NO CONTENT: modified file			NO CONTENT: modified file
The requested commit or file is too big and content was truncated. Show full diff

lib/generators/redmine_plugin_model/templates/unit_test.rb.erb 0 0

	1	NO CONTENT: modified file			NO CONTENT: modified file
The requested commit or file is too big and content was truncated. Show full diff

lib/redmine.rb 0 0

	1	NO CONTENT: modified file			NO CONTENT: modified file
The requested commit or file is too big and content was truncated. Show full diff

lib/redmine/ciphering.rb 0 0

	1	NO CONTENT: modified file			NO CONTENT: modified file
The requested commit or file is too big and content was truncated. Show full diff

lib/redmine/core_ext/active_record.rb 0 0

	1	NO CONTENT: modified file			NO CONTENT: modified file
The requested commit or file is too big and content was truncated. Show full diff

lib/redmine/core_ext/string.rb 0 0

	1	NO CONTENT: modified file			NO CONTENT: modified file
The requested commit or file is too big and content was truncated. Show full diff

lib/redmine/hook.rb 0 0

	1	NO CONTENT: modified file			NO CONTENT: modified file
The requested commit or file is too big and content was truncated. Show full diff

lib/redmine/plugin.rb 0 0

	1	NO CONTENT: modified file			NO CONTENT: modified file
The requested commit or file is too big and content was truncated. Show full diff

lib/redmine/scm/adapters/cvs_adapter.rb 0 0

	1	NO CONTENT: modified file			NO CONTENT: modified file
The requested commit or file is too big and content was truncated. Show full diff

lib/redmine/themes.rb 0 0

	1	NO CONTENT: modified file			NO CONTENT: modified file
The requested commit or file is too big and content was truncated. Show full diff

lib/redmine/utils.rb 0 0

	1	NO CONTENT: modified file			NO CONTENT: modified file
The requested commit or file is too big and content was truncated. Show full diff

lib/redmine/version.rb 0 0

	1	NO CONTENT: modified file			NO CONTENT: modified file
The requested commit or file is too big and content was truncated. Show full diff

lib/redmine/views/api_template_handler.rb 0 0

	1	NO CONTENT: modified file			NO CONTENT: modified file
The requested commit or file is too big and content was truncated. Show full diff

lib/redmine/views/builders/xml.rb 0 0

	1	NO CONTENT: modified file			NO CONTENT: modified file
The requested commit or file is too big and content was truncated. Show full diff

lib/redmine/views/labelled_form_builder.rb 0 0

	1	NO CONTENT: modified file			NO CONTENT: modified file
The requested commit or file is too big and content was truncated. Show full diff

lib/redmine/views/my_page/block.rb 0 0

	1	NO CONTENT: modified file			NO CONTENT: modified file
The requested commit or file is too big and content was truncated. Show full diff

lib/redmine/wiki_formatting.rb 0 0

	1	NO CONTENT: modified file			NO CONTENT: modified file
The requested commit or file is too big and content was truncated. Show full diff

lib/tasks/deprecated.rake 0 0

	1	NO CONTENT: modified file			NO CONTENT: modified file
The requested commit or file is too big and content was truncated. Show full diff

lib/tasks/initializers.rake 0 0

	1	NO CONTENT: modified file			NO CONTENT: modified file
The requested commit or file is too big and content was truncated. Show full diff

lib/tasks/redmine.rake 0 0

	1	NO CONTENT: modified file			NO CONTENT: modified file
The requested commit or file is too big and content was truncated. Show full diff

test/fixtures/custom_fields.yml 0 0

	1	NO CONTENT: modified file			NO CONTENT: modified file
The requested commit or file is too big and content was truncated. Show full diff

test/fixtures/repositories.yml 0 0

	1	NO CONTENT: modified file			NO CONTENT: modified file
The requested commit or file is too big and content was truncated. Show full diff

test/functional/issues_controller_test.rb 0 0

	1	NO CONTENT: modified file			NO CONTENT: modified file
The requested commit or file is too big and content was truncated. Show full diff

test/functional/queries_controller_test.rb 0 0

	1	NO CONTENT: modified file			NO CONTENT: modified file
The requested commit or file is too big and content was truncated. Show full diff

test/functional/repositories_subversion_controller_test.rb 0 0

	1	NO CONTENT: modified file			NO CONTENT: modified file
The requested commit or file is too big and content was truncated. Show full diff

test/functional/time_entry_reports_controller_test.rb 0 0

	1	NO CONTENT: modified file			NO CONTENT: modified file
The requested commit or file is too big and content was truncated. Show full diff

test/functional/timelog_controller_test.rb 0 0

	1	NO CONTENT: modified file			NO CONTENT: modified file
The requested commit or file is too big and content was truncated. Show full diff

test/functional/watchers_controller_test.rb 0 0

	1	NO CONTENT: modified file			NO CONTENT: modified file
The requested commit or file is too big and content was truncated. Show full diff

test/functional/wiki_controller_test.rb 0 0

	1	NO CONTENT: modified file			NO CONTENT: modified file
The requested commit or file is too big and content was truncated. Show full diff

test/integration/api_test/issue_relations_test.rb 0 0

	1	NO CONTENT: modified file			NO CONTENT: modified file
The requested commit or file is too big and content was truncated. Show full diff

test/integration/api_test/memberships_test.rb 0 0

	1	NO CONTENT: modified file			NO CONTENT: modified file
The requested commit or file is too big and content was truncated. Show full diff

test/integration/issues_test.rb 0 0

	1	NO CONTENT: modified file			NO CONTENT: modified file
The requested commit or file is too big and content was truncated. Show full diff

test/integration/projects_test.rb 0 0

	1	NO CONTENT: modified file			NO CONTENT: modified file
The requested commit or file is too big and content was truncated. Show full diff

test/integration/routing/activities_test.rb 0 0

	1	NO CONTENT: modified file			NO CONTENT: modified file
The requested commit or file is too big and content was truncated. Show full diff

test/integration/routing/repositories_test.rb 0 0

	1	NO CONTENT: modified file			NO CONTENT: modified file
The requested commit or file is too big and content was truncated. Show full diff

test/integration/routing/wiki_test.rb 0 0

	1	NO CONTENT: modified file			NO CONTENT: modified file
The requested commit or file is too big and content was truncated. Show full diff

test/test_helper.rb 0 0

	1	NO CONTENT: modified file			NO CONTENT: modified file
The requested commit or file is too big and content was truncated. Show full diff

test/unit/custom_field_test.rb 0 0

	1	NO CONTENT: modified file			NO CONTENT: modified file
The requested commit or file is too big and content was truncated. Show full diff

test/unit/helpers/application_helper_test.rb 0 0

	1	NO CONTENT: modified file			NO CONTENT: modified file
The requested commit or file is too big and content was truncated. Show full diff

test/unit/issue_test.rb 0 0

	1	NO CONTENT: modified file			NO CONTENT: modified file
The requested commit or file is too big and content was truncated. Show full diff

test/unit/lib/redmine/hook_test.rb 0 0

	1	NO CONTENT: modified file			NO CONTENT: modified file
The requested commit or file is too big and content was truncated. Show full diff

test/unit/lib/redmine/wiki_formatting/macros_test.rb 0 0

	1	NO CONTENT: modified file			NO CONTENT: modified file
The requested commit or file is too big and content was truncated. Show full diff

test/unit/mailer_test.rb 0 0

	1	NO CONTENT: modified file			NO CONTENT: modified file
The requested commit or file is too big and content was truncated. Show full diff

test/unit/user_test.rb 0 0

	1	NO CONTENT: modified file			NO CONTENT: modified file
The requested commit or file is too big and content was truncated. Show full diff

test/unit/watcher_test.rb 0 0

	1	NO CONTENT: modified file			NO CONTENT: modified file
The requested commit or file is too big and content was truncated. Show full diff

vendor/plugins/acts_as_versioned/lib/acts_as_versioned.rb 0 0

	1	NO CONTENT: modified file			NO CONTENT: modified file
The requested commit or file is too big and content was truncated. Show full diff

vendor/plugins/awesome_nested_set/MIT-LICENSE 0 0

	1	NO CONTENT: modified file			NO CONTENT: modified file
The requested commit or file is too big and content was truncated. Show full diff

vendor/plugins/awesome_nested_set/README.rdoc 0 0

	1	NO CONTENT: modified file			NO CONTENT: modified file
The requested commit or file is too big and content was truncated. Show full diff

vendor/plugins/awesome_nested_set/Rakefile 0 0

	1	NO CONTENT: modified file			NO CONTENT: modified file
The requested commit or file is too big and content was truncated. Show full diff

vendor/plugins/awesome_nested_set/awesome_nested_set.gemspec 0 0

	1	NO CONTENT: modified file			NO CONTENT: modified file
The requested commit or file is too big and content was truncated. Show full diff

vendor/plugins/awesome_nested_set/init.rb 0 0

	1	NO CONTENT: modified file			NO CONTENT: modified file
The requested commit or file is too big and content was truncated. Show full diff

vendor/plugins/awesome_nested_set/lib/awesome_nested_set.rb 0 0

	1	NO CONTENT: modified file			NO CONTENT: modified file
The requested commit or file is too big and content was truncated. Show full diff

vendor/plugins/awesome_nested_set/lib/awesome_nested_set/helper.rb 0 0

	1	NO CONTENT: modified file			NO CONTENT: modified file
The requested commit or file is too big and content was truncated. Show full diff

vendor/plugins/open_id_authentication/CHANGELOG 0 0

	1	NO CONTENT: modified file			NO CONTENT: modified file
The requested commit or file is too big and content was truncated. Show full diff

vendor/plugins/open_id_authentication/README 0 0

	1	NO CONTENT: modified file			NO CONTENT: modified file
The requested commit or file is too big and content was truncated. Show full diff

vendor/plugins/open_id_authentication/init.rb 0 0

	1	NO CONTENT: modified file			NO CONTENT: modified file
The requested commit or file is too big and content was truncated. Show full diff

vendor/plugins/open_id_authentication/lib/open_id_authentication.rb 0 0

	1	NO CONTENT: modified file			NO CONTENT: modified file
The requested commit or file is too big and content was truncated. Show full diff

lib/generators/redmine_plugin_model/templates/fixtures.yml removed 0 0

	1	NO CONTENT: file was removed			NO CONTENT: file was removed
The requested commit or file is too big and content was truncated. Show full diff

lib/generators/redmine_plugin_model/templates/migration.rb.erb removed 0 0

	1	NO CONTENT: file was removed			NO CONTENT: file was removed
The requested commit or file is too big and content was truncated. Show full diff

lib/tasks/migrate_plugins.rake removed 0 0

	1	NO CONTENT: file was removed			NO CONTENT: file was removed
The requested commit or file is too big and content was truncated. Show full diff

lib/tasks/plugins.rake removed 0 0

	1	NO CONTENT: file was removed			NO CONTENT: file was removed
The requested commit or file is too big and content was truncated. Show full diff

script/about removed 0 0

	1	NO CONTENT: file was removed			NO CONTENT: file was removed
The requested commit or file is too big and content was truncated. Show full diff

script/breakpointer removed 0 0

	1	NO CONTENT: file was removed			NO CONTENT: file was removed
The requested commit or file is too big and content was truncated. Show full diff

script/console removed 0 0

	1	NO CONTENT: file was removed			NO CONTENT: file was removed
The requested commit or file is too big and content was truncated. Show full diff

script/dbconsole removed 0 0

	1	NO CONTENT: file was removed			NO CONTENT: file was removed
The requested commit or file is too big and content was truncated. Show full diff

script/destroy removed 0 0

	1	NO CONTENT: file was removed			NO CONTENT: file was removed
The requested commit or file is too big and content was truncated. Show full diff

script/generate removed 0 0

	1	NO CONTENT: file was removed			NO CONTENT: file was removed
The requested commit or file is too big and content was truncated. Show full diff

script/performance/benchmarker removed 0 0

	1	NO CONTENT: file was removed			NO CONTENT: file was removed
The requested commit or file is too big and content was truncated. Show full diff

script/performance/profiler removed 0 0

	1	NO CONTENT: file was removed			NO CONTENT: file was removed
The requested commit or file is too big and content was truncated. Show full diff

script/performance/request removed 0 0

	1	NO CONTENT: file was removed			NO CONTENT: file was removed
The requested commit or file is too big and content was truncated. Show full diff

script/plugin removed 0 0

	1	NO CONTENT: file was removed			NO CONTENT: file was removed
The requested commit or file is too big and content was truncated. Show full diff

script/process/inspector removed 0 0

	1	NO CONTENT: file was removed			NO CONTENT: file was removed
The requested commit or file is too big and content was truncated. Show full diff

script/process/reaper removed 0 0

	1	NO CONTENT: file was removed			NO CONTENT: file was removed
The requested commit or file is too big and content was truncated. Show full diff

script/process/spawner removed 0 0

	1	NO CONTENT: file was removed			NO CONTENT: file was removed
The requested commit or file is too big and content was truncated. Show full diff

script/process/spinner removed 0 0

	1	NO CONTENT: file was removed			NO CONTENT: file was removed
The requested commit or file is too big and content was truncated. Show full diff

script/runner removed 0 0

	1	NO CONTENT: file was removed			NO CONTENT: file was removed
The requested commit or file is too big and content was truncated. Show full diff

script/server removed 0 0

	1	NO CONTENT: file was removed			NO CONTENT: file was removed
The requested commit or file is too big and content was truncated. Show full diff

vendor/plugins/awesome_nested_set/lib/awesome_nested_set/compatability.rb removed 0 0

	1	NO CONTENT: file was removed			NO CONTENT: file was removed
The requested commit or file is too big and content was truncated. Show full diff

vendor/plugins/awesome_nested_set/lib/awesome_nested_set/named_scope.rb removed 0 0

	1	NO CONTENT: file was removed			NO CONTENT: file was removed
The requested commit or file is too big and content was truncated. Show full diff

vendor/plugins/engines/.gitignore removed 0 0

	1	NO CONTENT: file was removed			NO CONTENT: file was removed
The requested commit or file is too big and content was truncated. Show full diff

vendor/plugins/engines/CHANGELOG removed 0 0

	1	NO CONTENT: file was removed			NO CONTENT: file was removed
The requested commit or file is too big and content was truncated. Show full diff

vendor/plugins/engines/MIT-LICENSE removed 0 0

	1	NO CONTENT: file was removed			NO CONTENT: file was removed
The requested commit or file is too big and content was truncated. Show full diff

vendor/plugins/engines/README removed 0 0

	1	NO CONTENT: file was removed			NO CONTENT: file was removed
The requested commit or file is too big and content was truncated. Show full diff

vendor/plugins/engines/Rakefile removed 0 0

	1	NO CONTENT: file was removed			NO CONTENT: file was removed
The requested commit or file is too big and content was truncated. Show full diff

vendor/plugins/engines/about.yml removed 0 0

	1	NO CONTENT: file was removed			NO CONTENT: file was removed
The requested commit or file is too big and content was truncated. Show full diff

vendor/plugins/engines/boot.rb removed 0 0

	1	NO CONTENT: file was removed			NO CONTENT: file was removed
The requested commit or file is too big and content was truncated. Show full diff

vendor/plugins/engines/generators/plugin_migration/USAGE removed 0 0

	1	NO CONTENT: file was removed			NO CONTENT: file was removed
The requested commit or file is too big and content was truncated. Show full diff

vendor/plugins/engines/generators/plugin_migration/plugin_migration_generator.rb removed 0 0

	1	NO CONTENT: file was removed			NO CONTENT: file was removed
The requested commit or file is too big and content was truncated. Show full diff

vendor/plugins/engines/generators/plugin_migration/templates/plugin_migration.erb removed 0 0

	1	NO CONTENT: file was removed			NO CONTENT: file was removed
The requested commit or file is too big and content was truncated. Show full diff

vendor/plugins/engines/init.rb removed 0 0

	1	NO CONTENT: file was removed			NO CONTENT: file was removed
The requested commit or file is too big and content was truncated. Show full diff

vendor/plugins/engines/lib/engines.rb removed 0 0

	1	NO CONTENT: file was removed			NO CONTENT: file was removed
The requested commit or file is too big and content was truncated. Show full diff

vendor/plugins/engines/lib/engines/assets.rb removed 0 0

	1	NO CONTENT: file was removed			NO CONTENT: file was removed
The requested commit or file is too big and content was truncated. Show full diff

vendor/plugins/engines/lib/engines/plugin.rb removed 0 0

	1	NO CONTENT: file was removed			NO CONTENT: file was removed
The requested commit or file is too big and content was truncated. Show full diff

vendor/plugins/engines/lib/engines/plugin/list.rb removed 0 0

	1	NO CONTENT: file was removed			NO CONTENT: file was removed
The requested commit or file is too big and content was truncated. Show full diff

vendor/plugins/engines/lib/engines/plugin/loader.rb removed 0 0

	1	NO CONTENT: file was removed			NO CONTENT: file was removed
The requested commit or file is too big and content was truncated. Show full diff

vendor/plugins/engines/lib/engines/plugin/locator.rb removed 0 0

	1	NO CONTENT: file was removed			NO CONTENT: file was removed
The requested commit or file is too big and content was truncated. Show full diff

vendor/plugins/engines/lib/engines/plugin/migrator.rb removed 0 0

	1	NO CONTENT: file was removed			NO CONTENT: file was removed
The requested commit or file is too big and content was truncated. Show full diff

vendor/plugins/engines/lib/engines/rails_extensions/asset_helpers.rb removed 0 0

	1	NO CONTENT: file was removed			NO CONTENT: file was removed
The requested commit or file is too big and content was truncated. Show full diff

vendor/plugins/engines/lib/engines/rails_extensions/dependencies.rb removed 0 0

	1	NO CONTENT: file was removed			NO CONTENT: file was removed
The requested commit or file is too big and content was truncated. Show full diff

vendor/plugins/engines/lib/engines/rails_extensions/form_tag_helpers.rb removed 0 0

	1	NO CONTENT: file was removed			NO CONTENT: file was removed
The requested commit or file is too big and content was truncated. Show full diff

vendor/plugins/engines/lib/engines/rails_extensions/migrations.rb removed 0 0

	1	NO CONTENT: file was removed			NO CONTENT: file was removed
The requested commit or file is too big and content was truncated. Show full diff

vendor/plugins/engines/lib/engines/rails_extensions/rails.rb removed 0 0

	1	NO CONTENT: file was removed			NO CONTENT: file was removed
The requested commit or file is too big and content was truncated. Show full diff

vendor/plugins/engines/lib/engines/testing.rb removed 0 0

	1	NO CONTENT: file was removed			NO CONTENT: file was removed
The requested commit or file is too big and content was truncated. Show full diff

vendor/plugins/engines/lib/tasks/engines.rake removed 0 0

	1	NO CONTENT: file was removed			NO CONTENT: file was removed
The requested commit or file is too big and content was truncated. Show full diff

vendor/plugins/engines/test/app/controllers/app_and_plugin_controller.rb removed 0 0

	1	NO CONTENT: file was removed			NO CONTENT: file was removed
The requested commit or file is too big and content was truncated. Show full diff

vendor/plugins/engines/test/app/controllers/namespace/app_and_plugin_controller.rb removed 0 0

	1	NO CONTENT: file was removed			NO CONTENT: file was removed
The requested commit or file is too big and content was truncated. Show full diff

vendor/plugins/engines/test/app/helpers/mail_helper.rb removed 0 0

	1	NO CONTENT: file was removed			NO CONTENT: file was removed
The requested commit or file is too big and content was truncated. Show full diff

vendor/plugins/engines/test/app/models/app_and_plugin_model.rb removed 0 0

	1	NO CONTENT: file was removed			NO CONTENT: file was removed
The requested commit or file is too big and content was truncated. Show full diff

vendor/plugins/engines/test/app/models/notify_mail.rb removed 0 0

	1	NO CONTENT: file was removed			NO CONTENT: file was removed
The requested commit or file is too big and content was truncated. Show full diff

vendor/plugins/engines/test/app/things/thing.rb removed 0 0

	1	NO CONTENT: file was removed			NO CONTENT: file was removed
The requested commit or file is too big and content was truncated. Show full diff

vendor/plugins/engines/test/app/views/app_and_plugin/a_view.html.erb removed 0 0

	1	NO CONTENT: file was removed			NO CONTENT: file was removed
The requested commit or file is too big and content was truncated. Show full diff

vendor/plugins/engines/test/app/views/namespace/app_and_plugin/a_view.html.erb removed 0 0

	1	NO CONTENT: file was removed			NO CONTENT: file was removed
The requested commit or file is too big and content was truncated. Show full diff

vendor/plugins/engines/test/app/views/notify_mail/implicit_multipart.text.html.erb removed 0 0

	1	NO CONTENT: file was removed			NO CONTENT: file was removed
The requested commit or file is too big and content was truncated. Show full diff

vendor/plugins/engines/test/app/views/notify_mail/implicit_multipart.text.plain.erb removed 0 0

	1	NO CONTENT: file was removed			NO CONTENT: file was removed
The requested commit or file is too big and content was truncated. Show full diff

vendor/plugins/engines/test/app/views/notify_mail/multipart_html.html.erb removed 0 0

	1	NO CONTENT: file was removed			NO CONTENT: file was removed
The requested commit or file is too big and content was truncated. Show full diff

vendor/plugins/engines/test/app/views/notify_mail/multipart_plain.html.erb removed 0 0

	1	NO CONTENT: file was removed			NO CONTENT: file was removed
The requested commit or file is too big and content was truncated. Show full diff

vendor/plugins/engines/test/app/views/notify_mail/signup.text.plain.erb removed 0 0

	1	NO CONTENT: file was removed			NO CONTENT: file was removed
The requested commit or file is too big and content was truncated. Show full diff

vendor/plugins/engines/test/app/views/plugin_mail/mail_from_plugin_with_application_template.text.plain.erb removed 0 0

	1	NO CONTENT: file was removed			NO CONTENT: file was removed
The requested commit or file is too big and content was truncated. Show full diff

vendor/plugins/engines/test/app/views/plugin_mail/multipart_from_plugin_with_application_template_plain.html.erb removed 0 0

	1	NO CONTENT: file was removed			NO CONTENT: file was removed
The requested commit or file is too big and content was truncated. Show full diff

vendor/plugins/engines/test/functional/controller_loading_test.rb removed 0 0

	1	NO CONTENT: file was removed			NO CONTENT: file was removed
The requested commit or file is too big and content was truncated. Show full diff

vendor/plugins/engines/test/functional/exception_notification_compatibility_test.rb removed 0 0

	1	NO CONTENT: file was removed			NO CONTENT: file was removed
The requested commit or file is too big and content was truncated. Show full diff

vendor/plugins/engines/test/functional/locale_loading_test.rb removed 0 0

	1	NO CONTENT: file was removed			NO CONTENT: file was removed
The requested commit or file is too big and content was truncated. Show full diff

vendor/plugins/engines/test/functional/routes_test.rb removed 0 0

	1	NO CONTENT: file was removed			NO CONTENT: file was removed
The requested commit or file is too big and content was truncated. Show full diff

vendor/plugins/engines/test/functional/view_helpers_test.rb removed 0 0

	1	NO CONTENT: file was removed			NO CONTENT: file was removed
The requested commit or file is too big and content was truncated. Show full diff

vendor/plugins/engines/test/functional/view_loading_test.rb removed 0 0

	1	NO CONTENT: file was removed			NO CONTENT: file was removed
The requested commit or file is too big and content was truncated. Show full diff

vendor/plugins/engines/test/lib/app_and_plugin_lib_model.rb removed 0 0

	1	NO CONTENT: file was removed			NO CONTENT: file was removed
The requested commit or file is too big and content was truncated. Show full diff

vendor/plugins/engines/test/lib/engines_test_helper.rb removed 0 0

	1	NO CONTENT: file was removed			NO CONTENT: file was removed
The requested commit or file is too big and content was truncated. Show full diff

vendor/plugins/engines/test/lib/render_information.rb removed 0 0

	1	NO CONTENT: file was removed			NO CONTENT: file was removed
The requested commit or file is too big and content was truncated. Show full diff

vendor/plugins/engines/test/plugins/alpha_plugin/app/controllers/alpha_plugin_controller.rb removed 0 0

	1	NO CONTENT: file was removed			NO CONTENT: file was removed
The requested commit or file is too big and content was truncated. Show full diff

vendor/plugins/engines/test/plugins/alpha_plugin/app/controllers/app_and_plugin_controller.rb removed 0 0

	1	NO CONTENT: file was removed			NO CONTENT: file was removed
The requested commit or file is too big and content was truncated. Show full diff

vendor/plugins/engines/test/plugins/alpha_plugin/app/controllers/namespace/alpha_plugin_controller.rb removed 0 0

	1	NO CONTENT: file was removed			NO CONTENT: file was removed
The requested commit or file is too big and content was truncated. Show full diff

vendor/plugins/engines/test/plugins/alpha_plugin/app/controllers/namespace/app_and_plugin_controller.rb removed 0 0

	1	NO CONTENT: file was removed			NO CONTENT: file was removed
The requested commit or file is too big and content was truncated. Show full diff

vendor/plugins/engines/test/plugins/alpha_plugin/app/controllers/namespace/shared_plugin_controller.rb removed 0 0

	1	NO CONTENT: file was removed			NO CONTENT: file was removed
The requested commit or file is too big and content was truncated. Show full diff

vendor/plugins/engines/test/plugins/alpha_plugin/app/controllers/shared_plugin_controller.rb removed 0 0

	1	NO CONTENT: file was removed			NO CONTENT: file was removed
The requested commit or file is too big and content was truncated. Show full diff

vendor/plugins/engines/test/plugins/alpha_plugin/app/models/alpha_plugin_model.rb removed 0 0

	1	NO CONTENT: file was removed			NO CONTENT: file was removed
The requested commit or file is too big and content was truncated. Show full diff

vendor/plugins/engines/test/plugins/alpha_plugin/app/models/app_and_plugin_model.rb removed 0 0

	1	NO CONTENT: file was removed			NO CONTENT: file was removed
The requested commit or file is too big and content was truncated. Show full diff

vendor/plugins/engines/test/plugins/alpha_plugin/app/models/shared_plugin_model.rb removed 0 0

	1	NO CONTENT: file was removed			NO CONTENT: file was removed
The requested commit or file is too big and content was truncated. Show full diff

vendor/plugins/engines/test/plugins/alpha_plugin/app/views/alpha_plugin/a_view.html.erb removed 0 0

	1	NO CONTENT: file was removed			NO CONTENT: file was removed
The requested commit or file is too big and content was truncated. Show full diff

vendor/plugins/engines/test/plugins/alpha_plugin/app/views/app_and_plugin/a_view.html.erb removed 0 0

	1	NO CONTENT: file was removed			NO CONTENT: file was removed
The requested commit or file is too big and content was truncated. Show full diff

vendor/plugins/engines/test/plugins/alpha_plugin/app/views/layouts/plugin_layout.erb removed 0 0

	1	NO CONTENT: file was removed			NO CONTENT: file was removed
The requested commit or file is too big and content was truncated. Show full diff

vendor/plugins/engines/test/plugins/alpha_plugin/app/views/namespace/alpha_plugin/a_view.html.erb removed 0 0

	1	NO CONTENT: file was removed			NO CONTENT: file was removed
The requested commit or file is too big and content was truncated. Show full diff

vendor/plugins/engines/test/plugins/alpha_plugin/app/views/namespace/app_and_plugin/a_view.html.erb removed 0 0

	1	NO CONTENT: file was removed			NO CONTENT: file was removed
The requested commit or file is too big and content was truncated. Show full diff

vendor/plugins/engines/test/plugins/alpha_plugin/app/views/namespace/shared_plugin/a_view.html.erb removed 0 0

	1	NO CONTENT: file was removed			NO CONTENT: file was removed
The requested commit or file is too big and content was truncated. Show full diff

vendor/plugins/engines/test/plugins/alpha_plugin/app/views/shared_plugin/a_view.html.erb removed 0 0

	1	NO CONTENT: file was removed			NO CONTENT: file was removed
The requested commit or file is too big and content was truncated. Show full diff

vendor/plugins/engines/test/plugins/alpha_plugin/lib/alpha_plugin_lib_model.rb removed 0 0

	1	NO CONTENT: file was removed			NO CONTENT: file was removed
The requested commit or file is too big and content was truncated. Show full diff

vendor/plugins/engines/test/plugins/alpha_plugin/lib/app_and_plugin_lib_model.rb removed 0 0

	1	NO CONTENT: file was removed			NO CONTENT: file was removed
The requested commit or file is too big and content was truncated. Show full diff

vendor/plugins/engines/test/plugins/alpha_plugin/locales/en.yml removed 0 0

	1	NO CONTENT: file was removed			NO CONTENT: file was removed
The requested commit or file is too big and content was truncated. Show full diff

vendor/plugins/engines/test/plugins/beta_plugin/app/controllers/app_and_plugin_controller.rb removed 0 0

	1	NO CONTENT: file was removed			NO CONTENT: file was removed
The requested commit or file is too big and content was truncated. Show full diff

vendor/plugins/engines/test/plugins/beta_plugin/app/controllers/namespace/shared_plugin_controller.rb removed 0 0

	1	NO CONTENT: file was removed			NO CONTENT: file was removed
The requested commit or file is too big and content was truncated. Show full diff

vendor/plugins/engines/test/plugins/beta_plugin/app/controllers/shared_plugin_controller.rb removed 0 0

	1	NO CONTENT: file was removed			NO CONTENT: file was removed
The requested commit or file is too big and content was truncated. Show full diff

vendor/plugins/engines/test/plugins/beta_plugin/app/models/shared_plugin_model.rb removed 0 0

	1	NO CONTENT: file was removed			NO CONTENT: file was removed
The requested commit or file is too big and content was truncated. Show full diff

vendor/plugins/engines/test/plugins/beta_plugin/app/views/namespace/shared_plugin/a_view.html.erb removed 0 0

	1	NO CONTENT: file was removed			NO CONTENT: file was removed
The requested commit or file is too big and content was truncated. Show full diff

vendor/plugins/engines/test/plugins/beta_plugin/app/views/shared_plugin/a_view.html.erb removed 0 0

	1	NO CONTENT: file was removed			NO CONTENT: file was removed
The requested commit or file is too big and content was truncated. Show full diff

vendor/plugins/engines/test/plugins/beta_plugin/init.rb removed 0 0

	1	NO CONTENT: file was removed			NO CONTENT: file was removed
The requested commit or file is too big and content was truncated. Show full diff

vendor/plugins/engines/test/plugins/beta_plugin/locales/en.yml removed 0 0

	1	NO CONTENT: file was removed			NO CONTENT: file was removed
The requested commit or file is too big and content was truncated. Show full diff

vendor/plugins/engines/test/plugins/not_a_plugin/public/should_not_be_copied.txt removed 0 0

	1	NO CONTENT: file was removed			NO CONTENT: file was removed
The requested commit or file is too big and content was truncated. Show full diff

vendor/plugins/engines/test/plugins/test_assets/app/controllers/assets_controller.rb removed 0 0

	1	NO CONTENT: file was removed			NO CONTENT: file was removed
The requested commit or file is too big and content was truncated. Show full diff

vendor/plugins/engines/test/plugins/test_assets/app/views/assets/index.html.erb removed 0 0

	1	NO CONTENT: file was removed			NO CONTENT: file was removed
The requested commit or file is too big and content was truncated. Show full diff

vendor/plugins/engines/test/plugins/test_assets/app/views/layouts/assets.html.erb removed 0 0

	1	NO CONTENT: file was removed			NO CONTENT: file was removed
The requested commit or file is too big and content was truncated. Show full diff

vendor/plugins/engines/test/plugins/test_assets/init.rb removed 0 0

	1	NO CONTENT: file was removed			NO CONTENT: file was removed
The requested commit or file is too big and content was truncated. Show full diff

vendor/plugins/engines/test/plugins/test_assets/public/file.txt removed 0 0

	1	NO CONTENT: file was removed			NO CONTENT: file was removed
The requested commit or file is too big and content was truncated. Show full diff

vendor/plugins/engines/test/plugins/test_assets/public/subfolder/file_in_subfolder.txt removed 0 0

	1	NO CONTENT: file was removed			NO CONTENT: file was removed
The requested commit or file is too big and content was truncated. Show full diff

vendor/plugins/engines/test/plugins/test_assets_with_assets_directory/assets/file.txt removed 0 0

	1	NO CONTENT: file was removed			NO CONTENT: file was removed
The requested commit or file is too big and content was truncated. Show full diff

vendor/plugins/engines/test/plugins/test_assets_with_assets_directory/assets/subfolder/file_in_subfolder.txt removed 0 0

	1	NO CONTENT: file was removed			NO CONTENT: file was removed
The requested commit or file is too big and content was truncated. Show full diff

vendor/plugins/engines/test/plugins/test_assets_with_assets_directory/init.rb removed 0 0

	1	NO CONTENT: file was removed			NO CONTENT: file was removed
The requested commit or file is too big and content was truncated. Show full diff

vendor/plugins/engines/test/plugins/test_assets_with_no_subdirectory/assets/file.txt removed 0 0

	1	NO CONTENT: file was removed			NO CONTENT: file was removed
The requested commit or file is too big and content was truncated. Show full diff

vendor/plugins/engines/test/plugins/test_assets_with_no_subdirectory/init.rb removed 0 0

	1	NO CONTENT: file was removed			NO CONTENT: file was removed
The requested commit or file is too big and content was truncated. Show full diff

vendor/plugins/engines/test/plugins/test_code_mixing/app/things/thing.rb removed 0 0

	1	NO CONTENT: file was removed			NO CONTENT: file was removed
The requested commit or file is too big and content was truncated. Show full diff

vendor/plugins/engines/test/plugins/test_code_mixing/init.rb removed 0 0

	1	NO CONTENT: file was removed			NO CONTENT: file was removed
The requested commit or file is too big and content was truncated. Show full diff

vendor/plugins/engines/test/plugins/test_load_path/init.rb removed 0 0

	1	NO CONTENT: file was removed			NO CONTENT: file was removed
The requested commit or file is too big and content was truncated. Show full diff

vendor/plugins/engines/test/plugins/test_migration/db/migrate/001_create_tests.rb removed 0 0

	1	NO CONTENT: file was removed			NO CONTENT: file was removed
The requested commit or file is too big and content was truncated. Show full diff

vendor/plugins/engines/test/plugins/test_migration/db/migrate/002_create_others.rb removed 0 0

	1	NO CONTENT: file was removed			NO CONTENT: file was removed
The requested commit or file is too big and content was truncated. Show full diff

vendor/plugins/engines/test/plugins/test_migration/db/migrate/003_create_extras.rb removed 0 0

	1	NO CONTENT: file was removed			NO CONTENT: file was removed
The requested commit or file is too big and content was truncated. Show full diff

vendor/plugins/engines/test/plugins/test_migration/init.rb removed 0 0

	1	NO CONTENT: file was removed			NO CONTENT: file was removed
The requested commit or file is too big and content was truncated. Show full diff

vendor/plugins/engines/test/plugins/test_plugin_mailing/app/models/plugin_mail.rb removed 0 0

	1	NO CONTENT: file was removed			NO CONTENT: file was removed
The requested commit or file is too big and content was truncated. Show full diff

vendor/plugins/engines/test/plugins/test_plugin_mailing/app/views/plugin_mail/mail_from_plugin.erb removed 0 0

	1	NO CONTENT: file was removed			NO CONTENT: file was removed
The requested commit or file is too big and content was truncated. Show full diff

vendor/plugins/engines/test/plugins/test_plugin_mailing/app/views/plugin_mail/multipart_from_plugin_html.html.erb removed 0 0

	1	NO CONTENT: file was removed			NO CONTENT: file was removed
The requested commit or file is too big and content was truncated. Show full diff

vendor/plugins/engines/test/plugins/test_plugin_mailing/app/views/plugin_mail/multipart_from_plugin_plain.html.erb removed 0 0

	1	NO CONTENT: file was removed			NO CONTENT: file was removed
The requested commit or file is too big and content was truncated. Show full diff

vendor/plugins/engines/test/plugins/test_plugin_mailing/app/views/plugin_mail/multipart_from_plugin_with_application_template_html.html.erb removed 0 0

	1	NO CONTENT: file was removed			NO CONTENT: file was removed
The requested commit or file is too big and content was truncated. Show full diff

vendor/plugins/engines/test/plugins/test_plugin_mailing/app/views/plugin_mail/multipart_from_plugin_with_application_template_plain.html.erb removed 0 0

	1	NO CONTENT: file was removed			NO CONTENT: file was removed
The requested commit or file is too big and content was truncated. Show full diff

vendor/plugins/engines/test/plugins/test_plugin_mailing/init.rb removed 0 0

	1	NO CONTENT: file was removed			NO CONTENT: file was removed
The requested commit or file is too big and content was truncated. Show full diff

vendor/plugins/engines/test/plugins/test_routing/app/controllers/namespace/test_routing_controller.rb removed 0 0

	1	NO CONTENT: file was removed			NO CONTENT: file was removed
The requested commit or file is too big and content was truncated. Show full diff

vendor/plugins/engines/test/plugins/test_routing/app/controllers/test_routing_controller.rb removed 0 0

	1	NO CONTENT: file was removed			NO CONTENT: file was removed
The requested commit or file is too big and content was truncated. Show full diff

vendor/plugins/engines/test/plugins/test_routing/config/routes.rb removed 0 0

	1	NO CONTENT: file was removed			NO CONTENT: file was removed
The requested commit or file is too big and content was truncated. Show full diff

vendor/plugins/engines/test/plugins/test_routing/init.rb removed 0 0

	1	NO CONTENT: file was removed			NO CONTENT: file was removed
The requested commit or file is too big and content was truncated. Show full diff

vendor/plugins/engines/test/plugins/test_testing/app/README.txt removed 0 0

	1	NO CONTENT: file was removed			NO CONTENT: file was removed
The requested commit or file is too big and content was truncated. Show full diff

vendor/plugins/engines/test/plugins/test_testing/init.rb removed 0 0

	1	NO CONTENT: file was removed			NO CONTENT: file was removed
The requested commit or file is too big and content was truncated. Show full diff

vendor/plugins/engines/test/plugins/test_testing/test/fixtures/testing_fixtures.yml removed 0 0

	1	NO CONTENT: file was removed			NO CONTENT: file was removed
The requested commit or file is too big and content was truncated. Show full diff

vendor/plugins/engines/test/plugins/test_testing/test/unit/override_test.rb removed 0 0

	1	NO CONTENT: file was removed			NO CONTENT: file was removed
The requested commit or file is too big and content was truncated. Show full diff

vendor/plugins/engines/test/unit/action_mailer_test.rb removed 0 0

	1	NO CONTENT: file was removed			NO CONTENT: file was removed
The requested commit or file is too big and content was truncated. Show full diff

vendor/plugins/engines/test/unit/arbitrary_code_mixing_test.rb removed 0 0

	1	NO CONTENT: file was removed			NO CONTENT: file was removed
The requested commit or file is too big and content was truncated. Show full diff

vendor/plugins/engines/test/unit/assets_test.rb removed 0 0

	1	NO CONTENT: file was removed			NO CONTENT: file was removed
The requested commit or file is too big and content was truncated. Show full diff

vendor/plugins/engines/test/unit/backwards_compat_test.rb removed 0 0

	1	NO CONTENT: file was removed			NO CONTENT: file was removed
The requested commit or file is too big and content was truncated. Show full diff

vendor/plugins/engines/test/unit/load_path_test.rb removed 0 0

	1	NO CONTENT: file was removed			NO CONTENT: file was removed
The requested commit or file is too big and content was truncated. Show full diff

vendor/plugins/engines/test/unit/migration_test.rb removed 0 0

	1	NO CONTENT: file was removed			NO CONTENT: file was removed
The requested commit or file is too big and content was truncated. Show full diff

vendor/plugins/engines/test/unit/model_and_lib_test.rb removed 0 0

	1	NO CONTENT: file was removed			NO CONTENT: file was removed
The requested commit or file is too big and content was truncated. Show full diff

vendor/plugins/engines/test/unit/plugins_test.rb removed 0 0

	1	NO CONTENT: file was removed			NO CONTENT: file was removed
The requested commit or file is too big and content was truncated. Show full diff

vendor/plugins/engines/test/unit/test_testing/override_test.rb removed 0 0

	1	NO CONTENT: file was removed			NO CONTENT: file was removed
The requested commit or file is too big and content was truncated. Show full diff

vendor/plugins/engines/test/unit/testing_test.rb removed 0 0

	1	NO CONTENT: file was removed			NO CONTENT: file was removed
The requested commit or file is too big and content was truncated. Show full diff

vendor/plugins/prepend_engine_views/init.rb removed 0 0

	1	NO CONTENT: file was removed			NO CONTENT: file was removed
The requested commit or file is too big and content was truncated. Show full diff

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages