jro_apps/redmine Commit - r10939:e396a0eebe07

Jean-Philippe Lang -

r10939:e396a0eebe07

parent child

Context file:

r10939:e396a0eebe07

Expand all files

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

app/controllers/account_controller.rb +1 -1

              # Redmine - project management software
-             # Copyright (C) 2006-2012  Jean-Philippe Lang
+             # Copyright (C) 2006-2013  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 AccountController < ApplicationController
                helper :custom_fields
                include CustomFieldsHelper
                # prevents login action to be filtered by check_if_login_required application scope filter
                skip_before_filter :check_if_login_required
                # Login request and validation
                def login
                  if request.get?
                    if User.current.logged?
                      redirect_to home_url
                    end
                  else
                    authenticate_user
                  end
                rescue AuthSourceException => e
                  logger.error "An error occured when authenticating #{params[:username]}: #{e.message}"
                  render_error :message => e.message
                end
                # Log out current user and redirect to welcome page
                def logout
                  logout_user
                  redirect_to home_url
                end
                # Lets user choose a new password
                def lost_password
                  redirect_to(home_url) && return unless Setting.lost_password?
                  if params[:token]
                    @token = Token.find_by_action_and_value("recovery", params[:token].to_s)
                    if @token.nil? || @token.expired?
                      redirect_to home_url
                      return
                    end
                    @user = @token.user
                    unless @user && @user.active?
                      redirect_to home_url
                      return
                    end
                    if request.post?
                      @user.password, @user.password_confirmation = params[:new_password], params[:new_password_confirmation]
                      if @user.save
                        @token.destroy
                        flash[:notice] = l(:notice_account_password_updated)
                        redirect_to signin_path
                        return
                      end
                    end
                    render :template => "account/password_recovery"
                    return
                  else
                    if request.post?
                      user = User.find_by_mail(params[:mail].to_s)
                      # user not found or not active
                      unless user && user.active?
                        flash.now[:error] = l(:notice_account_unknown_email)
                        return
                      end
                      # user cannot change its password
                      unless user.change_password_allowed?
                        flash.now[:error] = l(:notice_can_t_change_password)
                        return
                      end
                      # create a new token for password recovery
                      token = Token.new(:user => user, :action => "recovery")
                      if token.save
                        Mailer.lost_password(token).deliver
                        flash[:notice] = l(:notice_account_lost_email_sent)
                        redirect_to signin_path
                        return
                      end
                    end
                  end
                end
                # User self-registration
                def register
                  redirect_to(home_url) && return unless Setting.self_registration? || session[:auth_source_registration]
                  if request.get?
                    session[:auth_source_registration] = nil
                    @user = User.new(:language => current_language.to_s)
                  else
                    user_params = params[:user] || {}
                    @user = User.new
                    @user.safe_attributes = user_params
                    @user.admin = false
                    @user.register
                    if session[:auth_source_registration]
                      @user.activate
                      @user.login = session[:auth_source_registration][:login]
                      @user.auth_source_id = session[:auth_source_registration][:auth_source_id]
                      if @user.save
                        session[:auth_source_registration] = nil
                        self.logged_user = @user
                        flash[:notice] = l(:notice_account_activated)
                        redirect_to my_account_path
                      end
                    else
                      @user.login = params[:user][:login]
                      unless user_params[:identity_url].present? && user_params[:password].blank? && user_params[:password_confirmation].blank?
                        @user.password, @user.password_confirmation = user_params[:password], user_params[:password_confirmation]
                      end
                      case Setting.self_registration
                      when '1'
                        register_by_email_activation(@user)
                      when '3'
                        register_automatically(@user)
                      else
                        register_manually_by_administrator(@user)
                      end
                    end
                  end
                end
                # Token based account activation
                def activate
                  redirect_to(home_url) && return unless Setting.self_registration? && params[:token]
                  token = Token.find_by_action_and_value('register', params[:token])
                  redirect_to(home_url) && return unless token and !token.expired?
                  user = token.user
                  redirect_to(home_url) && return unless user.registered?
                  user.activate
                  if user.save
                    token.destroy
                    flash[:notice] = l(:notice_account_activated)
                  end
                  redirect_to signin_path
                end
                private
                def authenticate_user
                  if Setting.openid? && using_open_id?
                    open_id_authenticate(params[:openid_url])
                  else
                    password_authentication
                  end
                end
                def password_authentication
                  user = User.try_to_login(params[:username], params[:password])
                  if user.nil?
                    invalid_credentials
                  elsif user.new_record?
                    onthefly_creation_failed(user, {:login => user.login, :auth_source_id => user.auth_source_id })
                  else
                    # Valid user
                    successful_authentication(user)
                  end
                end
                def open_id_authenticate(openid_url)
                  authenticate_with_open_id(openid_url, :required => [:nickname, :fullname, :email], :return_to => signin_url, :method => :post) do |result, identity_url, registration|
                    if result.successful?
                      user = User.find_or_initialize_by_identity_url(identity_url)
                      if user.new_record?
                        # Self-registration off
                        redirect_to(home_url) && return unless Setting.self_registration?
                        # Create on the fly
                        user.login = registration['nickname'] unless registration['nickname'].nil?
                        user.mail = registration['email'] unless registration['email'].nil?
                        user.firstname, user.lastname = registration['fullname'].split(' ') unless registration['fullname'].nil?
                        user.random_password
                        user.register
                        case Setting.self_registration
                        when '1'
                          register_by_email_activation(user) do
                            onthefly_creation_failed(user)
                          end
                        when '3'
                          register_automatically(user) do
                            onthefly_creation_failed(user)
                          end
                        else
                          register_manually_by_administrator(user) do
                            onthefly_creation_failed(user)
                          end
                        end
                      else
                        # Existing record
                        if user.active?
                          successful_authentication(user)
                        else
                          account_pending
                        end
                      end
                    end
                  end
                end
                def successful_authentication(user)
                  logger.info "Successful authentication for '#{user.login}' from #{request.remote_ip} at #{Time.now.utc}"
                  # Valid user
                  self.logged_user = user
                  # generate a key and set cookie if autologin
                  if params[:autologin] && Setting.autologin?
                    set_autologin_cookie(user)
                  end
                  call_hook(:controller_account_success_authentication_after, {:user => user })
                  redirect_back_or_default my_page_path
                end
                def set_autologin_cookie(user)
                  token = Token.create(:user => user, :action => 'autologin')
                  cookie_name = Redmine::Configuration['autologin_cookie_name'] || 'autologin'
                  cookie_options = {
                    :value => token.value,
                    :expires => 1.year.from_now,
                    :path => (Redmine::Configuration['autologin_cookie_path'] || '/'),
                    :secure => (Redmine::Configuration['autologin_cookie_secure'] ? true : false),
                    :httponly => true
                  }
                  cookies[cookie_name] = cookie_options
                end
                # Onthefly creation failed, display the registration form to fill/fix attributes
                def onthefly_creation_failed(user, auth_source_options = { })
                  @user = user
                  session[:auth_source_registration] = auth_source_options unless auth_source_options.empty?
                  render :action => 'register'
                end
                def invalid_credentials
                  logger.warn "Failed login for '#{params[:username]}' from #{request.remote_ip} at #{Time.now.utc}"
                  flash.now[:error] = l(:notice_account_invalid_creditentials)
                end
                # Register a user for email activation.
                #
                # Pass a block for behavior when a user fails to save
                def register_by_email_activation(user, &block)
                  token = Token.new(:user => user, :action => "register")
                  if user.save and token.save
                    Mailer.register(token).deliver
                    flash[:notice] = l(:notice_account_register_done)
                    redirect_to signin_path
                  else
                    yield if block_given?
                  end
                end
                # Automatically register a user
                #
                # Pass a block for behavior when a user fails to save
                def register_automatically(user, &block)
                  # Automatic activation
                  user.activate
                  user.last_login_on = Time.now
                  if user.save
                    self.logged_user = user
                    flash[:notice] = l(:notice_account_activated)
                    redirect_to my_account_path
                  else
                    yield if block_given?
                  end
                end
                # Manual activation by the administrator
                #
                # Pass a block for behavior when a user fails to save
                def register_manually_by_administrator(user, &block)
                  if user.save
                    # Sends an email to the administrators
                    Mailer.account_activation_request(user).deliver
                    account_pending
                  else
                    yield if block_given?
                  end
                end
                def account_pending
                  flash[:notice] = l(:notice_account_pending)
                  redirect_to signin_path
                end
              end

app/controllers/activities_controller.rb +1 -1

              # Redmine - project management software
-             # Copyright (C) 2006-2012  Jean-Philippe Lang
+             # Copyright (C) 2006-2013  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 ActivitiesController < ApplicationController
                menu_item :activity
                before_filter :find_optional_project
                accept_rss_auth :index
                def index
                  @days = Setting.activity_days_default.to_i
                  if params[:from]
                    begin; @date_to = params[:from].to_date + 1; rescue; end
                  end
                  @date_to ||= Date.today + 1
                  @date_from = @date_to - @days
                  @with_subprojects = params[:with_subprojects].nil? ? Setting.display_subprojects_issues? : (params[:with_subprojects] == '1')
                  @author = (params[:user_id].blank? ? nil : User.active.find(params[:user_id]))
                  @activity = Redmine::Activity::Fetcher.new(User.current, :project => @project,
                                                                           :with_subprojects => @with_subprojects,
                                                                           :author => @author)
                  @activity.scope_select {|t| !params["show_#{t}"].nil?}
                  @activity.scope = (@author.nil? ? :default : :all) if @activity.scope.empty?
                  events = @activity.events(@date_from, @date_to)
                  if events.empty? || stale?(:etag => [@activity.scope, @date_to, @date_from, @with_subprojects, @author, events.first, events.size, User.current, current_language])
                    respond_to do |format|
                      format.html {
                        @events_by_day = events.group_by {|event| User.current.time_to_date(event.event_datetime)}
                        render :layout => false if request.xhr?
                      }
                      format.atom {
                        title = l(:label_activity)
                        if @author
                          title = @author.name
                        elsif @activity.scope.size == 1
                          title = l("label_#{@activity.scope.first.singularize}_plural")
                        end
                        render_feed(events, :title => "#{@project || Setting.app_title}: #{title}")
                      }
                    end
                  end
                rescue ActiveRecord::RecordNotFound
                  render_404
                end
                private
                # TODO: refactor, duplicated in projects_controller
                def find_optional_project
                  return true unless params[:id]
                  @project = Project.find(params[:id])
                  authorize
                rescue ActiveRecord::RecordNotFound
                  render_404
                end
              end

app/controllers/admin_controller.rb +1 -1

              # Redmine - project management software
-             # Copyright (C) 2006-2012  Jean-Philippe Lang
+             # Copyright (C) 2006-2013  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 AdminController < ApplicationController
                layout 'admin'
                menu_item :projects, :only => :projects
                menu_item :plugins, :only => :plugins
                menu_item :info, :only => :info
                before_filter :require_admin
                helper :sort
                include SortHelper
                def index
                  @no_configuration_data = Redmine::DefaultData::Loader::no_data?
                end
                def projects
                  @status = params[:status] || 1
                  scope = Project.status(@status).order('lft')
                  scope = scope.like(params[:name]) if params[:name].present?
                  @projects = scope.all
                  render :action => "projects", :layout => false if request.xhr?
                end
                def plugins
                  @plugins = Redmine::Plugin.all
                end
                # Loads the default configuration
                # (roles, trackers, statuses, workflow, enumerations)
                def default_configuration
                  if request.post?
                    begin
                      Redmine::DefaultData::Loader::load(params[:lang])
                      flash[:notice] = l(:notice_default_data_loaded)
                    rescue Exception => e
                      flash[:error] = l(:error_can_t_load_default_data, e.message)
                    end
                  end
                  redirect_to admin_path
                end
                def test_email
                  raise_delivery_errors = ActionMailer::Base.raise_delivery_errors
                  # Force ActionMailer to raise delivery errors so we can catch it
                  ActionMailer::Base.raise_delivery_errors = true
                  begin
                    @test = Mailer.test_email(User.current).deliver
                    flash[:notice] = l(:notice_email_sent, User.current.mail)
                  rescue Exception => e
                    flash[:error] = l(:notice_email_error, e.message)
                  end
                  ActionMailer::Base.raise_delivery_errors = raise_delivery_errors
                  redirect_to settings_path(:tab => 'notifications')
                end
                def info
                  @db_adapter_name = ActiveRecord::Base.connection.adapter_name
                  @checklist = [
                    [:text_default_administrator_account_changed, User.default_admin_account_changed?],
                    [:text_file_repository_writable, File.writable?(Attachment.storage_path)],
                    [:text_plugin_assets_writable,   File.writable?(Redmine::Plugin.public_directory)],
                    [:text_rmagick_available,        Object.const_defined?(:Magick)]
                  ]
                end
              end

app/controllers/application_controller.rb +1 -1

              # Redmine - project management software
-             # Copyright (C) 2006-2012  Jean-Philippe Lang
+             # Copyright (C) 2006-2013  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
                include Redmine::Pagination
                include RoutesHelper
                helper :routes
                class_attribute :accept_api_auth_actions
                class_attribute :accept_rss_auth_actions
                class_attribute :model_object
                layout 'base'
                protect_from_forgery
                def handle_unverified_request
                  super
                  cookies.delete(:autologin)
                end
                before_filter :session_expiration, :user_setup, :check_if_login_required, :set_localization
                rescue_from ActionController::InvalidAuthenticityToken, :with => :invalid_authenticity_token
                rescue_from ::Unauthorized, :with => :deny_access
                rescue_from ::ActionView::MissingTemplate, :with => :missing_template
                include Redmine::Search::Controller
                include Redmine::MenuManager::MenuController
                helper Redmine::MenuManager::MenuHelper
                def session_expiration
                  if session[:user_id]
                    if session_expired? && !try_to_autologin
                      reset_session
                      flash[:error] = l(:error_session_expired)
                      redirect_to signin_url
                    else
                      session[:atime] = Time.now.utc.to_i
                    end
                  end
                end
                def session_expired?
                  if Setting.session_lifetime?
                    unless session[:ctime] && (Time.now.utc.to_i - session[:ctime].to_i <= Setting.session_lifetime.to_i * 60)
                      return true
                    end
                  end
                  if Setting.session_timeout?
                    unless session[:atime] && (Time.now.utc.to_i - session[:atime].to_i <= Setting.session_timeout.to_i * 60)
                      return true
                    end
                  end
                  false
                end
                def start_user_session(user)
                  session[:user_id] = user.id
                  session[:ctime] = Time.now.utc.to_i
                  session[:atime] = Time.now.utc.to_i
                end
                def user_setup
                  # Check the settings cache for each request
                  Setting.check_cache
                  # Find the current user
                  User.current = find_current_user
                  logger.info("  Current user: " + (User.current.logged? ? "#{User.current.login} (id=#{User.current.id})" : "anonymous")) if logger
                end
                # Returns the current user or nil if no user is logged in
                # and starts a session if needed
                def find_current_user
                  user = nil
                  unless api_request?
                    if session[:user_id]
                      # existing session
                      user = (User.active.find(session[:user_id]) rescue nil)
                    elsif autologin_user = try_to_autologin
                      user = autologin_user
                    elsif params[:format] == 'atom' && params[:key] && request.get? && accept_rss_auth?
                      # RSS key authentication does not start a session
                      user = User.find_by_rss_key(params[:key])
                    end
                  end
                  if user.nil? && Setting.rest_api_enabled? && accept_api_auth?
                    if (key = api_key_from_request)
                      # Use API key
                      user = User.find_by_api_key(key)
                    else
                      # HTTP Basic, either username/password or API key/random
                      authenticate_with_http_basic do |username, password|
                        user = User.try_to_login(username, password) || User.find_by_api_key(username)
                      end
                    end
                    # Switch user if requested by an admin user
                    if user && user.admin? && (username = api_switch_user_from_request)
                      su = User.find_by_login(username)
                      if su && su.active?
                        logger.info("  User switched by: #{user.login} (id=#{user.id})") if logger
                        user = su
                      else
                        render_error :message => 'Invalid X-Redmine-Switch-User header', :status => 412
                      end
                    end
                  end
                  user
                end
                def try_to_autologin
                  if cookies[:autologin] && Setting.autologin?
                    # auto-login feature starts a new session
                    user = User.try_to_autologin(cookies[:autologin])
                    if user
                      reset_session
                      start_user_session(user)
                    end
                    user
                  end
                end
                # Sets the logged in user
                def logged_user=(user)
                  reset_session
                  if user && user.is_a?(User)
                    User.current = user
                    start_user_session(user)
                  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.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)
                  self.model_object = model
                end
                # Find the issue whose id is the :id parameter
                # Raises a Unauthorized exception if the issue is not visible
                def find_issue
                  # Issue.visible.find(...) can not be used to redirect user to the login form
                  # if the issue actually exists but requires authentication
                  @issue = Issue.find(params[:id])
                  raise Unauthorized unless @issue.visible?
                  @project = @issue.project
                rescue ActiveRecord::RecordNotFound
                  render_404
                end
                # Find issues with a single :id param or :ids array param
                # Raises a Unauthorized exception if one of the issues is not visible
                def find_issues
                  @issues = Issue.find_all_by_id(params[:id] || params[:ids])
                  raise ActiveRecord::RecordNotFound if @issues.empty?
                  raise Unauthorized unless @issues.all?(&:visible?)
                  @projects = @issues.collect(&:project).compact.uniq
                  @project = @projects.first if @projects.size == 1
                rescue ActiveRecord::RecordNotFound
                  render_404
                end
                def find_attachments
                  if (attachments = params[:attachments]).present?
                    att = attachments.values.collect do |attachment|
                      Attachment.find_by_token( attachment[:token] ) if attachment[:token].present?
                    end
                    att.compact!
                  end
                  @attachments = att || []
                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.archived?
                    if @project.visible?
                      true
                    else
                      deny_access
                    end
                  else
                    @project = nil
                    render_404
                    false
                  end
                end
                def back_url
                  url = params[:back_url]
                  if url.nil? && referer = request.env['HTTP_REFERER']
                    url = CGI.unescape(referer.to_s)
                  end
                  url
                end
                def redirect_back_or_default(default)
                  back_url = params[:back_url].to_s
                  if back_url.present?
                    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
                      logger.warn("Could not redirect to invalid URL #{back_url}")
                      # 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.any { head @status }
                  end
                end
                # Handler for ActionView::MissingTemplate exception
                def missing_template
                  logger.warn "Missing template, responding with 404"
                  @project = nil
                  render_404
                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", :formats => [:atom], :layout => false,
                         :content_type => 'application/atom+xml'
                end
                def self.accept_rss_auth(*actions)
                  if actions.any?
                    self.accept_rss_auth_actions = actions
                  else
                    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?
                    self.accept_api_auth_actions = actions
                  else
                    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].to_s
                  elsif request.headers["X-Redmine-API-Key"].present?
                    request.headers["X-Redmine-API-Key"].to_s
                  end
                end
                # Returns the API 'switch user' value if present
                def api_switch_user_from_request
                  request.headers["X-Redmine-Switch-User"].to_s.presence
                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 a 200 response for successfull updates or deletions via the API
                def render_api_ok
                  render_api_head :ok
                end
                # Renders a head API response
                def render_api_head(status)
                  # #head would return a response body with one space
                  render :text => '', :status => status, :layout => nil
                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 => nil
                end
                # Overrides #_include_layout? so that #render with no arguments
                # doesn't use the layout for api requests
                def _include_layout?(*args)
                  api_request? ? false : super
                end
              end

app/controllers/attachments_controller.rb +1 -1

              # Redmine - project management software
-             # Copyright (C) 2006-2012  Jean-Philippe Lang
+             # Copyright (C) 2006-2013  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 AttachmentsController < ApplicationController
                before_filter :find_project, :except => :upload
                before_filter :file_readable, :read_authorize, :only => [:show, :download, :thumbnail]
                before_filter :delete_authorize, :only => :destroy
                before_filter :authorize_global, :only => :upload
                accept_api_auth :show, :download, :upload
                def show
                  respond_to do |format|
                    format.html {
                      if @attachment.is_diff?
                        @diff = File.new(@attachment.diskfile, "rb").read
                        @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
                        render :action => 'diff'
                      elsif @attachment.is_text? && @attachment.filesize <= Setting.file_max_size_displayed.to_i.kilobyte
                        @content = File.new(@attachment.diskfile, "rb").read
                        render :action => 'file'
                      else
                        download
                      end
                    }
                    format.api
                  end
                end
                def download
                  if @attachment.container.is_a?(Version) || @attachment.container.is_a?(Project)
                    @attachment.increment_download
                  end
                  if stale?(:etag => @attachment.digest)
                    # images are sent inline
                    send_file @attachment.diskfile, :filename => filename_for_content_disposition(@attachment.filename),
                                                    :type => detect_content_type(@attachment),
                                                    :disposition => (@attachment.image? ? 'inline' : 'attachment')
                  end
                end
                def thumbnail
                  if @attachment.thumbnailable? && thumbnail = @attachment.thumbnail(:size => params[:size])
                    if stale?(:etag => thumbnail)
                      send_file thumbnail,
                        :filename => filename_for_content_disposition(@attachment.filename),
                        :type => detect_content_type(@attachment),
                        :disposition => 'inline'
                    end
                  else
                    # No thumbnail for the attachment or thumbnail could not be created
                    render :nothing => true, :status => 404
                  end
                end
                def upload
                  # Make sure that API users get used to set this content type
                  # as it won't trigger Rails' automatic parsing of the request body for parameters
                  unless request.content_type == 'application/octet-stream'
                    render :nothing => true, :status => 406
                    return
                  end
                  @attachment = Attachment.new(:file => request.raw_post)
                  @attachment.author = User.current
                  @attachment.filename = params[:filename].presence || Redmine::Utils.random_hex(16)
                  saved = @attachment.save
                  respond_to do |format|
                    format.js
                    format.api {
                      if saved
                        render :action => 'upload', :status => :created
                      else
                        render_validation_errors(@attachment)
                      end
                    }
                  end
                end
                def destroy
                  if @attachment.container.respond_to?(:init_journal)
                    @attachment.container.init_journal(User.current)
                  end
                  if @attachment.container
                    # Make sure association callbacks are called
                    @attachment.container.attachments.delete(@attachment)
                  else
                    @attachment.destroy
                  end
                  respond_to do |format|
                    format.html { redirect_to_referer_or project_path(@project) }
                    format.js
                  end
                end
              private
                def find_project
                  @attachment = Attachment.find(params[:id])
                  # Show 404 if the filename in the url is wrong
                  raise ActiveRecord::RecordNotFound if params[:filename] && params[:filename] != @attachment.filename
                  @project = @attachment.project
                rescue ActiveRecord::RecordNotFound
                  render_404
                end
                # Checks that the file exists and is readable
                def file_readable
                  if @attachment.readable?
                    true
                  else
                    logger.error "Cannot send attachment, #{@attachment.diskfile} does not exist or is unreadable."
                    render_404
                  end
                end
                def read_authorize
                  @attachment.visible? ? true : deny_access
                end
                def delete_authorize
                  @attachment.deletable? ? true : deny_access
                end
                def detect_content_type(attachment)
                  content_type = attachment.content_type
                  if content_type.blank?
                    content_type = Redmine::MimeType.of(attachment.filename)
                  end
                  content_type.to_s
                end
              end

app/controllers/auth_sources_controller.rb +1 -1

              # Redmine - project management software
-             # Copyright (C) 2006-2012  Jean-Philippe Lang
+             # Copyright (C) 2006-2013  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 AuthSourcesController < ApplicationController
                layout 'admin'
                menu_item :ldap_authentication
                before_filter :require_admin
                before_filter :find_auth_source, :only => [:edit, :update, :test_connection, :destroy]
                def index
                  @auth_source_pages, @auth_sources = paginate AuthSource, :per_page => 25
                end
                def new
                  klass_name = params[:type] || 'AuthSourceLdap'
                  @auth_source = AuthSource.new_subclass_instance(klass_name, params[:auth_source])
                  render_404 unless @auth_source
                end
                def create
                  @auth_source = AuthSource.new_subclass_instance(params[:type], params[:auth_source])
                  if @auth_source.save
                    flash[:notice] = l(:notice_successful_create)
                    redirect_to auth_sources_path
                  else
                    render :action => 'new'
                  end
                end
                def edit
                end
                def update
                  if @auth_source.update_attributes(params[:auth_source])
                    flash[:notice] = l(:notice_successful_update)
                    redirect_to auth_sources_path
                  else
                    render :action => 'edit'
                  end
                end
                def test_connection
                  begin
                    @auth_source.test_connection
                    flash[:notice] = l(:notice_successful_connection)
                  rescue Exception => e
                    flash[:error] = l(:error_unable_to_connect, e.message)
                  end
                  redirect_to auth_sources_path
                end
                def destroy
                  unless @auth_source.users.exists?
                    @auth_source.destroy
                    flash[:notice] = l(:notice_successful_delete)
                  end
                  redirect_to auth_sources_path
                end
                def autocomplete_for_new_user
                  results = AuthSource.search(params[:term])
                  render :json => results.map {|result| {
                    'value' => result[:login],
                    'label' => "#{result[:login]} (#{result[:firstname]} #{result[:lastname]})",
                    'login' => result[:login].to_s,
                    'firstname' => result[:firstname].to_s,
                    'lastname' => result[:lastname].to_s,
                    'mail' => result[:mail].to_s,
                    'auth_source_id' => result[:auth_source_id].to_s
                  }}
                end
                private
                def find_auth_source
                  @auth_source = AuthSource.find(params[:id])
                rescue ActiveRecord::RecordNotFound
                  render_404
                end
              end

app/controllers/auto_completes_controller.rb +1 -1

              # Redmine - project management software
-             # Copyright (C) 2006-2012  Jean-Philippe Lang
+             # Copyright (C) 2006-2013  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 AutoCompletesController < ApplicationController
                before_filter :find_project
                def issues
                  @issues = []
                  q = (params[:q] || params[:term]).to_s.strip
                  if q.present?
                    scope = (params[:scope] == "all" || @project.nil? ? Issue : @project.issues).visible
                    if q.match(/^\d+$/)
                      @issues << scope.find_by_id(q.to_i)
                    end
                    @issues += scope.where("LOWER(#{Issue.table_name}.subject) LIKE ?", "%#{q.downcase}%").order("#{Issue.table_name}.id DESC").limit(10).all
                    @issues.compact!
                  end
                  render :layout => false
                end
                private
                def find_project
                  if params[:project_id].present?
                    @project = Project.find(params[:project_id])
                  end
                rescue ActiveRecord::RecordNotFound
                  render_404
                end
              end

app/controllers/boards_controller.rb +1 -1

              # Redmine - project management software
-             # Copyright (C) 2006-2012  Jean-Philippe Lang
+             # Copyright (C) 2006-2013  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 BoardsController < ApplicationController
                default_search_scope :messages
                before_filter :find_project_by_project_id, :find_board_if_available, :authorize
                accept_rss_auth :index, :show
                helper :sort
                include SortHelper
                helper :watchers
                def index
                  @boards = @project.boards.includes(:last_message => :author).all
                  # show the board if there is only one
                  if @boards.size == 1
                    @board = @boards.first
                    show
                  end
                end
                def show
                  respond_to do |format|
                    format.html {
                      sort_init 'updated_on', 'desc'
                      sort_update	'created_on' => "#{Message.table_name}.created_on",
                                  'replies' => "#{Message.table_name}.replies_count",
                                  'updated_on' => "#{Message.table_name}.updated_on"
                      @topic_count = @board.topics.count
                      @topic_pages = Paginator.new @topic_count, per_page_option, params['page']
                      @topics =  @board.topics.
                        reorder("#{Message.table_name}.sticky DESC").
                        includes(:author, {:last_reply => :author}).
                        limit(@topic_pages.items_per_page).
                        offset(@topic_pages.offset).
                        order(sort_clause).
                        all
                      @message = Message.new(:board => @board)
                      render :action => 'show', :layout => !request.xhr?
                    }
                    format.atom {
                      @messages = @board.messages.
                        reorder('created_on DESC').
                        includes(:author, :board).
                        limit(Setting.feeds_limit.to_i).
                        all
                      render_feed(@messages, :title => "#{@project}: #{@board}")
                    }
                  end
                end
                def new
                  @board = @project.boards.build
                  @board.safe_attributes = params[:board]
                end
                def create
                  @board = @project.boards.build
                  @board.safe_attributes = params[:board]
                  if @board.save
                    flash[:notice] = l(:notice_successful_create)
                    redirect_to_settings_in_projects
                  else
                    render :action => 'new'
                  end
                end
                def edit
                end
                def update
                  @board.safe_attributes = params[:board]
                  if @board.save
                    redirect_to_settings_in_projects
                  else
                    render :action => 'edit'
                  end
                end
                def destroy
                  @board.destroy
                  redirect_to_settings_in_projects
                end
              private
                def redirect_to_settings_in_projects
                  redirect_to settings_project_path(@project, :tab => 'boards')
                end
                def find_board_if_available
                  @board = @project.boards.find(params[:id]) if params[:id]
                rescue ActiveRecord::RecordNotFound
                  render_404
                end
              end

app/controllers/calendars_controller.rb +1 -1

              # Redmine - project management software
-             # Copyright (C) 2006-2012  Jean-Philippe Lang
+             # Copyright (C) 2006-2013  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 CalendarsController < ApplicationController
                menu_item :calendar
                before_filter :find_optional_project
                rescue_from Query::StatementInvalid, :with => :query_statement_invalid
                helper :issues
                helper :projects
                helper :queries
                include QueriesHelper
                helper :sort
                include SortHelper
                def show
                  if params[:year] and params[:year].to_i > 1900
                    @year = params[:year].to_i
                    if params[:month] and params[:month].to_i > 0 and params[:month].to_i < 13
                      @month = params[:month].to_i
                    end
                  end
                  @year ||= Date.today.year
                  @month ||= Date.today.month
                  @calendar = Redmine::Helpers::Calendar.new(Date.civil(@year, @month, 1), current_language, :month)
                  retrieve_query
                  @query.group_by = nil
                  if @query.valid?
                    events = []
                    events += @query.issues(:include => [:tracker, :assigned_to, :priority],
                                            :conditions => ["((start_date BETWEEN ? AND ?) OR (due_date BETWEEN ? AND ?))", @calendar.startdt, @calendar.enddt, @calendar.startdt, @calendar.enddt]
                                            )
                    events += @query.versions(:conditions => ["effective_date BETWEEN ? AND ?", @calendar.startdt, @calendar.enddt])
                    @calendar.events = events
                  end
                  render :action => 'show', :layout => false if request.xhr?
                end
              end

app/controllers/comments_controller.rb +1 -1

              # Redmine - project management software
-             # Copyright (C) 2006-2012  Jean-Philippe Lang
+             # Copyright (C) 2006-2013  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 CommentsController < ApplicationController
                default_search_scope :news
                model_object News
                before_filter :find_model_object
                before_filter :find_project_from_association
                before_filter :authorize
                def create
                  raise Unauthorized unless @news.commentable?
                  @comment = Comment.new
                  @comment.safe_attributes = params[:comment]
                  @comment.author = User.current
                  if @news.comments << @comment
                    flash[:notice] = l(:label_comment_added)
                  end
                  redirect_to news_path(@news)
                end
                def destroy
                  @news.comments.find(params[:comment_id]).destroy
                  redirect_to news_path(@news)
                end
                private
                # ApplicationController's find_model_object sets it based on the controller
                # name so it needs to be overriden and set to @news instead
                def find_model_object
                  super
                  @news = @object
                  @comment = nil
                  @news
                end
              end

app/controllers/context_menus_controller.rb +1 -1

              # Redmine - project management software
-             # Copyright (C) 2006-2012  Jean-Philippe Lang
+             # Copyright (C) 2006-2013  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 ContextMenusController < ApplicationController
                helper :watchers
                helper :issues
                def issues
                  @issues = Issue.visible.all(:conditions => {:id => params[:ids]}, :include => :project)
                  if (@issues.size == 1)
                    @issue = @issues.first
                  end
                  @issue_ids = @issues.map(&:id).sort
                  @allowed_statuses = @issues.map(&:new_statuses_allowed_to).reduce(:&)
                  @projects = @issues.collect(&:project).compact.uniq
                  @project = @projects.first if @projects.size == 1
                  @can = {:edit => User.current.allowed_to?(:edit_issues, @projects),
                          :log_time => (@project && User.current.allowed_to?(:log_time, @project)),
                          :update => (User.current.allowed_to?(:edit_issues, @projects) || (User.current.allowed_to?(:change_status, @projects) && !@allowed_statuses.blank?)),
                          :move => (@project && User.current.allowed_to?(:move_issues, @project)),
                          :copy => (@issue && @project.trackers.include?(@issue.tracker) && User.current.allowed_to?(:add_issues, @project)),
                          :delete => User.current.allowed_to?(:delete_issues, @projects)
                          }
                  if @project
                    if @issue
                      @assignables = @issue.assignable_users
                    else
                      @assignables = @project.assignable_users
                    end
                    @trackers = @project.trackers
                  else
                    #when multiple projects, we only keep the intersection of each set
                    @assignables = @projects.map(&:assignable_users).reduce(:&)
                    @trackers = @projects.map(&:trackers).reduce(:&)
                  end
                  @versions = @projects.map {|p| p.shared_versions.open}.reduce(:&)
                  @priorities = IssuePriority.active.reverse
                  @back = back_url
                  @options_by_custom_field = {}
                  if @can[:edit]
                    custom_fields = @issues.map(&:available_custom_fields).reduce(:&).select do |f|
                      %w(bool list user version).include?(f.field_format) && !f.multiple?
                    end
                    custom_fields.each do |field|
                      values = field.possible_values_options(@projects)
                      if values.any?
                        @options_by_custom_field[field] = values
                      end
                    end
                  end
                  @safe_attributes = @issues.map(&:safe_attribute_names).reduce(:&)
                  render :layout => false
                end
                def time_entries
                  @time_entries = TimeEntry.all(
                     :conditions => {:id => params[:ids]}, :include => :project)
                  @projects = @time_entries.collect(&:project).compact.uniq
                  @project = @projects.first if @projects.size == 1
                  @activities = TimeEntryActivity.shared.active
                  @can = {:edit   => User.current.allowed_to?(:edit_time_entries, @projects),
                          :delete => User.current.allowed_to?(:edit_time_entries, @projects)
                          }
                  @back = back_url
                  render :layout => false
                end
              end

app/controllers/custom_fields_controller.rb +1 -1

              # Redmine - project management software
-             # Copyright (C) 2006-2012  Jean-Philippe Lang
+             # Copyright (C) 2006-2013  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 CustomFieldsController < ApplicationController
                layout 'admin'
                before_filter :require_admin
                before_filter :build_new_custom_field, :only => [:new, :create]
                before_filter :find_custom_field, :only => [:edit, :update, :destroy]
                def index
                  @custom_fields_by_type = CustomField.all.group_by {|f| f.class.name }
                  @tab = params[:tab] || 'IssueCustomField'
                end
                def new
                end
                def create
                  if @custom_field.save
                    flash[:notice] = l(:notice_successful_create)
                    call_hook(:controller_custom_fields_new_after_save, :params => params, :custom_field => @custom_field)
                    redirect_to custom_fields_path(:tab => @custom_field.class.name)
                  else
                    render :action => 'new'
                  end
                end
                def edit
                end
                def update
                  if @custom_field.update_attributes(params[:custom_field])
                    flash[:notice] = l(:notice_successful_update)
                    call_hook(:controller_custom_fields_edit_after_save, :params => params, :custom_field => @custom_field)
                    redirect_to custom_fields_path(:tab => @custom_field.class.name)
                  else
                    render :action => 'edit'
                  end
                end
                def destroy
                  begin
                    @custom_field.destroy
                  rescue
                    flash[:error] = l(:error_can_not_delete_custom_field)
                  end
                  redirect_to custom_fields_path(:tab => @custom_field.class.name)
                end
                private
                def build_new_custom_field
                  @custom_field = CustomField.new_subclass_instance(params[:type], params[:custom_field])
                  if @custom_field.nil?
                    render_404
                  end
                end
                def find_custom_field
                  @custom_field = CustomField.find(params[:id])
                rescue ActiveRecord::RecordNotFound
                  render_404
                end
              end

app/controllers/documents_controller.rb +1 -1

              # Redmine - project management software
-             # Copyright (C) 2006-2012  Jean-Philippe Lang
+             # Copyright (C) 2006-2013  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 DocumentsController < ApplicationController
                default_search_scope :documents
                model_object Document
                before_filter :find_project_by_project_id, :only => [:index, :new, :create]
                before_filter :find_model_object, :except => [:index, :new, :create]
                before_filter :find_project_from_association, :except => [:index, :new, :create]
                before_filter :authorize
                helper :attachments
                def index
                  @sort_by = %w(category date title author).include?(params[:sort_by]) ? params[:sort_by] : 'category'
                  documents = @project.documents.includes(:attachments, :category).all
                  case @sort_by
                  when 'date'
                    @grouped = documents.group_by {|d| d.updated_on.to_date }
                  when 'title'
                    @grouped = documents.group_by {|d| d.title.first.upcase}
                  when 'author'
                    @grouped = documents.select{|d| d.attachments.any?}.group_by {|d| d.attachments.last.author}
                  else
                    @grouped = documents.group_by(&:category)
                  end
                  @document = @project.documents.build
                  render :layout => false if request.xhr?
                end
                def show
                  @attachments = @document.attachments.all
                end
                def new
                  @document = @project.documents.build
                  @document.safe_attributes = params[:document]
                end
                def create
                  @document = @project.documents.build
                  @document.safe_attributes = params[:document]
                  @document.save_attachments(params[:attachments])
                  if @document.save
                    render_attachment_warning_if_needed(@document)
                    flash[:notice] = l(:notice_successful_create)
                    redirect_to project_documents_path(@project)
                  else
                    render :action => 'new'
                  end
                end
                def edit
                end
                def update
                  @document.safe_attributes = params[:document]
                  if request.put? and @document.save
                    flash[:notice] = l(:notice_successful_update)
                    redirect_to document_path(@document)
                  else
                    render :action => 'edit'
                  end
                end
                def destroy
                  @document.destroy if request.delete?
                  redirect_to project_documents_path(@project)
                end
                def add_attachment
                  attachments = Attachment.attach_files(@document, params[:attachments])
                  render_attachment_warning_if_needed(@document)
                  if attachments.present? && attachments[:files].present? && Setting.notified_events.include?('document_added')
                    Mailer.attachments_added(attachments[:files]).deliver
                  end
                  redirect_to document_path(@document)
                end
              end

app/controllers/enumerations_controller.rb +1 -1

              # Redmine - project management software
-             # Copyright (C) 2006-2012  Jean-Philippe Lang
+             # Copyright (C) 2006-2013  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 EnumerationsController < ApplicationController
                layout 'admin'
                before_filter :require_admin, :except => :index
                before_filter :require_admin_or_api_request, :only => :index
                before_filter :build_new_enumeration, :only => [:new, :create]
                before_filter :find_enumeration, :only => [:edit, :update, :destroy]
                accept_api_auth :index
                helper :custom_fields
                def index
                  respond_to do |format|
                    format.html
                    format.api {
                      @klass = Enumeration.get_subclass(params[:type])
                      if @klass
                        @enumerations = @klass.shared.sorted.all
                      else
                        render_404
                      end
                    }
                  end
                end
                def new
                end
                def create
                  if request.post? && @enumeration.save
                    flash[:notice] = l(:notice_successful_create)
                    redirect_to enumerations_path
                  else
                    render :action => 'new'
                  end
                end
                def edit
                end
                def update
                  if request.put? && @enumeration.update_attributes(params[:enumeration])
                    flash[:notice] = l(:notice_successful_update)
                    redirect_to enumerations_path
                  else
                    render :action => 'edit'
                  end
                end
                def destroy
                  if !@enumeration.in_use?
                    # No associated objects
                    @enumeration.destroy
                    redirect_to enumerations_path
                    return
                  elsif params[:reassign_to_id]
                    if reassign_to = @enumeration.class.find_by_id(params[:reassign_to_id])
                      @enumeration.destroy(reassign_to)
                      redirect_to enumerations_path
                      return
                    end
                  end
                  @enumerations = @enumeration.class.all - [@enumeration]
                end
                private
                def build_new_enumeration
                  class_name = params[:enumeration] && params[:enumeration][:type] || params[:type]
                  @enumeration = Enumeration.new_subclass_instance(class_name, params[:enumeration])
                  if @enumeration.nil?
                    render_404
                  end
                end
                def find_enumeration
                  @enumeration = Enumeration.find(params[:id])
                rescue ActiveRecord::RecordNotFound
                  render_404
                end
              end

app/controllers/files_controller.rb +1 -1

              # Redmine - project management software
-             # Copyright (C) 2006-2012  Jean-Philippe Lang
+             # Copyright (C) 2006-2013  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 FilesController < ApplicationController
                menu_item :files
                before_filter :find_project_by_project_id
                before_filter :authorize
                helper :sort
                include SortHelper
                def index
                  sort_init 'filename', 'asc'
                  sort_update 'filename' => "#{Attachment.table_name}.filename",
                              'created_on' => "#{Attachment.table_name}.created_on",
                              'size' => "#{Attachment.table_name}.filesize",
                              'downloads' => "#{Attachment.table_name}.downloads"
                  @containers = [ Project.includes(:attachments).reorder(sort_clause).find(@project.id)]
                  @containers += @project.versions.includes(:attachments).reorder(sort_clause).all.sort.reverse
                  render :layout => !request.xhr?
                end
                def new
                  @versions = @project.versions.sort
                end
                def create
                  container = (params[:version_id].blank? ? @project : @project.versions.find_by_id(params[:version_id]))
                  attachments = Attachment.attach_files(container, params[:attachments])
                  render_attachment_warning_if_needed(container)
                  if !attachments.empty? && !attachments[:files].blank? && Setting.notified_events.include?('file_added')
                    Mailer.attachments_added(attachments[:files]).deliver
                  end
                  redirect_to project_files_path(@project)
                end
              end

app/controllers/gantts_controller.rb +1 -1

              # Redmine - project management software
-             # Copyright (C) 2006-2012  Jean-Philippe Lang
+             # Copyright (C) 2006-2013  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 GanttsController < ApplicationController
                menu_item :gantt
                before_filter :find_optional_project
                rescue_from Query::StatementInvalid, :with => :query_statement_invalid
                helper :gantt
                helper :issues
                helper :projects
                helper :queries
                include QueriesHelper
                helper :sort
                include SortHelper
                include Redmine::Export::PDF
                def show
                  @gantt = Redmine::Helpers::Gantt.new(params)
                  @gantt.project = @project
                  retrieve_query
                  @query.group_by = nil
                  @gantt.query = @query if @query.valid?
                  basename = (@project ? "#{@project.identifier}-" : '') + 'gantt'
                  respond_to do |format|
                    format.html { render :action => "show", :layout => !request.xhr? }
                    format.png  { send_data(@gantt.to_image, :disposition => 'inline', :type => 'image/png', :filename => "#{basename}.png") } if @gantt.respond_to?('to_image')
                    format.pdf  { send_data(@gantt.to_pdf, :type => 'application/pdf', :filename => "#{basename}.pdf") }
                  end
                end
              end

app/controllers/groups_controller.rb +1 -1

              # Redmine - project management software
-             # Copyright (C) 2006-2012  Jean-Philippe Lang
+             # Copyright (C) 2006-2013  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 GroupsController < ApplicationController
                layout 'admin'
                before_filter :require_admin
                before_filter :find_group, :except => [:index, :new, :create]
                accept_api_auth :index, :show, :create, :update, :destroy, :add_users, :remove_user
                helper :custom_fields
                def index
                  @groups = Group.sorted.all
                  respond_to do |format|
                    format.html
                    format.api
                  end
                end
                def show
                  respond_to do |format|
                    format.html
                    format.api
                  end
                end
                def new
                  @group = Group.new
                end
                def create
                  @group = Group.new
                  @group.safe_attributes = params[:group]
                  respond_to do |format|
                    if @group.save
                      format.html {
                        flash[:notice] = l(:notice_successful_create)
                        redirect_to(params[:continue] ? new_group_path : groups_path)
                      }
                      format.api  { render :action => 'show', :status => :created, :location => group_url(@group) }
                    else
                      format.html { render :action => "new" }
                      format.api  { render_validation_errors(@group) }
                    end
                  end
                end
                def edit
                end
                def update
                  @group.safe_attributes = params[:group]
                  respond_to do |format|
                    if @group.save
                      flash[:notice] = l(:notice_successful_update)
                      format.html { redirect_to(groups_path) }
                      format.api  { render_api_ok }
                    else
                      format.html { render :action => "edit" }
                      format.api  { render_validation_errors(@group) }
                    end
                  end
                end
                def destroy
                  @group.destroy
                  respond_to do |format|
                    format.html { redirect_to(groups_path) }
                    format.api  { render_api_ok }
                  end
                end
                def add_users
                  @users = User.find_all_by_id(params[:user_id] || params[:user_ids])
                  @group.users << @users if request.post?
                  respond_to do |format|
                    format.html { redirect_to edit_group_path(@group, :tab => 'users') }
                    format.js
                    format.api { render_api_ok }
                  end
                end
                def remove_user
                  @group.users.delete(User.find(params[:user_id])) if request.delete?
                  respond_to do |format|
                    format.html { redirect_to edit_group_path(@group, :tab => 'users') }
                    format.js
                    format.api { render_api_ok }
                  end
                end
                def autocomplete_for_user
                  @users = User.active.not_in_group(@group).like(params[:q]).all(:limit => 100)
                  render :layout => false
                end
                def edit_membership
                  @membership = Member.edit_membership(params[:membership_id], params[:membership], @group)
                  @membership.save if request.post?
                  respond_to do |format|
                    format.html { redirect_to edit_group_path(@group, :tab => 'memberships') }
                    format.js
                  end
                end
                def destroy_membership
                  Member.find(params[:membership_id]).destroy if request.post?
                  respond_to do |format|
                    format.html { redirect_to edit_group_path(@group, :tab => 'memberships') }
                    format.js
                  end
                end
                private
                def find_group
                  @group = Group.find(params[:id])
                rescue ActiveRecord::RecordNotFound
                  render_404
                end
              end

app/controllers/issue_categories_controller.rb +1 -1

              # Redmine - project management software
-             # Copyright (C) 2006-2012  Jean-Philippe Lang
+             # Copyright (C) 2006-2013  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 IssueCategoriesController < ApplicationController
                menu_item :settings
                model_object IssueCategory
                before_filter :find_model_object, :except => [:index, :new, :create]
                before_filter :find_project_from_association, :except => [:index, :new, :create]
                before_filter :find_project_by_project_id, :only => [:index, :new, :create]
                before_filter :authorize
                accept_api_auth :index, :show, :create, :update, :destroy
                def index
                  respond_to do |format|
                    format.html { redirect_to_settings_in_projects }
                    format.api { @categories = @project.issue_categories.all }
                  end
                end
                def show
                  respond_to do |format|
                    format.html { redirect_to_settings_in_projects }
                    format.api
                  end
                end
                def new
                  @category = @project.issue_categories.build
                  @category.safe_attributes = params[:issue_category]
                  respond_to do |format|
                    format.html
                    format.js
                  end
                end
                def create
                  @category = @project.issue_categories.build
                  @category.safe_attributes = params[:issue_category]
                  if @category.save
                    respond_to do |format|
                      format.html do
                        flash[:notice] = l(:notice_successful_create)
                        redirect_to_settings_in_projects
                      end
                      format.js
                      format.api { render :action => 'show', :status => :created, :location => issue_category_path(@category) }
                    end
                  else
                    respond_to do |format|
                      format.html { render :action => 'new'}
                      format.js   { render :action => 'new'}
                      format.api { render_validation_errors(@category) }
                    end
                  end
                end
                def edit
                end
                def update
                  @category.safe_attributes = params[:issue_category]
                  if @category.save
                    respond_to do |format|
                      format.html {
                        flash[:notice] = l(:notice_successful_update)
                        redirect_to_settings_in_projects
                      }
                      format.api { render_api_ok }
                    end
                  else
                    respond_to do |format|
                      format.html { render :action => 'edit' }
                      format.api { render_validation_errors(@category) }
                    end
                  end
                end
                def destroy
                  @issue_count = @category.issues.size
                  if @issue_count == 0 || params[:todo] || api_request?
                    reassign_to = nil
                    if params[:reassign_to_id] && (params[:todo] == 'reassign' || params[:todo].blank?)
                      reassign_to = @project.issue_categories.find_by_id(params[:reassign_to_id])
                    end
                    @category.destroy(reassign_to)
                    respond_to do |format|
                      format.html { redirect_to_settings_in_projects }
                      format.api { render_api_ok }
                    end
                    return
                  end
                  @categories = @project.issue_categories - [@category]
                end
                private
                def redirect_to_settings_in_projects
                  redirect_to settings_project_path(@project, :tab => 'categories')
                end
                # Wrap ApplicationController's find_model_object method to set
                # @category instead of just @issue_category
                def find_model_object
                  super
                  @category = @object
                end
              end

app/controllers/issue_relations_controller.rb +1 -1

              # Redmine - project management software
-             # Copyright (C) 2006-2012  Jean-Philippe Lang
+             # Copyright (C) 2006-2013  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 IssueRelationsController < ApplicationController
                before_filter :find_issue, :find_project_from_association, :authorize, :only => [:index, :create]
                before_filter :find_relation, :except => [:index, :create]
                accept_api_auth :index, :show, :create, :destroy
                def index
                  @relations = @issue.relations
                  respond_to do |format|
                    format.html { render :nothing => true }
                    format.api
                  end
                end
                def show
                  raise Unauthorized unless @relation.visible?
                  respond_to do |format|
                    format.html { render :nothing => true }
                    format.api
                  end
                end
                def create
                  @relation = IssueRelation.new(params[:relation])
                  @relation.issue_from = @issue
                  if params[:relation] && m = params[:relation][:issue_to_id].to_s.strip.match(/^#?(\d+)$/)
                    @relation.issue_to = Issue.visible.find_by_id(m[1].to_i)
                  end
                  saved = @relation.save
                  respond_to do |format|
                    format.html { redirect_to issue_path(@issue) }
                    format.js {
                      @relations = @issue.relations.select {|r| r.other_issue(@issue) && r.other_issue(@issue).visible? }
                    }
                    format.api {
                      if saved
                        render :action => 'show', :status => :created, :location => relation_url(@relation)
                      else
                        render_validation_errors(@relation)
                      end
                    }
                  end
                end
                def destroy
                  raise Unauthorized unless @relation.deletable?
                  @relation.destroy
                  respond_to do |format|
                    format.html { redirect_to issue_path(@relation.issue_from) }
                    format.js
                    format.api  { render_api_ok }
                  end
                end
              private
                def find_issue
                  @issue = @object = Issue.find(params[:issue_id])
                rescue ActiveRecord::RecordNotFound
                  render_404
                end
                def find_relation
                  @relation = IssueRelation.find(params[:id])
                rescue ActiveRecord::RecordNotFound
                  render_404
                end
              end

app/controllers/issue_statuses_controller.rb +1 -1

              # Redmine - project management software
-             # Copyright (C) 2006-2012  Jean-Philippe Lang
+             # Copyright (C) 2006-2013  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 IssueStatusesController < ApplicationController
                layout 'admin'
                before_filter :require_admin, :except => :index
                before_filter :require_admin_or_api_request, :only => :index
                accept_api_auth :index
                def index
                  respond_to do |format|
                    format.html {
                      @issue_status_pages, @issue_statuses = paginate IssueStatus.sorted, :per_page => 25
                      render :action => "index", :layout => false if request.xhr?
                    }
                    format.api {
                      @issue_statuses = IssueStatus.all(:order => 'position')
                    }
                  end
                end
                def new
                  @issue_status = IssueStatus.new
                end
                def create
                  @issue_status = IssueStatus.new(params[:issue_status])
                  if request.post? && @issue_status.save
                    flash[:notice] = l(:notice_successful_create)
                    redirect_to issue_statuses_path
                  else
                    render :action => 'new'
                  end
                end
                def edit
                  @issue_status = IssueStatus.find(params[:id])
                end
                def update
                  @issue_status = IssueStatus.find(params[:id])
                  if request.put? && @issue_status.update_attributes(params[:issue_status])
                    flash[:notice] = l(:notice_successful_update)
                    redirect_to issue_statuses_path
                  else
                    render :action => 'edit'
                  end
                end
                def destroy
                  IssueStatus.find(params[:id]).destroy
                  redirect_to issue_statuses_path
                rescue
                  flash[:error] = l(:error_unable_delete_issue_status)
                  redirect_to issue_statuses_path
                end
                def update_issue_done_ratio
                  if request.post? && IssueStatus.update_issue_done_ratios
                    flash[:notice] = l(:notice_issue_done_ratios_updated)
                  else
                    flash[:error] =  l(:error_issue_done_ratios_not_updated)
                  end
                  redirect_to issue_statuses_path
                end
              end

app/controllers/issues_controller.rb +1 -1

              # Redmine - project management software
-             # Copyright (C) 2006-2012  Jean-Philippe Lang
+             # Copyright (C) 2006-2013  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 IssuesController < ApplicationController
                menu_item :new_issue, :only => [:new, :create]
                default_search_scope :issues
                before_filter :find_issue, :only => [:show, :edit, :update]
                before_filter :find_issues, :only => [:bulk_edit, :bulk_update, :destroy]
                before_filter :find_project, :only => [:new, :create]
                before_filter :authorize, :except => [:index]
                before_filter :find_optional_project, :only => [:index]
                before_filter :check_for_default_issue_status, :only => [:new, :create]
                before_filter :build_new_issue_from_params, :only => [:new, :create]
                accept_rss_auth :index, :show
                accept_api_auth :index, :show, :create, :update, :destroy
                rescue_from Query::StatementInvalid, :with => :query_statement_invalid
                helper :journals
                helper :projects
                include ProjectsHelper
                helper :custom_fields
                include CustomFieldsHelper
                helper :issue_relations
                include IssueRelationsHelper
                helper :watchers
                include WatchersHelper
                helper :attachments
                include AttachmentsHelper
                helper :queries
                include QueriesHelper
                helper :repositories
                include RepositoriesHelper
                helper :sort
                include SortHelper
                include IssuesHelper
                helper :timelog
                include Redmine::Export::PDF
                def index
                  retrieve_query
                  sort_init(@query.sort_criteria.empty? ? [['id', 'desc']] : @query.sort_criteria)
                  sort_update(@query.sortable_columns)
                  @query.sort_criteria = sort_criteria.to_a
                  if @query.valid?
                    case params[:format]
                    when 'csv', 'pdf'
                      @limit = Setting.issues_export_limit.to_i
                    when 'atom'
                      @limit = Setting.feeds_limit.to_i
                    when 'xml', 'json'
                      @offset, @limit = api_offset_and_limit
                    else
                      @limit = per_page_option
                    end
                    @issue_count = @query.issue_count
                    @issue_pages = Paginator.new @issue_count, @limit, params['page']
                    @offset ||= @issue_pages.offset
                    @issues = @query.issues(:include => [:assigned_to, :tracker, :priority, :category, :fixed_version],
                                            :order => sort_clause,
                                            :offset => @offset,
                                            :limit => @limit)
                    @issue_count_by_group = @query.issue_count_by_group
                    respond_to do |format|
                      format.html { render :template => 'issues/index', :layout => !request.xhr? }
                      format.api  {
                        Issue.load_visible_relations(@issues) if include_in_api_response?('relations')
                      }
                      format.atom { render_feed(@issues, :title => "#{@project || Setting.app_title}: #{l(:label_issue_plural)}") }
                      format.csv  { send_data(issues_to_csv(@issues, @project, @query, params), :type => 'text/csv; header=present', :filename => 'export.csv') }
                      format.pdf  { send_data(issues_to_pdf(@issues, @project, @query), :type => 'application/pdf', :filename => 'export.pdf') }
                    end
                  else
                    respond_to do |format|
                      format.html { render(:template => 'issues/index', :layout => !request.xhr?) }
                      format.any(:atom, :csv, :pdf) { render(:nothing => true) }
                      format.api { render_validation_errors(@query) }
                    end
                  end
                rescue ActiveRecord::RecordNotFound
                  render_404
                end
                def show
                  @journals = @issue.journals.includes(:user, :details).reorder("#{Journal.table_name}.id ASC").all
                  @journals.each_with_index {|j,i| j.indice = i+1}
                  @journals.reject!(&:private_notes?) unless User.current.allowed_to?(:view_private_notes, @issue.project)
                  @journals.reverse! if User.current.wants_comments_in_reverse_order?
                  @changesets = @issue.changesets.visible.all
                  @changesets.reverse! if User.current.wants_comments_in_reverse_order?
                  @relations = @issue.relations.select {|r| r.other_issue(@issue) && r.other_issue(@issue).visible? }
                  @allowed_statuses = @issue.new_statuses_allowed_to(User.current)
                  @edit_allowed = User.current.allowed_to?(:edit_issues, @project)
                  @priorities = IssuePriority.active
                  @time_entry = TimeEntry.new(:issue => @issue, :project => @issue.project)
                  respond_to do |format|
                    format.html {
                      retrieve_previous_and_next_issue_ids
                      render :template => 'issues/show'
                    }
                    format.api
                    format.atom { render :template => 'journals/index', :layout => false, :content_type => 'application/atom+xml' }
                    format.pdf  {
                      pdf = issue_to_pdf(@issue, :journals => @journals)
                      send_data(pdf, :type => 'application/pdf', :filename => "#{@project.identifier}-#{@issue.id}.pdf")
                    }
                  end
                end
                # Add a new issue
                # The new issue will be created from an existing one if copy_from parameter is given
                def new
                  respond_to do |format|
                    format.html { render :action => 'new', :layout => !request.xhr? }
                    format.js { render :partial => 'update_form' }
                  end
                end
                def create
                  call_hook(:controller_issues_new_before_save, { :params => params, :issue => @issue })
                  @issue.save_attachments(params[:attachments] || (params[:issue] && params[:issue][:uploads]))
                  if @issue.save
                    call_hook(:controller_issues_new_after_save, { :params => params, :issue => @issue})
                    respond_to do |format|
                      format.html {
                        render_attachment_warning_if_needed(@issue)
                        flash[:notice] = l(:notice_issue_successful_create, :id => view_context.link_to("##{@issue.id}", issue_path(@issue), :title => @issue.subject))
                        if params[:continue]
                          attrs = {:tracker_id => @issue.tracker, :parent_issue_id => @issue.parent_issue_id}.reject {|k,v| v.nil?}
                          redirect_to new_project_issue_path(@issue.project, :issue => attrs)
                        else
                          redirect_to issue_path(@issue)
                        end
                      }
                      format.api  { render :action => 'show', :status => :created, :location => issue_url(@issue) }
                    end
                    return
                  else
                    respond_to do |format|
                      format.html { render :action => 'new' }
                      format.api  { render_validation_errors(@issue) }
                    end
                  end
                end
                def edit
                  return unless update_issue_from_params
                  respond_to do |format|
                    format.html { }
                    format.xml  { }
                  end
                end
                def update
                  return unless update_issue_from_params
                  @issue.save_attachments(params[:attachments] || (params[:issue] && params[:issue][:uploads]))
                  saved = false
                  begin
                    saved = @issue.save_issue_with_child_records(params, @time_entry)
                  rescue ActiveRecord::StaleObjectError
                    @conflict = true
                    if params[:last_journal_id]
                      @conflict_journals = @issue.journals_after(params[:last_journal_id]).all
                      @conflict_journals.reject!(&:private_notes?) unless User.current.allowed_to?(:view_private_notes, @issue.project)
                    end
                  end
                  if saved
                    render_attachment_warning_if_needed(@issue)
                    flash[:notice] = l(:notice_successful_update) unless @issue.current_journal.new_record?
                    respond_to do |format|
                      format.html { redirect_back_or_default issue_path(@issue) }
                      format.api  { render_api_ok }
                    end
                  else
                    respond_to do |format|
                      format.html { render :action => 'edit' }
                      format.api  { render_validation_errors(@issue) }
                    end
                  end
                end
                # Bulk edit/copy a set of issues
                def bulk_edit
                  @issues.sort!
                  @copy = params[:copy].present?
                  @notes = params[:notes]
                  if User.current.allowed_to?(:move_issues, @projects)
                    @allowed_projects = Issue.allowed_target_projects_on_move
                    if params[:issue]
                      @target_project = @allowed_projects.detect {|p| p.id.to_s == params[:issue][:project_id].to_s}
                      if @target_project
                        target_projects = [@target_project]
                      end
                    end
                  end
                  target_projects ||= @projects
                  if @copy
                    @available_statuses = [IssueStatus.default]
                  else
                    @available_statuses = @issues.map(&:new_statuses_allowed_to).reduce(:&)
                  end
                  @custom_fields = target_projects.map{|p|p.all_issue_custom_fields}.reduce(:&)
                  @assignables = target_projects.map(&:assignable_users).reduce(:&)
                  @trackers = target_projects.map(&:trackers).reduce(:&)
                  @versions = target_projects.map {|p| p.shared_versions.open}.reduce(:&)
                  @categories = target_projects.map {|p| p.issue_categories}.reduce(:&)
                  if @copy
                    @attachments_present = @issues.detect {|i| i.attachments.any?}.present?
                    @subtasks_present = @issues.detect {|i| !i.leaf?}.present?
                  end
                  @safe_attributes = @issues.map(&:safe_attribute_names).reduce(:&)
                  render :layout => false if request.xhr?
                end
                def bulk_update
                  @issues.sort!
                  @copy = params[:copy].present?
                  attributes = parse_params_for_bulk_issue_attributes(params)
                  unsaved_issue_ids = []
                  moved_issues = []
                  if @copy && params[:copy_subtasks].present?
                    # Descendant issues will be copied with the parent task
                    # Don't copy them twice
                    @issues.reject! {|issue| @issues.detect {|other| issue.is_descendant_of?(other)}}
                  end
                  @issues.each do |issue|
                    issue.reload
                    if @copy
                      issue = issue.copy({},
                        :attachments => params[:copy_attachments].present?,
                        :subtasks => params[:copy_subtasks].present?
                      )
                    end
                    journal = issue.init_journal(User.current, params[:notes])
                    issue.safe_attributes = attributes
                    call_hook(:controller_issues_bulk_edit_before_save, { :params => params, :issue => issue })
                    if issue.save
                      moved_issues << issue
                    else
                      # Keep unsaved issue ids to display them in flash error
                      unsaved_issue_ids << issue.id
                    end
                  end
                  set_flash_from_bulk_issue_save(@issues, unsaved_issue_ids)
                  if params[:follow]
                    if @issues.size == 1 && moved_issues.size == 1
                      redirect_to issue_path(moved_issues.first)
                    elsif moved_issues.map(&:project).uniq.size == 1
                      redirect_to project_issues_path(moved_issues.map(&:project).first)
                    end
                  else
                    redirect_back_or_default _project_issues_path(@project)
                  end
                end
                def destroy
                  @hours = TimeEntry.sum(:hours, :conditions => ['issue_id IN (?)', @issues]).to_f
                  if @hours > 0
                    case params[:todo]
                    when 'destroy'
                      # nothing to do
                    when 'nullify'
                      TimeEntry.update_all('issue_id = NULL', ['issue_id IN (?)', @issues])
                    when 'reassign'
                      reassign_to = @project.issues.find_by_id(params[:reassign_to_id])
                      if reassign_to.nil?
                        flash.now[:error] = l(:error_issue_not_found_in_project)
                        return
                      else
                        TimeEntry.update_all("issue_id = #{reassign_to.id}", ['issue_id IN (?)', @issues])
                      end
                    else
                      # display the destroy form if it's a user request
                      return unless api_request?
                    end
                  end
                  @issues.each do |issue|
                    begin
                      issue.reload.destroy
                    rescue ::ActiveRecord::RecordNotFound # raised by #reload if issue no longer exists
                      # nothing to do, issue was already deleted (eg. by a parent)
                    end
                  end
                  respond_to do |format|
                    format.html { redirect_back_or_default _project_issues_path(@project) }
                    format.api  { render_api_ok }
                  end
                end
                private
                def find_project
                  project_id = params[:project_id] || (params[:issue] && params[:issue][:project_id])
                  @project = Project.find(project_id)
                rescue ActiveRecord::RecordNotFound
                  render_404
                end
                def retrieve_previous_and_next_issue_ids
                  retrieve_query_from_session
                  if @query
                    sort_init(@query.sort_criteria.empty? ? [['id', 'desc']] : @query.sort_criteria)
                    sort_update(@query.sortable_columns, 'issues_index_sort')
                    limit = 500
                    issue_ids = @query.issue_ids(:order => sort_clause, :limit => (limit + 1), :include => [:assigned_to, :tracker, :priority, :category, :fixed_version])
                    if (idx = issue_ids.index(@issue.id)) && idx < limit
                      if issue_ids.size < 500
                        @issue_position = idx + 1
                        @issue_count = issue_ids.size
                      end
                      @prev_issue_id = issue_ids[idx - 1] if idx > 0
                      @next_issue_id = issue_ids[idx + 1] if idx < (issue_ids.size - 1)
                    end
                  end
                end
                # Used by #edit and #update to set some common instance variables
                # from the params
                # TODO: Refactor, not everything in here is needed by #edit
                def update_issue_from_params
                  @edit_allowed = User.current.allowed_to?(:edit_issues, @project)
                  @time_entry = TimeEntry.new(:issue => @issue, :project => @issue.project)
                  @time_entry.attributes = params[:time_entry]
                  @issue.init_journal(User.current)
                  issue_attributes = params[:issue]
                  if issue_attributes && params[:conflict_resolution]
                    case params[:conflict_resolution]
                    when 'overwrite'
                      issue_attributes = issue_attributes.dup
                      issue_attributes.delete(:lock_version)
                    when 'add_notes'
                      issue_attributes = issue_attributes.slice(:notes)
                    when 'cancel'
                      redirect_to issue_path(@issue)
                      return false
                    end
                  end
                  @issue.safe_attributes = issue_attributes
                  @priorities = IssuePriority.active
                  @allowed_statuses = @issue.new_statuses_allowed_to(User.current)
                  true
                end
                # TODO: Refactor, lots of extra code in here
                # TODO: Changing tracker on an existing issue should not trigger this
                def build_new_issue_from_params
                  if params[:id].blank?
                    @issue = Issue.new
                    if params[:copy_from]
                      begin
                        @copy_from = Issue.visible.find(params[:copy_from])
                        @copy_attachments = params[:copy_attachments].present? || request.get?
                        @copy_subtasks = params[:copy_subtasks].present? || request.get?
                        @issue.copy_from(@copy_from, :attachments => @copy_attachments, :subtasks => @copy_subtasks)
                      rescue ActiveRecord::RecordNotFound
                        render_404
                        return
                      end
                    end
                    @issue.project = @project
                  else
                    @issue = @project.issues.visible.find(params[:id])
                  end
                  @issue.project = @project
                  @issue.author ||= User.current
                  # Tracker must be set before custom field values
                  @issue.tracker ||= @project.trackers.find((params[:issue] && params[:issue][:tracker_id]) || params[:tracker_id] || :first)
                  if @issue.tracker.nil?
                    render_error l(:error_no_tracker_in_project)
                    return false
                  end
                  @issue.start_date ||= Date.today if Setting.default_issue_start_date_to_creation_date?
                  @issue.safe_attributes = params[:issue]
                  @priorities = IssuePriority.active
                  @allowed_statuses = @issue.new_statuses_allowed_to(User.current, true)
                  @available_watchers = (@issue.project.users.sort + @issue.watcher_users).uniq
                end
                def check_for_default_issue_status
                  if IssueStatus.default.nil?
                    render_error l(:error_no_default_issue_status)
                    return false
                  end
                end
                def parse_params_for_bulk_issue_attributes(params)
                  attributes = (params[:issue] || {}).reject {|k,v| v.blank?}
                  attributes.keys.each {|k| attributes[k] = '' if attributes[k] == 'none'}
                  if custom = attributes[:custom_field_values]
                    custom.reject! {|k,v| v.blank?}
                    custom.keys.each do |k|
                      if custom[k].is_a?(Array)
                        custom[k] << '' if custom[k].delete('__none__')
                      else
                        custom[k] = '' if custom[k] == '__none__'
                      end
                    end
                  end
                  attributes
                end
              end

app/controllers/journals_controller.rb +1 -1

              # Redmine - project management software
-             # Copyright (C) 2006-2012  Jean-Philippe Lang
+             # Copyright (C) 2006-2013  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 JournalsController < ApplicationController
                before_filter :find_journal, :only => [:edit, :diff]
                before_filter :find_issue, :only => [:new]
                before_filter :find_optional_project, :only => [:index]
                before_filter :authorize, :only => [:new, :edit, :diff]
                accept_rss_auth :index
                menu_item :issues
                helper :issues
                helper :custom_fields
                helper :queries
                include QueriesHelper
                helper :sort
                include SortHelper
                def index
                  retrieve_query
                  sort_init 'id', 'desc'
                  sort_update(@query.sortable_columns)
                  if @query.valid?
                    @journals = @query.journals(:order => "#{Journal.table_name}.created_on DESC",
                                                :limit => 25)
                  end
                  @title = (@project ? @project.name : Setting.app_title) + ": " + (@query.new_record? ? l(:label_changes_details) : @query.name)
                  render :layout => false, :content_type => 'application/atom+xml'
                rescue ActiveRecord::RecordNotFound
                  render_404
                end
                def diff
                  @issue = @journal.issue
                  if params[:detail_id].present?
                    @detail = @journal.details.find_by_id(params[:detail_id])
                  else
                    @detail = @journal.details.detect {|d| d.prop_key == 'description'}
                  end
                  (render_404; return false) unless @issue && @detail
                  @diff = Redmine::Helpers::Diff.new(@detail.value, @detail.old_value)
                end
                def new
                  @journal = Journal.visible.find(params[:journal_id]) if params[:journal_id]
                  if @journal
                    user = @journal.user
                    text = @journal.notes
                  else
                    user = @issue.author
                    text = @issue.description
                  end
                  # Replaces pre blocks with [...]
                  text = text.to_s.strip.gsub(%r{<pre>((.|\s)*?)</pre>}m, '[...]')
                  @content = "#{ll(Setting.default_language, :text_user_wrote, user)}\n> "
                  @content << text.gsub(/(\r?\n|\r\n?)/, "\n> ") + "\n\n"
                rescue ActiveRecord::RecordNotFound
                  render_404
                end
                def edit
                  (render_403; return false) unless @journal.editable_by?(User.current)
                  if request.post?
                    @journal.update_attributes(:notes => params[:notes]) if params[:notes]
                    @journal.destroy if @journal.details.empty? && @journal.notes.blank?
                    call_hook(:controller_journals_edit_post, { :journal => @journal, :params => params})
                    respond_to do |format|
                      format.html { redirect_to issue_path(@journal.journalized) }
                      format.js { render :action => 'update' }
                    end
                  else
                    respond_to do |format|
                      format.html {
                        # TODO: implement non-JS journal update
                        render :nothing => true
                      }
                      format.js
                    end
                  end
                end
                private
                def find_journal
                  @journal = Journal.visible.find(params[:id])
                  @project = @journal.journalized.project
                rescue ActiveRecord::RecordNotFound
                  render_404
                end
              end

app/controllers/mail_handler_controller.rb +1 -1

              # Redmine - project management software
-             # Copyright (C) 2006-2012  Jean-Philippe Lang
+             # Copyright (C) 2006-2013  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 MailHandlerController < ActionController::Base
                before_filter :check_credential
                # Submits an incoming email to MailHandler
                def index
                  options = params.dup
                  email = options.delete(:email)
                  if MailHandler.receive(email, options)
                    render :nothing => true, :status => :created
                  else
                    render :nothing => true, :status => :unprocessable_entity
                  end
                end
                private
                def check_credential
                  User.current = nil
                  unless Setting.mail_handler_api_enabled? && params[:key].to_s == Setting.mail_handler_api_key
                    render :text => 'Access denied. Incoming emails WS is disabled or key is invalid.', :status => 403
                  end
                end
              end

app/controllers/members_controller.rb +1 -1

              # Redmine - project management software
-             # Copyright (C) 2006-2012  Jean-Philippe Lang
+             # Copyright (C) 2006-2013  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 MembersController < ApplicationController
                model_object Member
                before_filter :find_model_object, :except => [:index, :create, :autocomplete]
                before_filter :find_project_from_association, :except => [:index, :create, :autocomplete]
                before_filter :find_project_by_project_id, :only => [:index, :create, :autocomplete]
                before_filter :authorize
                accept_api_auth :index, :show, :create, :update, :destroy
                def index
                  @offset, @limit = api_offset_and_limit
                  @member_count = @project.member_principals.count
                  @member_pages = Paginator.new @member_count, @limit, params['page']
                  @offset ||= @member_pages.offset
                  @members =  @project.member_principals.all(
                    :order => "#{Member.table_name}.id",
                    :limit  =>  @limit,
                    :offset =>  @offset
                  )
                  respond_to do |format|
                    format.html { head 406 }
                    format.api
                  end
                end
                def show
                  respond_to do |format|
                    format.html { head 406 }
                    format.api
                  end
                end
                def create
                  members = []
                  if params[:membership]
                    if params[:membership][:user_ids]
                      attrs = params[:membership].dup
                      user_ids = attrs.delete(:user_ids)
                      user_ids.each do |user_id|
                        members << Member.new(:role_ids => params[:membership][:role_ids], :user_id => user_id)
                      end
                    else
                      members << Member.new(:role_ids => params[:membership][:role_ids], :user_id => params[:membership][:user_id])
                    end
                    @project.members << members
                  end
                  respond_to do |format|
                    format.html { redirect_to_settings_in_projects }
                    format.js { @members = members }
                    format.api {
                      @member = members.first
                      if @member.valid?
                        render :action => 'show', :status => :created, :location => membership_url(@member)
                      else
                        render_validation_errors(@member)
                      end
                    }
                  end
                end
                def update
                  if params[:membership]
                    @member.role_ids = params[:membership][:role_ids]
                  end
                  saved = @member.save
                  respond_to do |format|
                    format.html { redirect_to_settings_in_projects }
                    format.js
                    format.api {
                      if saved
                        render_api_ok
                      else
                        render_validation_errors(@member)
                      end
                    }
                  end
                end
                def destroy
                  if request.delete? && @member.deletable?
                    @member.destroy
                  end
                  respond_to do |format|
                    format.html { redirect_to_settings_in_projects }
                    format.js
                    format.api {
                      if @member.destroyed?
                        render_api_ok
                      else
                        head :unprocessable_entity
                      end
                    }
                  end
                end
                def autocomplete
                  @principals = Principal.active.not_member_of(@project).like(params[:q]).all(:limit => 100)
                  render :layout => false
                end
                private
                def redirect_to_settings_in_projects
                  redirect_to settings_project_path(@project, :tab => 'members')
                end
              end

app/controllers/messages_controller.rb +1 -1

              # Redmine - project management software
-             # Copyright (C) 2006-2012  Jean-Philippe Lang
+             # Copyright (C) 2006-2013  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_attachments, :only => [:preview]
                before_filter :find_message, :except => [:new, :preview]
                before_filter :authorize, :except => [:preview, :edit, :destroy]
                helper :boards
                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 @reply_count, REPLIES_PER_PAGE, page
                  @replies =  @topic.children.
                    includes(:author, :attachments, {:board => :project}).
                    reorder("#{Message.table_name}.created_on ASC").
                    limit(@reply_pages.items_per_page).
                    offset(@reply_pages.offset).
                    all
                  @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 board_message_path(@board, @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 board_message_path(@board, @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 board_message_path(@message.board, @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
                  if @message.parent
                    redirect_to board_message_path(@board, @message.parent, :r => r)
                  else
                    redirect_to project_board_path(@project, @board)
                  end
                end
                def quote
                  @subject = @message.subject
                  @subject = "RE: #{@subject}" unless @subject.starts_with?('RE:')
                  @content = "#{ll(Setting.default_language, :text_user_wrote, @message.author)}\n> "
                  @content << @message.content.to_s.strip.gsub(%r{<pre>((.|\s)*?)</pre>}m, '[...]').gsub(/(\r?\n|\r\n?)/, "\n> ") + "\n\n"
                end
                def preview
                  message = @board.messages.find_by_id(params[:id])
                  @text = (params[:message] || params[:reply])[:content]
                  @previewed = message
                  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/my_controller.rb +1 -1

              # Redmine - project management software
-             # Copyright (C) 2006-2012  Jean-Philippe Lang
+             # Copyright (C) 2006-2013  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 MyController < ApplicationController
                before_filter :require_login
                helper :issues
                helper :users
                helper :custom_fields
                BLOCKS = { 'issuesassignedtome' => :label_assigned_to_me_issues,
                           'issuesreportedbyme' => :label_reported_issues,
                           'issueswatched' => :label_watched_issues,
                           'news' => :label_news_latest,
                           'calendar' => :label_calendar,
                           'documents' => :label_document_plural,
                           'timelog' => :label_spent_time
                         }.merge(Redmine::Views::MyPage::Block.additional_blocks).freeze
                DEFAULT_LAYOUT = {  'left' => ['issuesassignedtome'],
                                    'right' => ['issuesreportedbyme']
                                 }.freeze
                def index
                  page
                  render :action => 'page'
                end
                # Show user's page
                def page
                  @user = User.current
                  @blocks = @user.pref[:my_page_layout] || DEFAULT_LAYOUT
                end
                # Edit user's account
                def account
                  @user = User.current
                  @pref = @user.pref
                  if request.post?
                    @user.safe_attributes = params[:user]
                    @user.pref.attributes = params[:pref]
                    @user.pref[:no_self_notified] = (params[:no_self_notified] == '1')
                    if @user.save
                      @user.pref.save
                      @user.notified_project_ids = (@user.mail_notification == 'selected' ? params[:notified_project_ids] : [])
                      set_language_if_valid @user.language
                      flash[:notice] = l(:notice_account_updated)
                      redirect_to my_account_path
                      return
                    end
                  end
                end
                # Destroys user's account
                def destroy
                  @user = User.current
                  unless @user.own_account_deletable?
                    redirect_to my_account_path
                    return
                  end
                  if request.post? && params[:confirm]
                    @user.destroy
                    if @user.destroyed?
                      logout_user
                      flash[:notice] = l(:notice_account_deleted)
                    end
                    redirect_to home_path
                  end
                end
                # Manage user's password
                def password
                  @user = User.current
                  unless @user.change_password_allowed?
                    flash[:error] = l(:notice_can_t_change_password)
                    redirect_to my_account_path
                    return
                  end
                  if request.post?
                    if @user.check_password?(params[:password])
                      @user.password, @user.password_confirmation = params[:new_password], params[:new_password_confirmation]
                      if @user.save
                        flash[:notice] = l(:notice_account_password_updated)
                        redirect_to my_account_path
                      end
                    else
                      flash[:error] = l(:notice_account_wrong_password)
                    end
                  end
                end
                # Create a new feeds key
                def reset_rss_key
                  if request.post?
                    if User.current.rss_token
                      User.current.rss_token.destroy
                      User.current.reload
                    end
                    User.current.rss_key
                    flash[:notice] = l(:notice_feeds_access_key_reseted)
                  end
                  redirect_to my_account_path
                end
                # Create a new API key
                def reset_api_key
                  if request.post?
                    if User.current.api_token
                      User.current.api_token.destroy
                      User.current.reload
                    end
                    User.current.api_key
                    flash[:notice] = l(:notice_api_access_key_reseted)
                  end
                  redirect_to my_account_path
                end
                # User's page layout configuration
                def page_layout
                  @user = User.current
                  @blocks = @user.pref[:my_page_layout] || DEFAULT_LAYOUT.dup
                  @block_options = []
                  BLOCKS.each do |k, v|
                    unless %w(top left right).detect {|f| (@blocks[f] ||= []).include?(k)}
                      @block_options << [l("my.blocks.#{v}", :default => [v, v.to_s.humanize]), k.dasherize]
                    end
                  end
                end
                # Add a block to user's page
                # The block is added on top of the page
                # params[:block] : id of the block to add
                def add_block
                  block = params[:block].to_s.underscore
                  (render :nothing => true; return) unless block && (BLOCKS.keys.include? block)
                  @user = User.current
                  layout = @user.pref[:my_page_layout] || {}
                  # remove if already present in a group
                  %w(top left right).each {|f| (layout[f] ||= []).delete block }
                  # add it on top
                  layout['top'].unshift block
                  @user.pref[:my_page_layout] = layout
                  @user.pref.save
                  redirect_to my_page_layout_path
                end
                # Remove a block to user's page
                # params[:block] : id of the block to remove
                def remove_block
                  block = params[:block].to_s.underscore
                  @user = User.current
                  # remove block in all groups
                  layout = @user.pref[:my_page_layout] || {}
                  %w(top left right).each {|f| (layout[f] ||= []).delete block }
                  @user.pref[:my_page_layout] = layout
                  @user.pref.save
                  redirect_to my_page_layout_path
                end
                # Change blocks order on user's page
                # params[:group] : group to order (top, left or right)
                # params[:list-(top|left|right)] : array of block ids of the group
                def order_blocks
                  group = params[:group]
                  @user = User.current
                  if group.is_a?(String)
                    group_items = (params["blocks"] || []).collect(&:underscore)
                    group_items.each {|s| s.sub!(/^block_/, '')}
                    if group_items and group_items.is_a? Array
                      layout = @user.pref[:my_page_layout] || {}
                      # remove group blocks if they are presents in other groups
                      %w(top left right).each {|f|
                        layout[f] = (layout[f] || []) - group_items
                      }
                      layout[group] = group_items
                      @user.pref[:my_page_layout] = layout
                      @user.pref.save
                    end
                  end
                  render :nothing => true
                end
              end

app/controllers/news_controller.rb +1 -1

              # Redmine - project management software
-             # Copyright (C) 2006-2012  Jean-Philippe Lang
+             # Copyright (C) 2006-2013  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 NewsController < ApplicationController
                default_search_scope :news
                model_object News
                before_filter :find_model_object, :except => [:new, :create, :index]
                before_filter :find_project_from_association, :except => [:new, :create, :index]
                before_filter :find_project_by_project_id, :only => [:new, :create]
                before_filter :authorize, :except => [:index]
                before_filter :find_optional_project, :only => :index
                accept_rss_auth :index
                accept_api_auth :index
                helper :watchers
                helper :attachments
                def index
                  case params[:format]
                  when 'xml', 'json'
                    @offset, @limit = api_offset_and_limit
                  else
                    @limit =  10
                  end
                  scope = @project ? @project.news.visible : News.visible
                  @news_count = scope.count
                  @news_pages = Paginator.new @news_count, @limit, params['page']
                  @offset ||= @news_pages.offset
                  @newss = scope.all(:include => [:author, :project],
                                                     :order => "#{News.table_name}.created_on DESC",
                                                     :offset => @offset,
                                                     :limit => @limit)
                  respond_to do |format|
                    format.html {
                      @news = News.new # for adding news inline
                      render :layout => false if request.xhr?
                    }
                    format.api
                    format.atom { render_feed(@newss, :title => (@project ? @project.name : Setting.app_title) + ": #{l(:label_news_plural)}") }
                  end
                end
                def show
                  @comments = @news.comments
                  @comments.reverse! if User.current.wants_comments_in_reverse_order?
                end
                def new
                  @news = News.new(:project => @project, :author => User.current)
                end
                def create
                  @news = News.new(:project => @project, :author => User.current)
                  @news.safe_attributes = params[:news]
                  @news.save_attachments(params[:attachments])
                  if @news.save
                    render_attachment_warning_if_needed(@news)
                    flash[:notice] = l(:notice_successful_create)
                    redirect_to project_news_index_path(@project)
                  else
                    render :action => 'new'
                  end
                end
                def edit
                end
                def update
                  @news.safe_attributes = params[:news]
                  @news.save_attachments(params[:attachments])
                  if @news.save
                    render_attachment_warning_if_needed(@news)
                    flash[:notice] = l(:notice_successful_update)
                    redirect_to news_path(@news)
                  else
                    render :action => 'edit'
                  end
                end
                def destroy
                  @news.destroy
                  redirect_to project_news_index_path(@project)
                end
                private
                def find_optional_project
                  return true unless params[:project_id]
                  @project = Project.find(params[:project_id])
                  authorize
                rescue ActiveRecord::RecordNotFound
                  render_404
                end
              end

app/controllers/previews_controller.rb +1 -1

              # Redmine - project management software
-             # Copyright (C) 2006-2012  Jean-Philippe Lang
+             # Copyright (C) 2006-2013  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 PreviewsController < ApplicationController
                before_filter :find_project, :find_attachments
                def issue
                  @issue = @project.issues.find_by_id(params[:id]) unless params[:id].blank?
                  if @issue
                    @description = params[:issue] && params[:issue][:description]
                    if @description && @description.gsub(/(\r?\n|\n\r?)/, "\n") == @issue.description.to_s.gsub(/(\r?\n|\n\r?)/, "\n")
                      @description = nil
                    end
                    # params[:notes] is useful for preview of notes in issue history
                    @notes = params[:notes] || (params[:issue] ? params[:issue][:notes] : nil)
                  else
                    @description = (params[:issue] ? params[:issue][:description] : nil)
                  end
                  render :layout => false
                end
                def news
                  if params[:id].present? && news = News.visible.find_by_id(params[:id])
                    @previewed = news
                  end
                  @text = (params[:news] ? params[:news][:description] : nil)
                  render :partial => 'common/preview'
                end
                private
                def find_project
                  project_id = (params[:issue] && params[:issue][:project_id]) || params[:project_id]
                  @project = Project.find(project_id)
                rescue ActiveRecord::RecordNotFound
                  render_404
                end
              end

app/controllers/project_enumerations_controller.rb +1 -1

              # Redmine - project management software
-             # Copyright (C) 2006-2012  Jean-Philippe Lang
+             # Copyright (C) 2006-2013  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 ProjectEnumerationsController < ApplicationController
                before_filter :find_project_by_project_id
                before_filter :authorize
                def update
                  if request.put? && params[:enumerations]
                    Project.transaction do
                      params[:enumerations].each do |id, activity|
                        @project.update_or_create_time_entry_activity(id, activity)
                      end
                    end
                    flash[:notice] = l(:notice_successful_update)
                  end
                  redirect_to settings_project_path(@project, :tab => 'activities')
                end
                def destroy
                  @project.time_entry_activities.each do |time_entry_activity|
                    time_entry_activity.destroy(time_entry_activity.parent)
                  end
                  flash[:notice] = l(:notice_successful_update)
                  redirect_to settings_project_path(@project, :tab => 'activities')
                end
              end

app/controllers/projects_controller.rb +1 -1

              # Redmine - project management software
-             # Copyright (C) 2006-2012  Jean-Philippe Lang
+             # Copyright (C) 2006-2013  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 ProjectsController < ApplicationController
                menu_item :overview
                menu_item :roadmap, :only => :roadmap
                menu_item :settings, :only => :settings
                before_filter :find_project, :except => [ :index, :list, :new, :create, :copy ]
                before_filter :authorize, :except => [ :index, :list, :new, :create, :copy, :archive, :unarchive, :destroy]
                before_filter :authorize_global, :only => [:new, :create]
                before_filter :require_admin, :only => [ :copy, :archive, :unarchive, :destroy ]
                accept_rss_auth :index
                accept_api_auth :index, :show, :create, :update, :destroy
                after_filter :only => [:create, :edit, :update, :archive, :unarchive, :destroy] do |controller|
                  if controller.request.post?
                    controller.send :expire_action, :controller => 'welcome', :action => 'robots'
                  end
                end
                helper :sort
                include SortHelper
                helper :custom_fields
                include CustomFieldsHelper
                helper :issues
                helper :queries
                include QueriesHelper
                helper :repositories
                include RepositoriesHelper
                include ProjectsHelper
                # Lists visible projects
                def index
                  respond_to do |format|
                    format.html {
                      scope = Project
                      unless params[:closed]
                        scope = scope.active
                      end
                      @projects = scope.visible.order('lft').all
                    }
                    format.api  {
                      @offset, @limit = api_offset_and_limit
                      @project_count = Project.visible.count
                      @projects = Project.visible.offset(@offset).limit(@limit).order('lft').all
                    }
                    format.atom {
                      projects = Project.visible.order('created_on DESC').limit(Setting.feeds_limit.to_i).all
                      render_feed(projects, :title => "#{Setting.app_title}: #{l(:label_project_latest)}")
                    }
                  end
                end
                def new
                  @issue_custom_fields = IssueCustomField.sorted.all
                  @trackers = Tracker.sorted.all
                  @project = Project.new
                  @project.safe_attributes = params[:project]
                end
                def create
                  @issue_custom_fields = IssueCustomField.sorted.all
                  @trackers = Tracker.sorted.all
                  @project = Project.new
                  @project.safe_attributes = params[:project]
                  if validate_parent_id && @project.save
                    @project.set_allowed_parent!(params[:project]['parent_id']) if params[:project].has_key?('parent_id')
                    # Add current user as a project member if he is not admin
                    unless User.current.admin?
                      r = Role.givable.find_by_id(Setting.new_project_user_role_id.to_i) || Role.givable.first
                      m = Member.new(:user => User.current, :roles => [r])
                      @project.members << m
                    end
                    respond_to do |format|
                      format.html {
                        flash[:notice] = l(:notice_successful_create)
                        if params[:continue]
                          attrs = {:parent_id => @project.parent_id}.reject {|k,v| v.nil?}
                          redirect_to new_project_path(attrs)
                        else
                          redirect_to settings_project_path(@project)
                        end
                      }
                      format.api  { render :action => 'show', :status => :created, :location => url_for(:controller => 'projects', :action => 'show', :id => @project.id) }
                    end
                  else
                    respond_to do |format|
                      format.html { render :action => 'new' }
                      format.api  { render_validation_errors(@project) }
                    end
                  end
                end
                def copy
                  @issue_custom_fields = IssueCustomField.sorted.all
                  @trackers = Tracker.sorted.all
                  @source_project = Project.find(params[:id])
                  if request.get?
                    @project = Project.copy_from(@source_project)
                    @project.identifier = Project.next_identifier if Setting.sequential_project_identifiers?
                  else
                    Mailer.with_deliveries(params[:notifications] == '1') do
                      @project = Project.new
                      @project.safe_attributes = params[:project]
                      if validate_parent_id && @project.copy(@source_project, :only => params[:only])
                        @project.set_allowed_parent!(params[:project]['parent_id']) if params[:project].has_key?('parent_id')
                        flash[:notice] = l(:notice_successful_create)
                        redirect_to settings_project_path(@project)
                      elsif !@project.new_record?
                        # Project was created
                        # But some objects were not copied due to validation failures
                        # (eg. issues from disabled trackers)
                        # TODO: inform about that
                        redirect_to settings_project_path(@project)
                      end
                    end
                  end
                rescue ActiveRecord::RecordNotFound
                  # source_project not found
                  render_404
                end
                # Show @project
                def show
                  if params[:jump]
                    # try to redirect to the requested menu item
                    redirect_to_project_menu_item(@project, params[:jump]) && return
                  end
                  @users_by_role = @project.users_by_role
                  @subprojects = @project.children.visible.all
                  @news = @project.news.limit(5).includes(:author, :project).reorder("#{News.table_name}.created_on DESC").all
                  @trackers = @project.rolled_up_trackers
                  cond = @project.project_condition(Setting.display_subprojects_issues?)
                  @open_issues_by_tracker = Issue.visible.open.where(cond).count(:group => :tracker)
                  @total_issues_by_tracker = Issue.visible.where(cond).count(:group => :tracker)
                  if User.current.allowed_to?(:view_time_entries, @project)
                    @total_hours = TimeEntry.visible.sum(:hours, :include => :project, :conditions => cond).to_f
                  end
                  @key = User.current.rss_key
                  respond_to do |format|
                    format.html
                    format.api
                  end
                end
                def settings
                  @issue_custom_fields = IssueCustomField.sorted.all
                  @issue_category ||= IssueCategory.new
                  @member ||= @project.members.new
                  @trackers = Tracker.sorted.all
                  @wiki ||= @project.wiki
                end
                def edit
                end
                def update
                  @project.safe_attributes = params[:project]
                  if validate_parent_id && @project.save
                    @project.set_allowed_parent!(params[:project]['parent_id']) if params[:project].has_key?('parent_id')
                    respond_to do |format|
                      format.html {
                        flash[:notice] = l(:notice_successful_update)
                        redirect_to settings_project_path(@project)
                      }
                      format.api  { render_api_ok }
                    end
                  else
                    respond_to do |format|
                      format.html {
                        settings
                        render :action => 'settings'
                      }
                      format.api  { render_validation_errors(@project) }
                    end
                  end
                end
                def modules
                  @project.enabled_module_names = params[:enabled_module_names]
                  flash[:notice] = l(:notice_successful_update)
                  redirect_to settings_project_path(@project, :tab => 'modules')
                end
                def archive
                  if request.post?
                    unless @project.archive
                      flash[:error] = l(:error_can_not_archive_project)
                    end
                  end
                  redirect_to admin_projects_path(:status => params[:status])
                end
                def unarchive
                  @project.unarchive if request.post? && !@project.active?
                  redirect_to admin_projects_path(:status => params[:status])
                end
                def close
                  @project.close
                  redirect_to project_path(@project)
                end
                def reopen
                  @project.reopen
                  redirect_to project_path(@project)
                end
                # Delete @project
                def destroy
                  @project_to_destroy = @project
                  if api_request? || params[:confirm]
                    @project_to_destroy.destroy
                    respond_to do |format|
                      format.html { redirect_to admin_projects_path }
                      format.api  { render_api_ok }
                    end
                  end
                  # hide project in layout
                  @project = nil
                end
                private
                # Validates parent_id param according to user's permissions
                # TODO: move it to Project model in a validation that depends on User.current
                def validate_parent_id
                  return true if User.current.admin?
                  parent_id = params[:project] && params[:project][:parent_id]
                  if parent_id || @project.new_record?
                    parent = parent_id.blank? ? nil : Project.find_by_id(parent_id.to_i)
                    unless @project.allowed_parents.include?(parent)
                      @project.errors.add :parent_id, :invalid
                      return false
                    end
                  end
                  true
                end
              end

app/controllers/queries_controller.rb +1 -1

              # Redmine - project management software
-             # Copyright (C) 2006-2012  Jean-Philippe Lang
+             # Copyright (C) 2006-2013  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 QueriesController < ApplicationController
                menu_item :issues
                before_filter :find_query, :except => [:new, :create, :index]
                before_filter :find_optional_project, :only => [:new, :create]
                accept_api_auth :index
                include QueriesHelper
                def index
                  case params[:format]
                  when 'xml', 'json'
                    @offset, @limit = api_offset_and_limit
                  else
                    @limit = per_page_option
                  end
                  @query_count = IssueQuery.visible.count
                  @query_pages = Paginator.new @query_count, @limit, params['page']
                  @queries = IssueQuery.visible.all(:limit => @limit, :offset => @offset, :order => "#{Query.table_name}.name")
                  respond_to do |format|
                    format.api
                  end
                end
                def new
                  @query = IssueQuery.new
                  @query.user = User.current
                  @query.project = @project
                  @query.is_public = false unless User.current.allowed_to?(:manage_public_queries, @project) || User.current.admin?
                  @query.build_from_params(params)
                end
                def create
                  @query = IssueQuery.new(params[:query])
                  @query.user = User.current
                  @query.project = params[:query_is_for_all] ? nil : @project
                  @query.is_public = false unless User.current.allowed_to?(:manage_public_queries, @project) || User.current.admin?
                  @query.build_from_params(params)
                  @query.column_names = nil if params[:default_columns]
                  if @query.save
                    flash[:notice] = l(:notice_successful_create)
                    redirect_to _project_issues_path(@project, :query_id => @query)
                  else
                    render :action => 'new', :layout => !request.xhr?
                  end
                end
                def edit
                end
                def update
                  @query.attributes = params[:query]
                  @query.project = nil if params[:query_is_for_all]
                  @query.is_public = false unless User.current.allowed_to?(:manage_public_queries, @project) || User.current.admin?
                  @query.build_from_params(params)
                  @query.column_names = nil if params[:default_columns]
                  if @query.save
                    flash[:notice] = l(:notice_successful_update)
                    redirect_to _project_issues_path(@project, :query_id => @query)
                  else
                    render :action => 'edit'
                  end
                end
                def destroy
                  @query.destroy
                  redirect_to _project_issues_path(@project, :set_filter => 1)
                end
              private
                def find_query
                  @query = IssueQuery.find(params[:id])
                  @project = @query.project
                  render_403 unless @query.editable_by?(User.current)
                rescue ActiveRecord::RecordNotFound
                  render_404
                end
                def find_optional_project
                  @project = Project.find(params[:project_id]) if params[:project_id]
                  render_403 unless User.current.allowed_to?(:save_queries, @project, :global => true)
                rescue ActiveRecord::RecordNotFound
                  render_404
                end
              end

app/controllers/reports_controller.rb +1 -1

              # Redmine - project management software
-             # Copyright (C) 2006-2012  Jean-Philippe Lang
+             # Copyright (C) 2006-2013  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 ReportsController < ApplicationController
                menu_item :issues
                before_filter :find_project, :authorize, :find_issue_statuses
                def issue_report
                  @trackers = @project.trackers
                  @versions = @project.shared_versions.sort
                  @priorities = IssuePriority.all.reverse
                  @categories = @project.issue_categories
                  @assignees = (Setting.issue_group_assignment? ? @project.principals : @project.users).sort
                  @authors = @project.users.sort
                  @subprojects = @project.descendants.visible
                  @issues_by_tracker = Issue.by_tracker(@project)
                  @issues_by_version = Issue.by_version(@project)
                  @issues_by_priority = Issue.by_priority(@project)
                  @issues_by_category = Issue.by_category(@project)
                  @issues_by_assigned_to = Issue.by_assigned_to(@project)
                  @issues_by_author = Issue.by_author(@project)
                  @issues_by_subproject = Issue.by_subproject(@project) || []
                  render :template => "reports/issue_report"
                end
                def issue_report_details
                  case params[:detail]
                  when "tracker"
                    @field = "tracker_id"
                    @rows = @project.trackers
                    @data = Issue.by_tracker(@project)
                    @report_title = l(:field_tracker)
                  when "version"
                    @field = "fixed_version_id"
                    @rows = @project.shared_versions.sort
                    @data = Issue.by_version(@project)
                    @report_title = l(:field_version)
                  when "priority"
                    @field = "priority_id"
                    @rows = IssuePriority.all.reverse
                    @data = Issue.by_priority(@project)
                    @report_title = l(:field_priority)
                  when "category"
                    @field = "category_id"
                    @rows = @project.issue_categories
                    @data = Issue.by_category(@project)
                    @report_title = l(:field_category)
                  when "assigned_to"
                    @field = "assigned_to_id"
                    @rows = (Setting.issue_group_assignment? ? @project.principals : @project.users).sort
                    @data = Issue.by_assigned_to(@project)
                    @report_title = l(:field_assigned_to)
                  when "author"
                    @field = "author_id"
                    @rows = @project.users.sort
                    @data = Issue.by_author(@project)
                    @report_title = l(:field_author)
                  when "subproject"
                    @field = "project_id"
                    @rows = @project.descendants.visible
                    @data = Issue.by_subproject(@project) || []
                    @report_title = l(:field_subproject)
                  end
                  respond_to do |format|
                    if @field
                      format.html {}
                    else
                      format.html { redirect_to :action => 'issue_report', :id => @project }
                    end
                  end
                end
                private
                def find_issue_statuses
                  @statuses = IssueStatus.sorted.all
                end
              end

app/controllers/repositories_controller.rb +1 -1

              # Redmine - project management software
-             # Copyright (C) 2006-2012  Jean-Philippe Lang
+             # Copyright (C) 2006-2013  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
                end
                def create
                  attrs = pickup_extra_info
                  @repository = Repository.factory(params[:repository_scm])
                  @repository.safe_attributes = params[:repository]
                  if attrs[:attrs_extra].keys.any?
                    @repository.merge_extra_info(attrs[:attrs_extra])
                  end
                  @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
                  attrs = pickup_extra_info
                  @repository.safe_attributes = attrs[:attrs]
                  if attrs[:attrs_extra].keys.any?
                    @repository.merge_extra_info(attrs[:attrs_extra])
                  end
                  @repository.project = @project
                  if request.put? && @repository.save
                    redirect_to settings_project_path(@project, :tab => 'repositories')
                  else
                    render :action => 'edit'
                  end
                end
                def pickup_extra_info
                  p       = {}
                  p_extra = {}
                  params[:repository].each do |k, v|
                    if k =~ /^extra_/
                      p_extra[k] = v
                    else
                      p[k] = v
                    end
                  end
                  {:attrs => p, :attrs_extra => p_extra}
                end
                private :pickup_extra_info
                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 @changeset_count,
                                                   per_page_option,
                                                   params['page']
                  @changesets = @repository.changesets.
                    limit(@changeset_pages.items_per_page).
                    offset(@changeset_pages.offset).
                    includes(:user, :repository, :parents).
                    all
                  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 raw
                  entry_and_raw(true)
                end
                def entry
                  entry_and_raw(false)
                end
                def entry_and_raw(is_raw)
                  @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 is_raw ||
                       (@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_opt[:disposition] = (Redmine::MimeType.is_type?('image', @path) && !is_raw ? 'inline' : 'attachment')
                    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
                private :entry_and_raw
                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
                  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
                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].is_a?(Array) ? params[:path].join('/') : params[:path].to_s
                  @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 = Changeset.count(
                                        :all, :group => :commit_date,
                                        :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[(@date_to.month - c.first.to_date.month) % 12] += c.last }
                  changes_by_day = Change.count(
                                        :all, :group => :commit_date, :include => :changeset,
                                        :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[(@date_to.month - c.first.to_date.month) % 12] += 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 = 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 = 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/roles_controller.rb +1 -1

              # Redmine - project management software
-             # Copyright (C) 2006-2012  Jean-Philippe Lang
+             # Copyright (C) 2006-2013  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 RolesController < ApplicationController
                layout 'admin'
                before_filter :require_admin, :except => [:index, :show]
                before_filter :require_admin_or_api_request, :only => [:index, :show]
                before_filter :find_role, :only => [:show, :edit, :update, :destroy]
                accept_api_auth :index, :show
                def index
                  respond_to do |format|
                    format.html {
                      @role_pages, @roles = paginate Role.sorted, :per_page => 25
                      render :action => "index", :layout => false if request.xhr?
                    }
                    format.api {
                      @roles = Role.givable.all
                    }
                  end
                end
                def show
                  respond_to do |format|
                    format.api
                  end
                end
                def new
                  # Prefills the form with 'Non member' role permissions by default
                  @role = Role.new(params[:role] || {:permissions => Role.non_member.permissions})
                  if params[:copy].present? && @copy_from = Role.find_by_id(params[:copy])
                    @role.copy_from(@copy_from)
                  end
                  @roles = Role.sorted.all
                end
                def create
                  @role = Role.new(params[:role])
                  if request.post? && @role.save
                    # workflow copy
                    if !params[:copy_workflow_from].blank? && (copy_from = Role.find_by_id(params[:copy_workflow_from]))
                      @role.workflow_rules.copy(copy_from)
                    end
                    flash[:notice] = l(:notice_successful_create)
                    redirect_to roles_path
                  else
                    @roles = Role.sorted.all
                    render :action => 'new'
                  end
                end
                def edit
                end
                def update
                  if request.put? and @role.update_attributes(params[:role])
                    flash[:notice] = l(:notice_successful_update)
                    redirect_to roles_path
                  else
                    render :action => 'edit'
                  end
                end
                def destroy
                  @role.destroy
                  redirect_to roles_path
                rescue
                  flash[:error] =  l(:error_can_not_remove_role)
                  redirect_to roles_path
                end
                def permissions
                  @roles = Role.sorted.all
                  @permissions = Redmine::AccessControl.permissions.select { |p| !p.public? }
                  if request.post?
                    @roles.each do |role|
                      role.permissions = params[:permissions][role.id.to_s]
                      role.save
                    end
                    flash[:notice] = l(:notice_successful_update)
                    redirect_to roles_path
                  end
                end
                private
                def find_role
                  @role = Role.find(params[:id])
                rescue ActiveRecord::RecordNotFound
                  render_404
                end
              end

app/controllers/search_controller.rb +1 -1

              # Redmine - project management software
-             # Copyright (C) 2006-2012  Jean-Philippe Lang
+             # Copyright (C) 2006-2013  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 SearchController < ApplicationController
                before_filter :find_optional_project
                def index
                  @question = params[:q] || ""
                  @question.strip!
                  @all_words = params[:all_words] ? params[:all_words].present? : true
                  @titles_only = params[:titles_only] ? params[:titles_only].present? : false
                  projects_to_search =
                    case params[:scope]
                    when 'all'
                      nil
                    when 'my_projects'
                      User.current.memberships.collect(&:project)
                    when 'subprojects'
                      @project ? (@project.self_and_descendants.active.all) : nil
                    else
                      @project
                    end
                  offset = nil
                  begin; offset = params[:offset].to_time if params[:offset]; rescue; end
                  # quick jump to an issue
                  if (m = @question.match(/^#?(\d+)$/)) && (issue = Issue.visible.find_by_id(m[1].to_i))
                    redirect_to issue_path(issue)
                    return
                  end
                  @object_types = Redmine::Search.available_search_types.dup
                  if projects_to_search.is_a? Project
                    # don't search projects
                    @object_types.delete('projects')
                    # only show what the user is allowed to view
                    @object_types = @object_types.select {|o| User.current.allowed_to?("view_#{o}".to_sym, projects_to_search)}
                  end
                  @scope = @object_types.select {|t| params[t]}
                  @scope = @object_types if @scope.empty?
                  # extract tokens from the question
                  # eg. hello "bye bye" => ["hello", "bye bye"]
                  @tokens = @question.scan(%r{((\s|^)"[\s\w]+"(\s|$)|\S+)}).collect {|m| m.first.gsub(%r{(^\s*"\s*|\s*"\s*$)}, '')}
                  # tokens must be at least 2 characters long
                  @tokens = @tokens.uniq.select {|w| w.length > 1 }
                  if !@tokens.empty?
                    # no more than 5 tokens to search for
                    @tokens.slice! 5..-1 if @tokens.size > 5
                    @results = []
                    @results_by_type = Hash.new {|h,k| h[k] = 0}
                    limit = 10
                    @scope.each do |s|
                      r, c = s.singularize.camelcase.constantize.search(@tokens, projects_to_search,
                        :all_words => @all_words,
                        :titles_only => @titles_only,
                        :limit => (limit+1),
                        :offset => offset,
                        :before => params[:previous].nil?)
                      @results += r
                      @results_by_type[s] += c
                    end
                    @results = @results.sort {|a,b| b.event_datetime <=> a.event_datetime}
                    if params[:previous].nil?
                      @pagination_previous_date = @results[0].event_datetime if offset && @results[0]
                      if @results.size > limit
                        @pagination_next_date = @results[limit-1].event_datetime
                        @results = @results[0, limit]
                      end
                    else
                      @pagination_next_date = @results[-1].event_datetime if offset && @results[-1]
                      if @results.size > limit
                        @pagination_previous_date = @results[-(limit)].event_datetime
                        @results = @results[-(limit), limit]
                      end
                    end
                  else
                    @question = ""
                  end
                  render :layout => false if request.xhr?
                end
              private
                def find_optional_project
                  return true unless params[:id]
                  @project = Project.find(params[:id])
                  check_project_privacy
                rescue ActiveRecord::RecordNotFound
                  render_404
                end
              end

app/controllers/settings_controller.rb +1 -1

              # Redmine - project management software
-             # Copyright (C) 2006-2012  Jean-Philippe Lang
+             # Copyright (C) 2006-2013  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 SettingsController < ApplicationController
                layout 'admin'
                menu_item :plugins, :only => :plugin
                before_filter :require_admin
                def index
                  edit
                  render :action => 'edit'
                end
                def edit
                  @notifiables = Redmine::Notifiable.all
                  if request.post? && params[:settings] && params[:settings].is_a?(Hash)
                    settings = (params[:settings] || {}).dup.symbolize_keys
                    settings.each do |name, value|
                      # remove blank values in array settings
                      value.delete_if {|v| v.blank? } if value.is_a?(Array)
                      Setting[name] = value
                    end
                    flash[:notice] = l(:notice_successful_update)
                    redirect_to settings_path(:tab => params[:tab])
                  else
                    @options = {}
                    user_format = User::USER_FORMATS.collect{|key, value| [key, value[:setting_order]]}.sort{|a, b| a[1] <=> b[1]}
                    @options[:user_format] = user_format.collect{|f| [User.current.name(f[0]), f[0].to_s]}
                    @deliveries = ActionMailer::Base.perform_deliveries
                    @guessed_host_and_path = request.host_with_port.dup
                    @guessed_host_and_path << ('/'+ Redmine::Utils.relative_url_root.gsub(%r{^\/}, '')) unless Redmine::Utils.relative_url_root.blank?
                    Redmine::Themes.rescan
                  end
                end
                def plugin
                  @plugin = Redmine::Plugin.find(params[:id])
                  if request.post?
                    Setting.send "plugin_#{@plugin.id}=", params[:settings]
                    flash[:notice] = l(:notice_successful_update)
                    redirect_to plugin_settings_path(@plugin)
                  else
                    @partial = @plugin.settings[:partial]
                    @settings = Setting.send "plugin_#{@plugin.id}"
                  end
                rescue Redmine::PluginNotFound
                  render_404
                end
              end

app/controllers/sys_controller.rb +1 -1

              # Redmine - project management software
-             # Copyright (C) 2006-2012  Jean-Philippe Lang
+             # Copyright (C) 2006-2013  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 SysController < ActionController::Base
                before_filter :check_enabled
                def projects
                  p = Project.active.has_module(:repository).find(
                                 :all,
                                 :include => :repository,
                                 :order => "#{Project.table_name}.identifier"
                               )
                  # extra_info attribute from repository breaks activeresource client
                  render :xml => p.to_xml(
                                     :only => [:id, :identifier, :name, :is_public, :status],
                                     :include => {:repository => {:only => [:id, :url]}}
                                   )
                end
                def create_project_repository
                  project = Project.find(params[:id])
                  if project.repository
                    render :nothing => true, :status => 409
                  else
                    logger.info "Repository for #{project.name} was reported to be created by #{request.remote_ip}."
                    repository = Repository.factory(params[:vendor], params[:repository])
                    repository.project = project
                    if repository.save
                      render :xml => {repository.class.name.underscore.gsub('/', '-') => {:id => repository.id, :url => repository.url}}, :status => 201
                    else
                      render :nothing => true, :status => 422
                    end
                  end
                end
                def fetch_changesets
                  projects = []
                  scope = Project.active.has_module(:repository)
                  if params[:id]
                    project = nil
                    if params[:id].to_s =~ /^\d*$/
                      project = scope.find(params[:id])
                    else
                      project = scope.find_by_identifier(params[:id])
                    end
                    raise ActiveRecord::RecordNotFound unless project
                    projects << project
                  else
                    projects = scope.all
                  end
                  projects.each do |project|
                    project.repositories.each do |repository|
                      repository.fetch_changesets
                    end
                  end
                  render :nothing => true, :status => 200
                rescue ActiveRecord::RecordNotFound
                  render :nothing => true, :status => 404
                end
                protected
                def check_enabled
                  User.current = nil
                  unless Setting.sys_api_enabled? && params[:key].to_s == Setting.sys_api_key
                    render :text => 'Access denied. Repository management WS is disabled or key is invalid.', :status => 403
                    return false
                  end
                end
              end

app/controllers/timelog_controller.rb +1 -1

              # Redmine - project management software
-             # Copyright (C) 2006-2012  Jean-Philippe Lang
+             # Copyright (C) 2006-2013  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 TimelogController < ApplicationController
                menu_item :issues
                before_filter :find_project_for_new_time_entry, :only => [:create]
                before_filter :find_time_entry, :only => [:show, :edit, :update]
                before_filter :find_time_entries, :only => [:bulk_edit, :bulk_update, :destroy]
                before_filter :authorize, :except => [:new, :index, :report]
                before_filter :find_optional_project, :only => [:index, :report]
                before_filter :find_optional_project_for_new_time_entry, :only => [:new]
                before_filter :authorize_global, :only => [:new, :index, :report]
                accept_rss_auth :index
                accept_api_auth :index, :show, :create, :update, :destroy
                rescue_from Query::StatementInvalid, :with => :query_statement_invalid
                helper :sort
                include SortHelper
                helper :issues
                include TimelogHelper
                helper :custom_fields
                include CustomFieldsHelper
                helper :queries
                def index
                  @query = TimeEntryQuery.build_from_params(params, :project => @project, :name => '_')
                  scope = time_entry_scope
                  sort_init(@query.sort_criteria.empty? ? [['spent_on', 'desc']] : @query.sort_criteria)
                  sort_update(@query.sortable_columns)
                  respond_to do |format|
                    format.html {
                      # Paginate results
                      @entry_count = scope.count
                      @entry_pages = Paginator.new @entry_count, per_page_option, params['page']
                      @entries = scope.all(
                        :include => [:project, :activity, :user, {:issue => :tracker}],
                        :order => sort_clause,
                        :limit  =>  @entry_pages.items_per_page,
                        :offset =>  @entry_pages.offset
                      )
                      @total_hours = scope.sum(:hours).to_f
                      render :layout => !request.xhr?
                    }
                    format.api  {
                      @entry_count = scope.count
                      @offset, @limit = api_offset_and_limit
                      @entries = scope.all(
                        :include => [:project, :activity, :user, {:issue => :tracker}],
                        :order => sort_clause,
                        :limit  => @limit,
                        :offset => @offset
                      )
                    }
                    format.atom {
                      entries = scope.all(
                        :include => [:project, :activity, :user, {:issue => :tracker}],
                        :order => "#{TimeEntry.table_name}.created_on DESC",
                        :limit => Setting.feeds_limit.to_i
                      )
                      render_feed(entries, :title => l(:label_spent_time))
                    }
                    format.csv {
                      # Export all entries
                      @entries = scope.all(
                        :include => [:project, :activity, :user, {:issue => [:tracker, :assigned_to, :priority]}],
                        :order => sort_clause
                      )
                      send_data(entries_to_csv(@entries), :type => 'text/csv; header=present', :filename => 'timelog.csv')
                    }
                  end
                end
                def report
                  @query = TimeEntryQuery.build_from_params(params, :project => @project, :name => '_')
                  scope = time_entry_scope
                  @report = Redmine::Helpers::TimeReport.new(@project, @issue, params[:criteria], params[:columns], scope)
                  respond_to do |format|
                    format.html { render :layout => !request.xhr? }
                    format.csv  { send_data(report_to_csv(@report), :type => 'text/csv; header=present', :filename => 'timelog.csv') }
                  end
                end
                def show
                  respond_to do |format|
                    # TODO: Implement html response
                    format.html { render :nothing => true, :status => 406 }
                    format.api
                  end
                end
                def new
                  @time_entry ||= TimeEntry.new(:project => @project, :issue => @issue, :user => User.current, :spent_on => User.current.today)
                  @time_entry.safe_attributes = params[:time_entry]
                end
                def create
                  @time_entry ||= TimeEntry.new(:project => @project, :issue => @issue, :user => User.current, :spent_on => User.current.today)
                  @time_entry.safe_attributes = params[:time_entry]
                  call_hook(:controller_timelog_edit_before_save, { :params => params, :time_entry => @time_entry })
                  if @time_entry.save
                    respond_to do |format|
                      format.html {
                        flash[:notice] = l(:notice_successful_create)
                        if params[:continue]
                          if params[:project_id]
                            options = {
                              :time_entry => {:issue_id => @time_entry.issue_id, :activity_id => @time_entry.activity_id},
                              :back_url => params[:back_url]
                            }
                            if @time_entry.issue
                              redirect_to new_project_issue_time_entry_path(@time_entry.project, @time_entry.issue, options)
                            else
                              redirect_to new_project_time_entry_path(@time_entry.project, options)
                            end
                          else
                            options = {
                              :time_entry => {:project_id => @time_entry.project_id, :issue_id => @time_entry.issue_id, :activity_id => @time_entry.activity_id},
                              :back_url => params[:back_url]
                            }
                            redirect_to new_time_entry_path(options)
                          end
                        else
                          redirect_back_or_default project_time_entries_path(@time_entry.project)
                        end
                      }
                      format.api  { render :action => 'show', :status => :created, :location => time_entry_url(@time_entry) }
                    end
                  else
                    respond_to do |format|
                      format.html { render :action => 'new' }
                      format.api  { render_validation_errors(@time_entry) }
                    end
                  end
                end
                def edit
                  @time_entry.safe_attributes = params[:time_entry]
                end
                def update
                  @time_entry.safe_attributes = params[:time_entry]
                  call_hook(:controller_timelog_edit_before_save, { :params => params, :time_entry => @time_entry })
                  if @time_entry.save
                    respond_to do |format|
                      format.html {
                        flash[:notice] = l(:notice_successful_update)
                        redirect_back_or_default project_time_entries_path(@time_entry.project)
                      }
                      format.api  { render_api_ok }
                    end
                  else
                    respond_to do |format|
                      format.html { render :action => 'edit' }
                      format.api  { render_validation_errors(@time_entry) }
                    end
                  end
                end
                def bulk_edit
                  @available_activities = TimeEntryActivity.shared.active
                  @custom_fields = TimeEntry.first.available_custom_fields
                end
                def bulk_update
                  attributes = parse_params_for_bulk_time_entry_attributes(params)
                  unsaved_time_entry_ids = []
                  @time_entries.each do |time_entry|
                    time_entry.reload
                    time_entry.safe_attributes = attributes
                    call_hook(:controller_time_entries_bulk_edit_before_save, { :params => params, :time_entry => time_entry })
                    unless time_entry.save
                      # Keep unsaved time_entry ids to display them in flash error
                      unsaved_time_entry_ids << time_entry.id
                    end
                  end
                  set_flash_from_bulk_time_entry_save(@time_entries, unsaved_time_entry_ids)
                  redirect_back_or_default project_time_entries_path(@projects.first)
                end
                def destroy
                  destroyed = TimeEntry.transaction do
                    @time_entries.each do |t|
                      unless t.destroy && t.destroyed?
                        raise ActiveRecord::Rollback
                      end
                    end
                  end
                  respond_to do |format|
                    format.html {
                      if destroyed
                        flash[:notice] = l(:notice_successful_delete)
                      else
                        flash[:error] = l(:notice_unable_delete_time_entry)
                      end
                      redirect_back_or_default project_time_entries_path(@projects.first)
                    }
                    format.api  {
                      if destroyed
                        render_api_ok
                      else
                        render_validation_errors(@time_entries)
                      end
                    }
                  end
                end
              private
                def find_time_entry
                  @time_entry = TimeEntry.find(params[:id])
                  unless @time_entry.editable_by?(User.current)
                    render_403
                    return false
                  end
                  @project = @time_entry.project
                rescue ActiveRecord::RecordNotFound
                  render_404
                end
                def find_time_entries
                  @time_entries = TimeEntry.find_all_by_id(params[:id] || params[:ids])
                  raise ActiveRecord::RecordNotFound if @time_entries.empty?
                  @projects = @time_entries.collect(&:project).compact.uniq
                  @project = @projects.first if @projects.size == 1
                rescue ActiveRecord::RecordNotFound
                  render_404
                end
                def set_flash_from_bulk_time_entry_save(time_entries, unsaved_time_entry_ids)
                  if unsaved_time_entry_ids.empty?
                    flash[:notice] = l(:notice_successful_update) unless time_entries.empty?
                  else
                    flash[:error] = l(:notice_failed_to_save_time_entries,
                                      :count => unsaved_time_entry_ids.size,
                                      :total => time_entries.size,
                                      :ids => '#' + unsaved_time_entry_ids.join(', #'))
                  end
                end
                def find_optional_project_for_new_time_entry
                  if (project_id = (params[:project_id] || params[:time_entry] && params[:time_entry][:project_id])).present?
                    @project = Project.find(project_id)
                  end
                  if (issue_id = (params[:issue_id] || params[:time_entry] && params[:time_entry][:issue_id])).present?
                    @issue = Issue.find(issue_id)
                    @project ||= @issue.project
                  end
                rescue ActiveRecord::RecordNotFound
                  render_404
                end
                def find_project_for_new_time_entry
                  find_optional_project_for_new_time_entry
                  if @project.nil?
                    render_404
                  end
                end
                def find_optional_project
                  if !params[:issue_id].blank?
                    @issue = Issue.find(params[:issue_id])
                    @project = @issue.project
                  elsif !params[:project_id].blank?
                    @project = Project.find(params[:project_id])
                  end
                end
                # Returns the TimeEntry scope for index and report actions
                def time_entry_scope
                  scope = TimeEntry.visible.where(@query.statement)
                  if @issue
                    scope = scope.on_issue(@issue)
                  elsif @project
                    scope = scope.on_project(@project, Setting.display_subprojects_issues?)
                  end
                  scope
                end
                def parse_params_for_bulk_time_entry_attributes(params)
                  attributes = (params[:time_entry] || {}).reject {|k,v| v.blank?}
                  attributes.keys.each {|k| attributes[k] = '' if attributes[k] == 'none'}
                  attributes[:custom_field_values].reject! {|k,v| v.blank?} if attributes[:custom_field_values]
                  attributes
                end
              end

app/controllers/trackers_controller.rb +1 -1

              # Redmine - project management software
-             # Copyright (C) 2006-2012  Jean-Philippe Lang
+             # Copyright (C) 2006-2013  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 TrackersController < ApplicationController
                layout 'admin'
                before_filter :require_admin, :except => :index
                before_filter :require_admin_or_api_request, :only => :index
                accept_api_auth :index
                def index
                  respond_to do |format|
                    format.html {
                      @tracker_pages, @trackers = paginate Tracker.sorted, :per_page => 25
                      render :action => "index", :layout => false if request.xhr?
                    }
                    format.api {
                      @trackers = Tracker.sorted.all
                    }
                  end
                end
                def new
                  @tracker ||= Tracker.new(params[:tracker])
                  @trackers = Tracker.sorted.all
                  @projects = Project.all
                end
                def create
                  @tracker = Tracker.new(params[:tracker])
                  if @tracker.save
                    # workflow copy
                    if !params[:copy_workflow_from].blank? && (copy_from = Tracker.find_by_id(params[:copy_workflow_from]))
                      @tracker.workflow_rules.copy(copy_from)
                    end
                    flash[:notice] = l(:notice_successful_create)
                    redirect_to trackers_path
                    return
                  end
                  new
                  render :action => 'new'
                end
                def edit
                  @tracker ||= Tracker.find(params[:id])
                  @projects = Project.all
                end
                def update
                  @tracker = Tracker.find(params[:id])
                  if @tracker.update_attributes(params[:tracker])
                    flash[:notice] = l(:notice_successful_update)
                    redirect_to trackers_path
                    return
                  end
                  edit
                  render :action => 'edit'
                end
                def destroy
                  @tracker = Tracker.find(params[:id])
                  unless @tracker.issues.empty?
                    flash[:error] = l(:error_can_not_delete_tracker)
                  else
                    @tracker.destroy
                  end
                  redirect_to trackers_path
                end
                def fields
                  if request.post? && params[:trackers]
                    params[:trackers].each do |tracker_id, tracker_params|
                      tracker = Tracker.find_by_id(tracker_id)
                      if tracker
                        tracker.core_fields = tracker_params[:core_fields]
                        tracker.custom_field_ids = tracker_params[:custom_field_ids]
                        tracker.save
                      end
                    end
                    flash[:notice] = l(:notice_successful_update)
                    redirect_to fields_trackers_path
                    return
                  end
                  @trackers = Tracker.sorted.all
                  @custom_fields = IssueCustomField.all.sort
                end
              end

app/controllers/users_controller.rb +1 -1

              # Redmine - project management software
-             # Copyright (C) 2006-2012  Jean-Philippe Lang
+             # Copyright (C) 2006-2013  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 UsersController < ApplicationController
                layout 'admin'
                before_filter :require_admin, :except => :show
                before_filter :find_user, :only => [:show, :edit, :update, :destroy, :edit_membership, :destroy_membership]
                accept_api_auth :index, :show, :create, :update, :destroy
                helper :sort
                include SortHelper
                helper :custom_fields
                include CustomFieldsHelper
                def index
                  sort_init 'login', 'asc'
                  sort_update %w(login firstname lastname mail admin created_on last_login_on)
                  case params[:format]
                  when 'xml', 'json'
                    @offset, @limit = api_offset_and_limit
                  else
                    @limit = per_page_option
                  end
                  @status = params[:status] || 1
                  scope = User.logged.status(@status)
                  scope = scope.like(params[:name]) if params[:name].present?
                  scope = scope.in_group(params[:group_id]) if params[:group_id].present?
                  @user_count = scope.count
                  @user_pages = Paginator.new @user_count, @limit, params['page']
                  @offset ||= @user_pages.offset
                  @users =  scope.order(sort_clause).limit(@limit).offset(@offset).all
                  respond_to do |format|
                    format.html {
                      @groups = Group.all.sort
                      render :layout => !request.xhr?
                    }
                    format.api
                  end
                end
                def show
                  # show projects based on current user visibility
                  @memberships = @user.memberships.all(:conditions => Project.visible_condition(User.current))
                  events = Redmine::Activity::Fetcher.new(User.current, :author => @user).events(nil, nil, :limit => 10)
                  @events_by_day = events.group_by(&:event_date)
                  unless User.current.admin?
                    if !@user.active? || (@user != User.current  && @memberships.empty? && events.empty?)
                      render_404
                      return
                    end
                  end
                  respond_to do |format|
                    format.html { render :layout => 'base' }
                    format.api
                  end
                end
                def new
                  @user = User.new(:language => Setting.default_language, :mail_notification => Setting.default_notification_option)
                  @auth_sources = AuthSource.all
                end
                def create
                  @user = User.new(:language => Setting.default_language, :mail_notification => Setting.default_notification_option)
                  @user.safe_attributes = params[:user]
                  @user.admin = params[:user][:admin] || false
                  @user.login = params[:user][:login]
                  @user.password, @user.password_confirmation = params[:user][:password], params[:user][:password_confirmation] unless @user.auth_source_id
                  if @user.save
                    @user.pref.attributes = params[:pref]
                    @user.pref[:no_self_notified] = (params[:no_self_notified] == '1')
                    @user.pref.save
                    @user.notified_project_ids = (@user.mail_notification == 'selected' ? params[:notified_project_ids] : [])
                    Mailer.account_information(@user, params[:user][:password]).deliver if params[:send_information]
                    respond_to do |format|
                      format.html {
                        flash[:notice] = l(:notice_user_successful_create, :id => view_context.link_to(@user.login, user_path(@user)))
                        if params[:continue]
                          redirect_to new_user_path
                        else
                          redirect_to edit_user_path(@user)
                        end
                      }
                      format.api  { render :action => 'show', :status => :created, :location => user_url(@user) }
                    end
                  else
                    @auth_sources = AuthSource.all
                    # Clear password input
                    @user.password = @user.password_confirmation = nil
                    respond_to do |format|
                      format.html { render :action => 'new' }
                      format.api  { render_validation_errors(@user) }
                    end
                  end
                end
                def edit
                  @auth_sources = AuthSource.all
                  @membership ||= Member.new
                end
                def update
                  @user.admin = params[:user][:admin] if params[:user][:admin]
                  @user.login = params[:user][:login] if params[:user][:login]
                  if params[:user][:password].present? && (@user.auth_source_id.nil? || params[:user][:auth_source_id].blank?)
                    @user.password, @user.password_confirmation = params[:user][:password], params[:user][:password_confirmation]
                  end
                  @user.safe_attributes = params[:user]
                  # Was the account actived ? (do it before User#save clears the change)
                  was_activated = (@user.status_change == [User::STATUS_REGISTERED, User::STATUS_ACTIVE])
                  # TODO: Similar to My#account
                  @user.pref.attributes = params[:pref]
                  @user.pref[:no_self_notified] = (params[:no_self_notified] == '1')
                  if @user.save
                    @user.pref.save
                    @user.notified_project_ids = (@user.mail_notification == 'selected' ? params[:notified_project_ids] : [])
                    if was_activated
                      Mailer.account_activated(@user).deliver
                    elsif @user.active? && params[:send_information] && !params[:user][:password].blank? && @user.auth_source_id.nil?
                      Mailer.account_information(@user, params[:user][:password]).deliver
                    end
                    respond_to do |format|
                      format.html {
                        flash[:notice] = l(:notice_successful_update)
                        redirect_to_referer_or edit_user_path(@user)
                      }
                      format.api  { render_api_ok }
                    end
                  else
                    @auth_sources = AuthSource.all
                    @membership ||= Member.new
                    # Clear password input
                    @user.password = @user.password_confirmation = nil
                    respond_to do |format|
                      format.html { render :action => :edit }
                      format.api  { render_validation_errors(@user) }
                    end
                  end
                end
                def destroy
                  @user.destroy
                  respond_to do |format|
                    format.html { redirect_back_or_default(users_path) }
                    format.api  { render_api_ok }
                  end
                end
                def edit_membership
                  @membership = Member.edit_membership(params[:membership_id], params[:membership], @user)
                  @membership.save
                  respond_to do |format|
                    format.html { redirect_to edit_user_path(@user, :tab => 'memberships') }
                    format.js
                  end
                end
                def destroy_membership
                  @membership = Member.find(params[:membership_id])
                  if @membership.deletable?
                    @membership.destroy
                  end
                  respond_to do |format|
                    format.html { redirect_to edit_user_path(@user, :tab => 'memberships') }
                    format.js
                  end
                end
                private
                def find_user
                  if params[:id] == 'current'
                    require_login || return
                    @user = User.current
                  else
                    @user = User.find(params[:id])
                  end
                rescue ActiveRecord::RecordNotFound
                  render_404
                end
              end

app/controllers/versions_controller.rb +1 -1

              # Redmine - project management software
-             # Copyright (C) 2006-2012  Jean-Philippe Lang
+             # Copyright (C) 2006-2013  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 VersionsController < ApplicationController
                menu_item :roadmap
                model_object Version
                before_filter :find_model_object, :except => [:index, :new, :create, :close_completed]
                before_filter :find_project_from_association, :except => [:index, :new, :create, :close_completed]
                before_filter :find_project_by_project_id, :only => [:index, :new, :create, :close_completed]
                before_filter :authorize
                accept_api_auth :index, :show, :create, :update, :destroy
                helper :custom_fields
                helper :projects
                def index
                  respond_to do |format|
                    format.html {
                      @trackers = @project.trackers.sorted.all
                      retrieve_selected_tracker_ids(@trackers, @trackers.select {|t| t.is_in_roadmap?})
                      @with_subprojects = params[:with_subprojects].nil? ? Setting.display_subprojects_issues? : (params[:with_subprojects] == '1')
                      project_ids = @with_subprojects ? @project.self_and_descendants.collect(&:id) : [@project.id]
                      @versions = @project.shared_versions || []
                      @versions += @project.rolled_up_versions.visible if @with_subprojects
                      @versions = @versions.uniq.sort
                      unless params[:completed]
                        @completed_versions = @versions.select {|version| version.closed? || version.completed? }
                        @versions -= @completed_versions
                      end
                      @issues_by_version = {}
                      if @selected_tracker_ids.any? && @versions.any?
                        issues = Issue.visible.all(
                          :include => [:project, :status, :tracker, :priority, :fixed_version],
                          :conditions => {:tracker_id => @selected_tracker_ids, :project_id => project_ids, :fixed_version_id => @versions.map(&:id)},
                          :order => "#{Project.table_name}.lft, #{Tracker.table_name}.position, #{Issue.table_name}.id"
                        )
                        @issues_by_version = issues.group_by(&:fixed_version)
                      end
                      @versions.reject! {|version| !project_ids.include?(version.project_id) && @issues_by_version[version].blank?}
                    }
                    format.api {
                      @versions = @project.shared_versions.all
                    }
                  end
                end
                def show
                  respond_to do |format|
                    format.html {
                      @issues = @version.fixed_issues.visible.
                        includes(:status, :tracker, :priority).
                        reorder("#{Tracker.table_name}.position, #{Issue.table_name}.id").
                        all
                    }
                    format.api
                  end
                end
                def new
                  @version = @project.versions.build
                  @version.safe_attributes = params[:version]
                  respond_to do |format|
                    format.html
                    format.js
                  end
                end
                def create
                  @version = @project.versions.build
                  if params[:version]
                    attributes = params[:version].dup
                    attributes.delete('sharing') unless attributes.nil? || @version.allowed_sharings.include?(attributes['sharing'])
                    @version.safe_attributes = attributes
                  end
                  if request.post?
                    if @version.save
                      respond_to do |format|
                        format.html do
                          flash[:notice] = l(:notice_successful_create)
                          redirect_back_or_default settings_project_path(@project, :tab => 'versions')
                        end
                        format.js
                        format.api do
                          render :action => 'show', :status => :created, :location => version_url(@version)
                        end
                      end
                    else
                      respond_to do |format|
                        format.html { render :action => 'new' }
                        format.js   { render :action => 'new' }
                        format.api  { render_validation_errors(@version) }
                      end
                    end
                  end
                end
                def edit
                end
                def update
                  if request.put? && params[:version]
                    attributes = params[:version].dup
                    attributes.delete('sharing') unless @version.allowed_sharings.include?(attributes['sharing'])
                    @version.safe_attributes = attributes
                    if @version.save
                      respond_to do |format|
                        format.html {
                          flash[:notice] = l(:notice_successful_update)
                          redirect_back_or_default settings_project_path(@project, :tab => 'versions')
                        }
                        format.api  { render_api_ok }
                      end
                    else
                      respond_to do |format|
                        format.html { render :action => 'edit' }
                        format.api  { render_validation_errors(@version) }
                      end
                    end
                  end
                end
                def close_completed
                  if request.put?
                    @project.close_completed_versions
                  end
                  redirect_to settings_project_path(@project, :tab => 'versions')
                end
                def destroy
                  if @version.fixed_issues.empty?
                    @version.destroy
                    respond_to do |format|
                      format.html { redirect_back_or_default settings_project_path(@project, :tab => 'versions') }
                      format.api  { render_api_ok }
                    end
                  else
                    respond_to do |format|
                      format.html {
                        flash[:error] = l(:notice_unable_delete_version)
                        redirect_to settings_project_path(@project, :tab => 'versions')
                      }
                      format.api  { head :unprocessable_entity }
                    end
                  end
                end
                def status_by
                  respond_to do |format|
                    format.html { render :action => 'show' }
                    format.js
                  end
                end
                private
                def retrieve_selected_tracker_ids(selectable_trackers, default_trackers=nil)
                  if ids = params[:tracker_ids]
                    @selected_tracker_ids = (ids.is_a? Array) ? ids.collect { |id| id.to_i.to_s } : ids.split('/').collect { |id| id.to_i.to_s }
                  else
                    @selected_tracker_ids = (default_trackers || selectable_trackers).collect {|t| t.id.to_s }
                  end
                end
              end

app/controllers/watchers_controller.rb +1 -1

              # Redmine - project management software
-             # Copyright (C) 2006-2012  Jean-Philippe Lang
+             # Copyright (C) 2006-2013  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
                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
                  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)
                  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
                  end
                end
                def autocomplete_for_user
                  @users = User.active.like(params[:q]).limit(100).all
                  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_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 { render :partial => 'set_watcher', :locals => {:user => user, :watched => @watched} }
                  end
                end
              end

app/controllers/welcome_controller.rb +1 -1

              # Redmine - project management software
-             # Copyright (C) 2006-2012  Jean-Philippe Lang
+             # Copyright (C) 2006-2013  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 WelcomeController < ApplicationController
                caches_action :robots
                def index
                  @news = News.latest User.current
                  @projects = Project.latest User.current
                end
                def robots
                  @projects = Project.all_public.active
                  render :layout => false, :content_type => 'text/plain'
                end
              end

app/controllers/wiki_controller.rb +1 -1

              # Redmine - project management software
-             # Copyright (C) 2006-2012  Jean-Philippe Lang
+             # Copyright (C) 2006-2013  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, :destroy_version]
                accept_api_auth :index, :show, :update, :destroy
                before_filter :find_attachments, :only => [:preview]
                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
                  respond_to do |format|
                    format.html {
                      @pages_by_parent_id = @pages.group_by(&:parent_id)
                    }
                    format.api
                  end
                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? && !api_request?
                      edit
                      render :action => 'edit'
                    else
                      render_404
                    end
                    return
                  end
                  if params[:version] && !User.current.allowed_to?(:view_wiki_edits, @project)
                    deny_access
                    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?
                  respond_to do |format|
                    format.html
                    format.api
                  end
                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?
                  was_new_page = @page.new_record?
                  @page.content = WikiContent.new(:page => @page) if @page.new_record?
                  @page.safe_attributes = params[:wiki_page]
                  @content = @page.content
                  content_params = params[:content]
                  if content_params.nil? && params[:wiki_page].is_a?(Hash)
                    content_params = params[:wiki_page].slice(:text, :comments, :version)
                  end
                  content_params ||= {}
                  @content.comments = content_params[:comments]
                  @text = content_params[: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 = content_params[:version] if content_params[:version]
                    @content.text = @text
                  end
                  @content.author = User.current
                  if @page.save_with_content
                    attachments = Attachment.attach_files(@page, params[:attachments])
                    render_attachment_warning_if_needed(@page)
                    call_hook(:controller_wiki_edit_after_save, { :params => params, :page => @page})
                    respond_to do |format|
                      format.html { redirect_to project_wiki_page_path(@project, @page.title) }
                      format.api {
                        if was_new_page
                          render :action => 'show', :status => :created, :location => project_wiki_page_path(@project, @page.title)
                        else
                          render_api_ok
                        end
                      }
                    end
                  else
                    respond_to do |format|
                      format.html { render :action => 'edit' }
                      format.api { render_validation_errors(@content) }
                    end
                  end
                rescue ActiveRecord::StaleObjectError, Redmine::WikiFormatting::StaleSectionError
                  # Optimistic locking exception
                  respond_to do |format|
                    format.html {
                      flash.now[:error] = l(:notice_locking_conflict)
                      render :action => 'edit'
                    }
                    format.api { render_api_head :conflict }
                  end
                rescue ActiveRecord::RecordNotSaved
                  respond_to do |format|
                    format.html { render :action => 'edit' }
                    format.api { render_validation_errors(@content) }
                  end
                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 project_wiki_page_path(@project, @page.title)
                  end
                end
                def protect
                  @page.update_attribute :protected, params[:protected]
                  redirect_to project_wiki_page_path(@project, @page.title)
                end
                # show page history
                def history
                  @version_count = @page.content.versions.count
                  @version_pages = Paginator.new @version_count, per_page_option, params['page']
                  # don't load text
                  @versions = @page.content.versions.
                    select("id, author_id, comments, updated_on, version").
                    reorder('version DESC').
                    limit(@version_pages.items_per_page + 1).
                    offset(@version_pages.offset).
                    all
                  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
                      # display the destroy form if it's a user request
                      return unless api_request?
                    end
                  end
                  @page.destroy
                  respond_to do |format|
                    format.html { redirect_to project_wiki_index_path(@project) }
                    format.api { render_api_ok }
                  end
                end
                def destroy_version
                  return render_403 unless editable?
                  @content = @page.content_for_version(params[:version])
                  @content.destroy
                  redirect_to_referer_or history_project_wiki_page_path(@project, @page.title)
                end
                # Export wiki to a single pdf or html file
                def export
                  @pages = @wiki.pages.all(:order => 'title', :include => [:content, {:attachments => :author}])
                  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
                    @attachments += 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.reorder("#{WikiPage.table_name}.title").includes(:wiki => :project).includes(:parent).all
                end
              end

app/controllers/wikis_controller.rb +1 -1

              # Redmine - project management software
-             # Copyright (C) 2006-2012  Jean-Philippe Lang
+             # Copyright (C) 2006-2013  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 WikisController < ApplicationController
                menu_item :settings
                before_filter :find_project, :authorize
                # Create or update a project's wiki
                def edit
                  @wiki = @project.wiki || Wiki.new(:project => @project)
                  @wiki.safe_attributes = params[:wiki]
                  @wiki.save if request.post?
                end
                # Delete a project's wiki
                def destroy
                  if request.post? && params[:confirm] && @project.wiki
                    @project.wiki.destroy
                    redirect_to settings_project_path(@project, :tab => 'wiki')
                  end
                end
              end

app/controllers/workflows_controller.rb +1 -1

              # Redmine - project management software
-             # Copyright (C) 2006-2012  Jean-Philippe Lang
+             # Copyright (C) 2006-2013  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 WorkflowsController < ApplicationController
                layout 'admin'
                before_filter :require_admin, :find_roles, :find_trackers
                def index
                  @workflow_counts = WorkflowTransition.count_by_tracker_and_role
                end
                def edit
                  @role = Role.find_by_id(params[:role_id]) if params[:role_id]
                  @tracker = Tracker.find_by_id(params[:tracker_id]) if params[:tracker_id]
                  if request.post?
                    WorkflowTransition.destroy_all( ["role_id=? and tracker_id=?", @role.id, @tracker.id])
                    (params[:issue_status] || []).each { |status_id, transitions|
                      transitions.each { |new_status_id, options|
                        author = options.is_a?(Array) && options.include?('author') && !options.include?('always')
                        assignee = options.is_a?(Array) && options.include?('assignee') && !options.include?('always')
                        WorkflowTransition.create(:role_id => @role.id, :tracker_id => @tracker.id, :old_status_id => status_id, :new_status_id => new_status_id, :author => author, :assignee => assignee)
                      }
                    }
                    if @role.save
                      redirect_to workflows_edit_path(:role_id => @role, :tracker_id => @tracker, :used_statuses_only => params[:used_statuses_only])
                      return
                    end
                  end
                  @used_statuses_only = (params[:used_statuses_only] == '0' ? false : true)
                  if @tracker && @used_statuses_only && @tracker.issue_statuses.any?
                    @statuses = @tracker.issue_statuses
                  end
                  @statuses ||= IssueStatus.sorted.all
                  if @tracker && @role && @statuses.any?
                    workflows = WorkflowTransition.where(:role_id => @role.id, :tracker_id => @tracker.id).all
                    @workflows = {}
                    @workflows['always'] = workflows.select {|w| !w.author && !w.assignee}
                    @workflows['author'] = workflows.select {|w| w.author}
                    @workflows['assignee'] = workflows.select {|w| w.assignee}
                  end
                end
                def permissions
                  @role = Role.find_by_id(params[:role_id]) if params[:role_id]
                  @tracker = Tracker.find_by_id(params[:tracker_id]) if params[:tracker_id]
                  if request.post? && @role && @tracker
                    WorkflowPermission.replace_permissions(@tracker, @role, params[:permissions] || {})
                    redirect_to workflows_permissions_path(:role_id => @role, :tracker_id => @tracker, :used_statuses_only => params[:used_statuses_only])
                    return
                  end
                  @used_statuses_only = (params[:used_statuses_only] == '0' ? false : true)
                  if @tracker && @used_statuses_only && @tracker.issue_statuses.any?
                    @statuses = @tracker.issue_statuses
                  end
                  @statuses ||= IssueStatus.sorted.all
                  if @role && @tracker
                    @fields = (Tracker::CORE_FIELDS_ALL - @tracker.disabled_core_fields).map {|field| [field, l("field_"+field.sub(/_id$/, ''))]}
                    @custom_fields = @tracker.custom_fields
                    @permissions = WorkflowPermission.where(:tracker_id => @tracker.id, :role_id => @role.id).all.inject({}) do |h, w|
                      h[w.old_status_id] ||= {}
                      h[w.old_status_id][w.field_name] = w.rule
                      h
                    end
                    @statuses.each {|status| @permissions[status.id] ||= {}}
                  end
                end
                def copy
                  if params[:source_tracker_id].blank? || params[:source_tracker_id] == 'any'
                    @source_tracker = nil
                  else
                    @source_tracker = Tracker.find_by_id(params[:source_tracker_id].to_i)
                  end
                  if params[:source_role_id].blank? || params[:source_role_id] == 'any'
                    @source_role = nil
                  else
                    @source_role = Role.find_by_id(params[:source_role_id].to_i)
                  end
                  @target_trackers = params[:target_tracker_ids].blank? ? nil : Tracker.find_all_by_id(params[:target_tracker_ids])
                  @target_roles = params[:target_role_ids].blank? ? nil : Role.find_all_by_id(params[:target_role_ids])
                  if request.post?
                    if params[:source_tracker_id].blank? || params[:source_role_id].blank? || (@source_tracker.nil? && @source_role.nil?)
                      flash.now[:error] = l(:error_workflow_copy_source)
                    elsif @target_trackers.blank? || @target_roles.blank?
                      flash.now[:error] = l(:error_workflow_copy_target)
                    else
                      WorkflowRule.copy(@source_tracker, @source_role, @target_trackers, @target_roles)
                      flash[:notice] = l(:notice_successful_update)
                      redirect_to workflows_copy_path(:source_tracker_id => @source_tracker, :source_role_id => @source_role)
                    end
                  end
                end
                private
                def find_roles
                  @roles = Role.sorted.all
                end
                def find_trackers
                  @trackers = Tracker.sorted.all
                end
              end

app/helpers/account_helper.rb +1 -1

              # encoding: utf-8
              #
              # Redmine - project management software
-             # Copyright (C) 2006-2012  Jean-Philippe Lang
+             # Copyright (C) 2006-2013  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 AccountHelper
              end

app/helpers/activities_helper.rb +1 -1

              # encoding: utf-8
              #
              # Redmine - project management software
-             # Copyright (C) 2006-2012  Jean-Philippe Lang
+             # Copyright (C) 2006-2013  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 ActivitiesHelper
                def sort_activity_events(events)
                  events_by_group = events.group_by(&:event_group)
                  sorted_events = []
                  events.sort {|x, y| y.event_datetime <=> x.event_datetime}.each do |event|
                    if group_events = events_by_group.delete(event.event_group)
                      group_events.sort {|x, y| y.event_datetime <=> x.event_datetime}.each_with_index do |e, i|
                        sorted_events << [e, i > 0]
                      end
                    end
                  end
                  sorted_events
                end
              end

app/helpers/admin_helper.rb +1 -1

              # encoding: utf-8
              #
              # Redmine - project management software
-             # Copyright (C) 2006-2012  Jean-Philippe Lang
+             # Copyright (C) 2006-2013  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 AdminHelper
                def project_status_options_for_select(selected)
                  options_for_select([[l(:label_all), ''],
                                      [l(:project_status_active), '1'],
                                      [l(:project_status_closed), '5'],
                                      [l(:project_status_archived), '9']], selected.to_s)
                end
              end

app/helpers/application_helper.rb +1 -1

              # encoding: utf-8
              #
              # Redmine - project management software
-             # Copyright (C) 2006-2012  Jean-Philippe Lang
+             # Copyright (C) 2006-2013  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
                include Redmine::Pagination::Helper
                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
                # 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? || (User.current.admin? && user.logged?)
                      link_to name, user_path(user), :class => user.css_classes
                    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
                #   link_to_issue(issue, :subject => false, :tracker => false)     # => #6
                #
                def link_to_issue(issue, options={})
                  title = nil
                  subject = nil
                  text = options[:tracker] == false ? "##{issue.id}" : "#{issue.tracker} ##{issue.id}"
                  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 text, issue_path(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.parent_id || message.id),
                      :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.archived?
                    h(project)
                  else
                    url = {:controller => 'projects', :action => 'show', :id => project}.merge(options)
                    link_to(h(project), url, html_options)
                  end
                end
                def wiki_page_path(page, options={})
                  url_for({:controller => 'wiki', :action => 'show', :project_id => page.project, :id => page.title}.merge(options))
                end
                def thumbnail_tag(attachment)
                  link_to image_tag(url_for(:controller => 'attachments', :action => 'thumbnail', :id => attachment)),
                    {:controller => 'attachments', :action => 'show', :id => attachment, :filename => attachment.filename},
                    :title => attachment.filename
                end
                def toggle_link(name, id, options={})
                  onclick = "$('##{id}').toggle(); "
                  onclick << (options[:focus] ? "$('##{options[:focus]}').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 format_activity_title(text)
                  h(truncate_single_line(text, :length => 100))
                end
                def format_activity_day(date)
                  date == User.current.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
                # Renders a tree of projects as a nested set of unordered lists
                # The given collection may be a subset of the whole project tree
                # (eg. some intermediate nodes are private and can not be seen)
                def render_project_nested_lists(projects)
                  s = ''
                  if projects.any?
                    ancestors = []
                    original_project = @project
                    projects.sort_by(&:lft).each do |project|
                      # set the project environment to please macros.
                      @project = project
                      if (ancestors.empty? || project.is_descendant_of?(ancestors.last))
                        s << "<ul class='projects #{ ancestors.empty? ? 'root' : nil}'>\n"
                      else
                        ancestors.pop
                        s << "</li>"
                        while (ancestors.any? && !project.is_descendant_of?(ancestors.last))
                          ancestors.pop
                          s << "</ul></li>\n"
                        end
                      end
                      classes = (ancestors.empty? ? 'root' : 'child')
                      s << "<li class='#{classes}'><div class='#{classes}'>"
                      s << h(block_given? ? yield(project) : project.name)
                      s << "</div>\n"
                      ancestors << project
                    end
                    s << ("</li></ul>\n" * ancestors.size)
                    @project = original_project
                  end
                  s.html_safe
                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, :version => nil},
                                         :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}", :id => "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.select(&:active?).uniq
                  if projects.any?
                    options =
                      ("<option value=''>#{ l(:label_jump_to_a_project) }</option>" +
                       '<option value="" disabled="disabled">---</option>').html_safe
                    options << project_tree_options_for_select(projects, :selected => @project) do |p|
                      { :value => project_path(:id => p, :jump => current_menu_item) }
                    end
                    select_tag('project_quick_jump_box', options, :onchange => 'if (this.value != \'\') { window.location = this.value; }')
                  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 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)} >>", :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
                # Options for the new membership projects combo-box
                def options_for_membership_project_select(principal, projects)
                  options = content_tag('option', "--- #{l(:actionview_instancetag_blank_option)} ---")
                  options << project_tree_options_for_select(projects) do |p|
                    {:disabled => principal.projects.include?(p)}
                  end
                  options
                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 => User.current.time_to_date(time)}, :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)
                  str = path.to_s.split(%r{[/\\]}).select{|p| !p.blank?}.join("/")
                  str.blank? ? nil : str
                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 = text.dup
                  macros = catch_macros(text)
                  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, obj, macros) do |text|
                    [:parse_inline_attachments, :parse_wiki_links, :parse_redmine_links].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, obj, macros)
                  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
                      inject_macros(text, obj, macros) if macros.any?
                    else
                      inject_macros(text, obj, macros, false) if macros.any?
                    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
                  attachments = options[:attachments] || []
                  attachments += obj.attachments if obj.respond_to?(:attachments)
                  if attachments.present?
                    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, :version => nil, :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 oid.to_s == identifier && 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.where("repository_id = ? AND scmid LIKE ?", repository.id, "#{name}%").first)
                                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{^[/\\]*(.*?)(@([^/\\@]+?))?(#(L\d+))?$}
                                path, rev, anchor = $1, $3, $5
                                link = link_to h("#{project_prefix}#{prefix}:#{repo_prefix}#{name}"), {:controller => 'repositories', :action => (prefix == 'export' ? 'raw' : 'entry'), :id => project, :repository_id => repository.identifier_param,
                                                                        :path => to_path_param(path),
                                                                        :rev => rev,
                                                                        :anchor => anchor},
                                                                       :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.where("identifier = :s OR LOWER(name) = :s", :s => name.downcase).first
                            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(\d)( [^>]+)?>(.+?)<\/h(\d)>)/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
                              (\(([^\n\r]*?)\))?          # optional arguments
                              ([\n\r].*?[\n\r])?          # optional block of text
                              \}\}                        # closing tag
                              )
                             )/mx unless const_defined?(:MACROS_RE)
                MACRO_SUB_RE = /(
                                \{\{
                                macro\((\d+)\)
                                \}\}
                                )/x unless const_defined?(:MACRO_SUB_RE)
                # Extracts macros from text
                def catch_macros(text)
                  macros = {}
                  text.gsub!(MACROS_RE) do
                    all, macro = $1, $4.downcase
                    if macro_exists?(macro) || all =~ MACRO_SUB_RE
                      index = macros.size
                      macros[index] = all
                      "{{macro(#{index})}}"
                    else
                      all
                    end
                  end
                  macros
                end
                # Executes and replaces macros in text
                def inject_macros(text, obj, macros, execute=true)
                  text.gsub!(MACRO_SUB_RE) do
                    all, index = $1, $2.to_i
                    orig = macros.delete(index)
                    if execute && orig && orig =~ MACROS_RE
                      esc, all, macro, args, block = $2, $3, $4.downcase, $6.to_s, $7.try(:strip)
                      if esc.nil?
                        h(exec_macro(macro, obj, args, block) || all)
                      else
                        h(all)
                      end
                    elsif orig
                      h(orig)
                    else
                      h(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
                    # Keep only the 4 first levels
                    headings = headings.select{|level, anchor, item| level <= 4}
                    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)", ""]] : []) + languages_options
                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_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)
                  ActiveSupport::Deprecation.warn "ApplicationHelper#labelled_remote_form_for is deprecated and will be removed in Redmine 2.2."
                  args << {} unless args.last.is_a?(Hash)
                  options = args.last
                  options.merge!({:builder => Redmine::Views::LabelledFormBuilder, :remote => true})
                  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 delete_link(url, options={})
                  options = {
                    :method => :delete,
                    :data => {:confirm => l(:text_are_you_sure)},
                    :class => 'icon icon-del'
                  }.merge(options)
                  link_to l(:button_delete), url, options
                end
                def preview_link(url, form, target='preview', options={})
                  content_tag 'a', l(:label_preview), {
                      :href => "#",
                      :onclick => %|submitPreview("#{escape_javascript url_for(url)}", "#{escape_javascript form}", "#{escape_javascript target}"); return false;|,
                      :accesskey => accesskey(:preview)
                    }.merge(options)
                end
                def link_to_function(name, function, html_options={})
                  content_tag(:a, name, {:href => '#', :onclick => "#{function}; return false;"}.merge(html_options))
                end
                # Helper to render JSON in views
                def raw_json(arg)
                  arg.to_json.to_s.gsub('/', '\/').html_safe
                end
                def back_url
                  url = params[:back_url]
                  if url.nil? && referer = request.env['HTTP_REFERER']
                    url = CGI.unescape(referer.to_s)
                  end
                  url
                end
                def back_url_hidden_field_tag
                  url = back_url
                  hidden_field_tag('back_url', url, :id => nil) unless 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 => 'percent').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 "contextMenuInit('#{ url_for(url) }')"
                end
                def calendar_for(field_id)
                  include_calendar_headers_tags
                  javascript_tag("$(function() { $('##{field_id}').datepicker(datepickerOptions); });")
                end
                def include_calendar_headers_tags
                  unless @calendar_headers_tags_included
                    @calendar_headers_tags_included = true
                    content_for :header_tags do
                      start_of_week = Setting.start_of_week
                      start_of_week = l(:general_first_day_of_week, :default => '1') if start_of_week.blank?
                      # Redmine uses 1..7 (monday..sunday) in settings and locales
                      # JQuery uses 0..6 (sunday..saturday), 7 needs to be changed to 0
                      start_of_week = start_of_week.to_i % 7
                      tags = javascript_tag(
                                 "var datepickerOptions={dateFormat: 'yy-mm-dd', firstDay: #{start_of_week}, " +
                                   "showOn: 'button', buttonImageOnly: true, buttonImage: '" +
                                   path_to_image('/images/calendar.png') +
                                   "', showButtonPanel: true};")
                      jquery_locale = l('jquery.locale', :default => current_language.to_s)
                      unless jquery_locale == 'en'
                        tags << javascript_include_tag("i18n/jquery.ui.datepicker-#{jquery_locale}.js")
                      end
                      tags
                    end
                  end
                end
                # Overrides Rails' stylesheet_link_tag with themes and plugins support.
                # Examples:
                #   stylesheet_link_tag('styles') # => picks styles.css from the current theme or defaults
                #   stylesheet_link_tag('styles', :plugin => 'foo) # => picks styles.css from plugin's assets
                #
                def stylesheet_link_tag(*sources)
                  options = sources.last.is_a?(Hash) ? sources.pop : {}
                  plugin = options.delete(:plugin)
                  sources = sources.map do |source|
                    if plugin
                      "/plugin_assets/#{plugin}/stylesheets/#{source}"
                    elsif current_theme && current_theme.stylesheets.include?(source)
                      current_theme.stylesheet_path(source)
                    else
                      source
                    end
                  end
                  super sources, options
                end
                # Overrides Rails' image_tag with themes and plugins support.
                # Examples:
                #   image_tag('image.png') # => picks image.png from the current theme or defaults
                #   image_tag('image.png', :plugin => 'foo) # => picks image.png from plugin's assets
                #
                def image_tag(source, options={})
                  if plugin = options.delete(:plugin)
                    source = "/plugin_assets/#{plugin}/images/#{source}"
                  elsif current_theme && current_theme.images.include?(source)
                    source = current_theme.image_path(source)
                  end
                  super source, options
                end
                # Overrides Rails' javascript_include_tag with plugins support
                # Examples:
                #   javascript_include_tag('scripts') # => picks scripts.js from defaults
                #   javascript_include_tag('scripts', :plugin => 'foo) # => picks scripts.js from plugin's assets
                #
                def javascript_include_tag(*sources)
                  options = sources.last.is_a?(Hash) ? sources.pop : {}
                  if plugin = options.delete(:plugin)
                    sources = sources.map do |source|
                      if plugin
                        "/plugin_assets/#{plugin}/javascripts/#{source}"
                      else
                        source
                      end
                    end
                  end
                  super sources, options
                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 sidebar_content?
                  has_content?(:sidebar) || view_layouts_base_sidebar_hook_response.present?
                end
                def view_layouts_base_sidebar_hook_response
                  @view_layouts_base_sidebar_hook_response ||= call_hook(:view_layouts_base_sidebar)
                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 => (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)
                  if ''.respond_to?(:encoding) || RUBY_PLATFORM == 'java'
                    anchor.gsub(%r{[^\p{Word}\s\-]}, '').gsub(%r{\s+(\-+\s*)?}, '-')
                  else
                    # TODO: remove when ruby1.8 is no longer supported
                    anchor.gsub(%r{[^\w\s\-]}, '').gsub(%r{\s+(\-+\s*)?}, '-')
                  end
                end
                # Returns the javascript tags that are included in the html layout head
                def javascript_heads
                  tags = javascript_include_tag('jquery-1.8.3-ui-1.9.2-ujs-2.0.3', 'application')
                  unless User.current.pref.warn_on_leaving_unsaved == '0'
                    tags << "\n".html_safe + javascript_tag("$(window).load(function(){ 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/attachments_helper.rb +1 -1

              # encoding: utf-8
              #
              # Redmine - project management software
-             # Copyright (C) 2006-2012  Jean-Philippe Lang
+             # Copyright (C) 2006-2013  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 AttachmentsHelper
                # Displays view/delete links to the attachments of the given object
                # Options:
                #   :author -- author names are not displayed if set to false
                #   :thumbails -- display thumbnails if enabled in settings
                def link_to_attachments(container, options = {})
                  options.assert_valid_keys(:author, :thumbnails)
                  if container.attachments.any?
                    options = {:deletable => container.attachments_deletable?, :author => true}.merge(options)
                    render :partial => 'attachments/links',
                      :locals => {:attachments => container.attachments, :options => options, :thumbnails => (options[:thumbnails] && Setting.thumbnails_enabled?)}
                  end
                end
                def render_api_attachment(attachment, api)
                  api.attachment do
                    api.id attachment.id
                    api.filename attachment.filename
                    api.filesize attachment.filesize
                    api.content_type attachment.content_type
                    api.description attachment.description
                    api.content_url url_for(:controller => 'attachments', :action => 'download', :id => attachment, :filename => attachment.filename, :only_path => false)
                    api.author(:id => attachment.author.id, :name => attachment.author.name) if attachment.author
                    api.created_on attachment.created_on
                  end
                end
              end

app/helpers/auth_sources_helper.rb +1 -1

              # encoding: utf-8
              #
              # Redmine - project management software
-             # Copyright (C) 2006-2012  Jean-Philippe Lang
+             # Copyright (C) 2006-2013  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 AuthSourcesHelper
                def auth_source_partial_name(auth_source)
                  "form_#{auth_source.class.name.underscore}"
                end
              end

app/helpers/boards_helper.rb +1 -1

              # encoding: utf-8
              #
              # Redmine - project management software
-             # Copyright (C) 2006-2012  Jean-Philippe Lang
+             # Copyright (C) 2006-2013  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 BoardsHelper
                def board_breadcrumb(item)
                  board = item.is_a?(Message) ? item.board : item
                  links = [link_to(l(:label_board_plural), project_boards_path(item.project))]
                  boards = board.ancestors.reverse
                  if item.is_a?(Message)
                    boards << board
                  end
                  links += boards.map {|ancestor| link_to(h(ancestor.name), project_board_path(ancestor.project, ancestor))}
                  breadcrumb links
                end
                def boards_options_for_select(boards)
                  options = []
                  Board.board_tree(boards) do |board, level|
                    label = (level > 0 ? '&nbsp;' * 2 * level + '&#187; ' : '').html_safe
                    label << board.name
                    options << [label, board.id]
                  end
                  options
                end
              end

app/helpers/calendars_helper.rb +1 -1

              # encoding: utf-8
              #
              # Redmine - project management software
-             # Copyright (C) 2006-2012  Jean-Philippe Lang
+             # Copyright (C) 2006-2013  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 CalendarsHelper
                def link_to_previous_month(year, month, options={})
                  target_year, target_month = if month == 1
                                                [year - 1, 12]
                                              else
                                                [year, month - 1]
                                              end
                  name = if target_month == 12
                           "#{month_name(target_month)} #{target_year}"
                         else
                           "#{month_name(target_month)}"
                         end
                  # \xc2\xab(utf-8) = &#171;
                  link_to_month(("\xc2\xab " + name), target_year, target_month, options)
                end
                def link_to_next_month(year, month, options={})
                  target_year, target_month = if month == 12
                                                [year + 1, 1]
                                              else
                                                [year, month + 1]
                                              end
                  name = if target_month == 1
                           "#{month_name(target_month)} #{target_year}"
                         else
                           "#{month_name(target_month)}"
                         end
                  # \xc2\xbb(utf-8) = &#187;
                  link_to_month((name + " \xc2\xbb"), target_year, target_month, options)
                end
                def link_to_month(link_name, year, month, options={})
                  link_to_content_update(h(link_name), params.merge(:year => year, :month => month))
                end
              end

app/helpers/context_menus_helper.rb +1 -1

              # encoding: utf-8
              #
              # Redmine - project management software
-             # Copyright (C) 2006-2012  Jean-Philippe Lang
+             # Copyright (C) 2006-2013  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 ContextMenusHelper
                def context_menu_link(name, url, options={})
                  options[:class] ||= ''
                  if options.delete(:selected)
                    options[:class] << ' icon-checked disabled'
                    options[:disabled] = true
                  end
                  if options.delete(:disabled)
                    options.delete(:method)
                    options.delete(:data)
                    options[:onclick] = 'return false;'
                    options[:class] << ' disabled'
                    url = '#'
                  end
                  link_to h(name), url, options
                end
                def bulk_update_custom_field_context_menu_link(field, text, value)
                  context_menu_link h(text),
                    bulk_update_issues_path(:ids => @issue_ids, :issue => {'custom_field_values' => {field.id => value}}, :back_url => @back),
                    :method => :post,
                    :selected => (@issue && @issue.custom_field_value(field) == value)
                end
              end

app/helpers/custom_fields_helper.rb +1 -1

              # encoding: utf-8
              #
              # Redmine - project management software
-             # Copyright (C) 2006-2012  Jean-Philippe Lang
+             # Copyright (C) 2006-2013  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 CustomFieldsHelper
                def custom_fields_tabs
                  CustomField::CUSTOM_FIELDS_TABS
                end
                # Return custom field html tag corresponding to its format
                def custom_field_tag(name, custom_value)
                  custom_field = custom_value.custom_field
                  field_name = "#{name}[custom_field_values][#{custom_field.id}]"
                  field_name << "[]" if custom_field.multiple?
                  field_id = "#{name}_custom_field_values_#{custom_field.id}"
                  tag_options = {:id => field_id, :class => "#{custom_field.field_format}_cf"}
                  field_format = Redmine::CustomFieldFormat.find_by_name(custom_field.field_format)
                  case field_format.try(:edit_as)
                  when "date"
                    text_field_tag(field_name, custom_value.value, tag_options.merge(:size => 10)) +
                    calendar_for(field_id)
                  when "text"
                    text_area_tag(field_name, custom_value.value, tag_options.merge(:rows => 3))
                  when "bool"
                    hidden_field_tag(field_name, '0') + check_box_tag(field_name, '1', custom_value.true?, tag_options)
                  when "list"
                    blank_option = ''.html_safe
                    unless custom_field.multiple?
                      if custom_field.is_required?
                        unless custom_field.default_value.present?
                          blank_option = content_tag('option', "--- #{l(:actionview_instancetag_blank_option)} ---", :value => '')
                        end
                      else
                        blank_option = content_tag('option')
                      end
                    end
                    s = select_tag(field_name, blank_option + options_for_select(custom_field.possible_values_options(custom_value.customized), custom_value.value),
                      tag_options.merge(:multiple => custom_field.multiple?))
                    if custom_field.multiple?
                      s << hidden_field_tag(field_name, '')
                    end
                    s
                  else
                    text_field_tag(field_name, custom_value.value, tag_options)
                  end
                end
                # Return custom field label tag
                def custom_field_label_tag(name, custom_value, options={})
                  required = options[:required] || custom_value.custom_field.is_required?
                  content_tag "label", h(custom_value.custom_field.name) +
                    (required ? " <span class=\"required\">*</span>".html_safe : ""),
                    :for => "#{name}_custom_field_values_#{custom_value.custom_field.id}"
                end
                # Return custom field tag with its label tag
                def custom_field_tag_with_label(name, custom_value, options={})
                  custom_field_label_tag(name, custom_value, options) + custom_field_tag(name, custom_value)
                end
                def custom_field_tag_for_bulk_edit(name, custom_field, projects=nil)
                  field_name = "#{name}[custom_field_values][#{custom_field.id}]"
                  field_name << "[]" if custom_field.multiple?
                  field_id = "#{name}_custom_field_values_#{custom_field.id}"
                  tag_options = {:id => field_id, :class => "#{custom_field.field_format}_cf"}
                  field_format = Redmine::CustomFieldFormat.find_by_name(custom_field.field_format)
                  case field_format.try(:edit_as)
                    when "date"
                      text_field_tag(field_name, '', tag_options.merge(:size => 10)) +
                      calendar_for(field_id)
                    when "text"
                      text_area_tag(field_name, '', tag_options.merge(:rows => 3))
                    when "bool"
                      select_tag(field_name, options_for_select([[l(:label_no_change_option), ''],
                                                                 [l(:general_text_yes), '1'],
                                                                 [l(:general_text_no), '0']]), tag_options)
                    when "list"
                      options = []
                      options << [l(:label_no_change_option), ''] unless custom_field.multiple?
                      options << [l(:label_none), '__none__'] unless custom_field.is_required?
                      options += custom_field.possible_values_options(projects)
                      select_tag(field_name, options_for_select(options), tag_options.merge(:multiple => custom_field.multiple?))
                    else
                      text_field_tag(field_name, '', tag_options)
                  end
                end
                # Return a string used to display a custom value
                def show_value(custom_value)
                  return "" unless custom_value
                  format_value(custom_value.value, custom_value.custom_field.field_format)
                end
                # Return a string used to display a custom value
                def format_value(value, field_format)
                  if value.is_a?(Array)
                    value.collect {|v| format_value(v, field_format)}.compact.sort.join(', ')
                  else
                    Redmine::CustomFieldFormat.format_value(value, field_format)
                  end
                end
                # Return an array of custom field formats which can be used in select_tag
                def custom_field_formats_for_select(custom_field)
                  Redmine::CustomFieldFormat.as_select(custom_field.class.customized_class.name)
                end
                # Renders the custom_values in api views
                def render_api_custom_values(custom_values, api)
                  api.array :custom_fields do
                    custom_values.each do |custom_value|
                      attrs = {:id => custom_value.custom_field_id, :name => custom_value.custom_field.name}
                      attrs.merge!(:multiple => true) if custom_value.custom_field.multiple?
                      api.custom_field attrs do
                        if custom_value.value.is_a?(Array)
                          api.array :value do
                            custom_value.value.each do |value|
                              api.value value unless value.blank?
                            end
                          end
                        else
                          api.value custom_value.value
                        end
                      end
                    end
                  end unless custom_values.empty?
                end
              end

app/helpers/documents_helper.rb +1 -1

              # encoding: utf-8
              #
              # Redmine - project management software
-             # Copyright (C) 2006-2012  Jean-Philippe Lang
+             # Copyright (C) 2006-2013  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 DocumentsHelper
              end

app/helpers/enumerations_helper.rb +1 -1

              # encoding: utf-8
              #
              # Redmine - project management software
-             # Copyright (C) 2006-2012  Jean-Philippe Lang
+             # Copyright (C) 2006-2013  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 EnumerationsHelper
              end

app/helpers/gantt_helper.rb +1 -1

              # encoding: utf-8
              #
              # Redmine - project management software
-             # Copyright (C) 2006-2012  Jean-Philippe Lang
+             # Copyright (C) 2006-2013  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 GanttHelper
                def gantt_zoom_link(gantt, in_or_out)
                  case in_or_out
                  when :in
                    if gantt.zoom < 4
                      link_to_content_update l(:text_zoom_in),
                        params.merge(gantt.params.merge(:zoom => (gantt.zoom + 1))),
                        :class => 'icon icon-zoom-in'
                    else
                      content_tag(:span, l(:text_zoom_in), :class => 'icon icon-zoom-in').html_safe
                    end
                  when :out
                    if gantt.zoom > 1
                      link_to_content_update l(:text_zoom_out),
                        params.merge(gantt.params.merge(:zoom => (gantt.zoom - 1))),
                        :class => 'icon icon-zoom-out'
                    else
                      content_tag(:span, l(:text_zoom_out), :class => 'icon icon-zoom-out').html_safe
                    end
                  end
                end
              end

app/helpers/groups_helper.rb +1 -1

              # encoding: utf-8
              #
              # Redmine - project management software
-             # Copyright (C) 2006-2012  Jean-Philippe Lang
+             # Copyright (C) 2006-2013  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 GroupsHelper
                def group_settings_tabs
                  tabs = [{:name => 'general', :partial => 'groups/general', :label => :label_general},
                          {:name => 'users', :partial => 'groups/users', :label => :label_user_plural},
                          {:name => 'memberships', :partial => 'groups/memberships', :label => :label_project_plural}
                          ]
                end
              end

app/helpers/issue_categories_helper.rb +1 -1

              # encoding: utf-8
              #
              # Redmine - project management software
-             # Copyright (C) 2006-2012  Jean-Philippe Lang
+             # Copyright (C) 2006-2013  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 IssueCategoriesHelper
              end

app/helpers/issue_relations_helper.rb +1 -1

              # encoding: utf-8
              #
              # Redmine - project management software
-             # Copyright (C) 2006-2012  Jean-Philippe Lang
+             # Copyright (C) 2006-2013  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 IssueRelationsHelper
                def collection_for_relation_type_select
                  values = IssueRelation::TYPES
                  values.keys.sort{|x,y| values[x][:order] <=> values[y][:order]}.collect{|k| [l(values[k][:name]), k]}
                end
              end

app/helpers/issue_statuses_helper.rb +1 -1

              # encoding: utf-8
              #
              # Redmine - project management software
-             # Copyright (C) 2006-2012  Jean-Philippe Lang
+             # Copyright (C) 2006-2013  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 IssueStatusesHelper
              end

app/helpers/issues_helper.rb +1 -1

              # encoding: utf-8
              #
              # Redmine - project management software
-             # Copyright (C) 2006-2012  Jean-Philippe Lang
+             # Copyright (C) 2006-2013  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 IssuesHelper
                include ApplicationHelper
                def issue_list(issues, &block)
                  ancestors = []
                  issues.each do |issue|
                    while (ancestors.any? && !issue.is_descendant_of?(ancestors.last))
                      ancestors.pop
                    end
                    yield issue, ancestors.size
                    ancestors << issue unless issue.leaf?
                  end
                end
                # Renders a HTML/CSS tooltip
                #
                # To use, a trigger div is needed.  This is a div with the class of "tooltip"
                # that contains this method wrapped in a span with the class of "tip"
                #
                #    <div class="tooltip"><%= link_to_issue(issue) %>
                #      <span class="tip"><%= render_issue_tooltip(issue) %></span>
                #    </div>
                #
                def render_issue_tooltip(issue)
                  @cached_label_status ||= l(:field_status)
                  @cached_label_start_date ||= l(:field_start_date)
                  @cached_label_due_date ||= l(:field_due_date)
                  @cached_label_assigned_to ||= l(:field_assigned_to)
                  @cached_label_priority ||= l(:field_priority)
                  @cached_label_project ||= l(:field_project)
                  link_to_issue(issue) + "<br /><br />".html_safe +
                    "<strong>#{@cached_label_project}</strong>: #{link_to_project(issue.project)}<br />".html_safe +
                    "<strong>#{@cached_label_status}</strong>: #{h(issue.status.name)}<br />".html_safe +
                    "<strong>#{@cached_label_start_date}</strong>: #{format_date(issue.start_date)}<br />".html_safe +
                    "<strong>#{@cached_label_due_date}</strong>: #{format_date(issue.due_date)}<br />".html_safe +
                    "<strong>#{@cached_label_assigned_to}</strong>: #{h(issue.assigned_to)}<br />".html_safe +
                    "<strong>#{@cached_label_priority}</strong>: #{h(issue.priority.name)}".html_safe
                end
                def issue_heading(issue)
                  h("#{issue.tracker} ##{issue.id}")
                end
                def render_issue_subject_with_tree(issue)
                  s = ''
                  ancestors = issue.root? ? [] : issue.ancestors.visible.all
                  ancestors.each do |ancestor|
                    s << '<div>' + content_tag('p', link_to_issue(ancestor, :project => (issue.project_id != ancestor.project_id)))
                  end
                  s << '<div>'
                  subject = h(issue.subject)
                  if issue.is_private?
                    subject = content_tag('span', l(:field_is_private), :class => 'private') + ' ' + subject
                  end
                  s << content_tag('h3', subject)
                  s << '</div>' * (ancestors.size + 1)
                  s.html_safe
                end
                def render_descendants_tree(issue)
                  s = '<form><table class="list issues">'
                  issue_list(issue.descendants.visible.sort_by(&:lft)) do |child, level|
                    css = "issue issue-#{child.id} hascontextmenu"
                    css << " idnt idnt-#{level}" if level > 0
                    s << content_tag('tr',
                           content_tag('td', check_box_tag("ids[]", child.id, false, :id => nil), :class => 'checkbox') +
                           content_tag('td', link_to_issue(child, :truncate => 60, :project => (issue.project_id != child.project_id)), :class => 'subject') +
                           content_tag('td', h(child.status)) +
                           content_tag('td', link_to_user(child.assigned_to)) +
                           content_tag('td', progress_bar(child.done_ratio, :width => '80px')),
                           :class => css)
                  end
                  s << '</table></form>'
                  s.html_safe
                end
                # Returns a link for adding a new subtask to the given issue
                def link_to_new_subtask(issue)
                  attrs = {
                    :tracker_id => issue.tracker,
                    :parent_issue_id => issue
                  }
                  link_to(l(:button_add), new_project_issue_path(issue.project, :issue => attrs))
                end
                class IssueFieldsRows
                  include ActionView::Helpers::TagHelper
                  def initialize
                    @left = []
                    @right = []
                  end
                  def left(*args)
                    args.any? ? @left << cells(*args) : @left
                  end
                  def right(*args)
                    args.any? ? @right << cells(*args) : @right
                  end
                  def size
                    @left.size > @right.size ? @left.size : @right.size
                  end
                  def to_html
                    html = ''.html_safe
                    blank = content_tag('th', '') + content_tag('td', '')
                    size.times do |i|
                      left = @left[i] || blank
                      right = @right[i] || blank
                      html << content_tag('tr', left + right)
                    end
                    html
                  end
                  def cells(label, text, options={})
                    content_tag('th', "#{label}:", options) + content_tag('td', text, options)
                  end
                end
                def issue_fields_rows
                  r = IssueFieldsRows.new
                  yield r
                  r.to_html
                end
                def render_custom_fields_rows(issue)
                  return if issue.custom_field_values.empty?
                  ordered_values = []
                  half = (issue.custom_field_values.size / 2.0).ceil
                  half.times do |i|
                    ordered_values << issue.custom_field_values[i]
                    ordered_values << issue.custom_field_values[i + half]
                  end
                  s = "<tr>\n"
                  n = 0
                  ordered_values.compact.each do |value|
                    s << "</tr>\n<tr>\n" if n > 0 && (n % 2) == 0
                    s << "\t<th>#{ h(value.custom_field.name) }:</th><td>#{ simple_format_without_paragraph(h(show_value(value))) }</td>\n"
                    n += 1
                  end
                  s << "</tr>\n"
                  s.html_safe
                end
                def issues_destroy_confirmation_message(issues)
                  issues = [issues] unless issues.is_a?(Array)
                  message = l(:text_issues_destroy_confirmation)
                  descendant_count = issues.inject(0) {|memo, i| memo += (i.right - i.left - 1)/2}
                  if descendant_count > 0
                    issues.each do |issue|
                      next if issue.root?
                      issues.each do |other_issue|
                        descendant_count -= 1 if issue.is_descendant_of?(other_issue)
                      end
                    end
                    if descendant_count > 0
                      message << "\n" + l(:text_issues_destroy_descendants_confirmation, :count => descendant_count)
                    end
                  end
                  message
                end
                def sidebar_queries
                  unless @sidebar_queries
                    @sidebar_queries = IssueQuery.visible.all(
                      :order => "#{Query.table_name}.name ASC",
                      # Project specific queries and global queries
                      :conditions => (@project.nil? ? ["project_id IS NULL"] : ["project_id IS NULL OR project_id = ?", @project.id])
                    )
                  end
                  @sidebar_queries
                end
                def query_links(title, queries)
                  # links to #index on issues/show
                  url_params = controller_name == 'issues' ? {:controller => 'issues', :action => 'index', :project_id => @project} : params
                  content_tag('h3', h(title)) +
                    queries.collect {|query|
                        css = 'query'
                        css << ' selected' if query == @query
                        link_to(h(query.name), url_params.merge(:query_id => query), :class => css)
                      }.join('<br />').html_safe
                end
                def render_sidebar_queries
                  out = ''.html_safe
                  queries = sidebar_queries.select {|q| !q.is_public?}
                  out << query_links(l(:label_my_queries), queries) if queries.any?
                  queries = sidebar_queries.select {|q| q.is_public?}
                  out << query_links(l(:label_query_plural), queries) if queries.any?
                  out
                end
                # Returns the textual representation of a journal details
                # as an array of strings
                def details_to_strings(details, no_html=false, options={})
                  options[:only_path] = (options[:only_path] == false ? false : true)
                  strings = []
                  values_by_field = {}
                  details.each do |detail|
                    if detail.property == 'cf'
                      field_id = detail.prop_key
                      field = CustomField.find_by_id(field_id)
                      if field && field.multiple?
                        values_by_field[field_id] ||= {:added => [], :deleted => []}
                        if detail.old_value
                          values_by_field[field_id][:deleted] << detail.old_value
                        end
                        if detail.value
                          values_by_field[field_id][:added] << detail.value
                        end
                        next
                      end
                    end
                    strings << show_detail(detail, no_html, options)
                  end
                  values_by_field.each do |field_id, changes|
                    detail = JournalDetail.new(:property => 'cf', :prop_key => field_id)
                    if changes[:added].any?
                      detail.value = changes[:added]
                      strings << show_detail(detail, no_html, options)
                    elsif changes[:deleted].any?
                      detail.old_value = changes[:deleted]
                      strings << show_detail(detail, no_html, options)
                    end
                  end
                  strings
                end
                # Returns the textual representation of a single journal detail
                def show_detail(detail, no_html=false, options={})
                  multiple = false
                  case detail.property
                  when 'attr'
                    field = detail.prop_key.to_s.gsub(/\_id$/, "")
                    label = l(("field_" + field).to_sym)
                    case detail.prop_key
                    when 'due_date', 'start_date'
                      value = format_date(detail.value.to_date) if detail.value
                      old_value = format_date(detail.old_value.to_date) if detail.old_value
                    when 'project_id', 'status_id', 'tracker_id', 'assigned_to_id',
                          'priority_id', 'category_id', 'fixed_version_id'
                      value = find_name_by_reflection(field, detail.value)
                      old_value = find_name_by_reflection(field, detail.old_value)
                    when 'estimated_hours'
                      value = "%0.02f" % detail.value.to_f unless detail.value.blank?
                      old_value = "%0.02f" % detail.old_value.to_f unless detail.old_value.blank?
                    when 'parent_id'
                      label = l(:field_parent_issue)
                      value = "##{detail.value}" unless detail.value.blank?
                      old_value = "##{detail.old_value}" unless detail.old_value.blank?
                    when 'is_private'
                      value = l(detail.value == "0" ? :general_text_No : :general_text_Yes) unless detail.value.blank?
                      old_value = l(detail.old_value == "0" ? :general_text_No : :general_text_Yes) unless detail.old_value.blank?
                    end
                  when 'cf'
                    custom_field = CustomField.find_by_id(detail.prop_key)
                    if custom_field
                      multiple = custom_field.multiple?
                      label = custom_field.name
                      value = format_value(detail.value, custom_field.field_format) if detail.value
                      old_value = format_value(detail.old_value, custom_field.field_format) if detail.old_value
                    end
                  when 'attachment'
                    label = l(:label_attachment)
                  end
                  call_hook(:helper_issues_show_detail_after_setting,
                            {:detail => detail, :label => label, :value => value, :old_value => old_value })
                  label ||= detail.prop_key
                  value ||= detail.value
                  old_value ||= detail.old_value
                  unless no_html
                    label = content_tag('strong', label)
                    old_value = content_tag("i", h(old_value)) if detail.old_value
                    old_value = content_tag("del", old_value) if detail.old_value and detail.value.blank?
                    if detail.property == 'attachment' && !value.blank? && atta = Attachment.find_by_id(detail.prop_key)
                      # Link to the attachment if it has not been removed
                      value = link_to_attachment(atta, :download => true, :only_path => options[:only_path])
                      if options[:only_path] != false && atta.is_text?
                        value += link_to(
                                     image_tag('magnifier.png'),
                                     :controller => 'attachments', :action => 'show',
                                     :id => atta, :filename => atta.filename
                                   )
                      end
                    else
                      value = content_tag("i", h(value)) if value
                    end
                  end
                  if detail.property == 'attr' && detail.prop_key == 'description'
                    s = l(:text_journal_changed_no_detail, :label => label)
                    unless no_html
                      diff_link = link_to 'diff',
                        {:controller => 'journals', :action => 'diff', :id => detail.journal_id,
                         :detail_id => detail.id, :only_path => options[:only_path]},
                        :title => l(:label_view_diff)
                      s << " (#{ diff_link })"
                    end
                    s.html_safe
                  elsif detail.value.present?
                    case detail.property
                    when 'attr', 'cf'
                      if detail.old_value.present?
                        l(:text_journal_changed, :label => label, :old => old_value, :new => value).html_safe
                      elsif multiple
                        l(:text_journal_added, :label => label, :value => value).html_safe
                      else
                        l(:text_journal_set_to, :label => label, :value => value).html_safe
                      end
                    when 'attachment'
                      l(:text_journal_added, :label => label, :value => value).html_safe
                    end
                  else
                    l(:text_journal_deleted, :label => label, :old => old_value).html_safe
                  end
                end
                # Find the name of an associated record stored in the field attribute
                def find_name_by_reflection(field, id)
                  unless id.present?
                    return nil
                  end
                  association = Issue.reflect_on_association(field.to_sym)
                  if association
                    record = association.class_name.constantize.find_by_id(id)
                    return record.name if record
                  end
                end
                # Renders issue children recursively
                def render_api_issue_children(issue, api)
                  return if issue.leaf?
                  api.array :children do
                    issue.children.each do |child|
                      api.issue(:id => child.id) do
                        api.tracker(:id => child.tracker_id, :name => child.tracker.name) unless child.tracker.nil?
                        api.subject child.subject
                        render_api_issue_children(child, api)
                      end
                    end
                  end
                end
                def issues_to_csv(issues, project, query, options={})
                  decimal_separator = l(:general_csv_decimal_separator)
                  encoding = l(:general_csv_encoding)
                  columns = (options[:columns] == 'all' ? query.available_inline_columns : query.inline_columns)
                  if options[:description]
                    if description = query.available_columns.detect {|q| q.name == :description}
                      columns << description
                    end
                  end
                  export = FCSV.generate(:col_sep => l(:general_csv_separator)) do |csv|
                    # csv header fields
                    csv << [ "#" ] + columns.collect {|c| Redmine::CodesetUtil.from_utf8(c.caption.to_s, encoding) }
                    # csv lines
                    issues.each do |issue|
                      col_values = columns.collect do |column|
                        s = if column.is_a?(QueryCustomFieldColumn)
                          cv = issue.custom_field_values.detect {|v| v.custom_field_id == column.custom_field.id}
                          show_value(cv)
                        else
                          value = column.value(issue)
                          if value.is_a?(Date)
                            format_date(value)
                          elsif value.is_a?(Time)
                            format_time(value)
                          elsif value.is_a?(Float)
                            ("%.2f" % value).gsub('.', decimal_separator)
                          else
                            value
                          end
                        end
                        s.to_s
                      end
                      csv << [ issue.id.to_s ] + col_values.collect {|c| Redmine::CodesetUtil.from_utf8(c.to_s, encoding) }
                    end
                  end
                  export
                end
              end

app/helpers/journals_helper.rb +1 -1

              # encoding: utf-8
              #
              # Redmine - project management software
-             # Copyright (C) 2006-2012  Jean-Philippe Lang
+             # Copyright (C) 2006-2013  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 JournalsHelper
                def render_notes(issue, journal, options={})
                  content = ''
                  editable = User.current.logged? && (User.current.allowed_to?(:edit_issue_notes, issue.project) || (journal.user == User.current && User.current.allowed_to?(:edit_own_issue_notes, issue.project)))
                  links = []
                  if !journal.notes.blank?
                    links << link_to(image_tag('comment.png'),
                                     {:controller => 'journals', :action => 'new', :id => issue, :journal_id => journal},
                                     :remote => true,
                                     :method => 'post',
                                     :title => l(:button_quote)) if options[:reply_links]
                    links << link_to_in_place_notes_editor(image_tag('edit.png'), "journal-#{journal.id}-notes",
                                                           { :controller => 'journals', :action => 'edit', :id => journal, :format => 'js' },
                                                              :title => l(:button_edit)) if editable
                  end
                  content << content_tag('div', links.join(' ').html_safe, :class => 'contextual') unless links.empty?
                  content << textilizable(journal, :notes)
                  css_classes = "wiki"
                  css_classes << " editable" if editable
                  content_tag('div', content.html_safe, :id => "journal-#{journal.id}-notes", :class => css_classes)
                end
                def link_to_in_place_notes_editor(text, field_id, url, options={})
                  onclick = "$.ajax({url: '#{url_for(url)}', type: 'get'}); return false;"
                  link_to text, '#', options.merge(:onclick => onclick)
                end
              end

app/helpers/mail_handler_helper.rb +1 -1

              # encoding: utf-8
              #
              # Redmine - project management software
-             # Copyright (C) 2006-2012  Jean-Philippe Lang
+             # Copyright (C) 2006-2013  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 MailHandlerHelper
              end

app/helpers/members_helper.rb +1 -1

              # encoding: utf-8
              #
              # Redmine - project management software
-             # Copyright (C) 2006-2012  Jean-Philippe Lang
+             # Copyright (C) 2006-2013  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 MembersHelper
              end

app/helpers/messages_helper.rb +1 -1

              # encoding: utf-8
              #
              # Redmine - project management software
-             # Copyright (C) 2006-2012  Jean-Philippe Lang
+             # Copyright (C) 2006-2013  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 MessagesHelper
              end

app/helpers/my_helper.rb +1 -1

              # encoding: utf-8
              #
              # Redmine - project management software
-             # Copyright (C) 2006-2012  Jean-Philippe Lang
+             # Copyright (C) 2006-2013  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 MyHelper
                def calendar_items(startdt, enddt)
                  Issue.visible.
                    where(:project_id => User.current.projects.map(&:id)).
                    where("(start_date>=? and start_date<=?) or (due_date>=? and due_date<=?)", startdt, enddt, startdt, enddt).
                    includes(:project, :tracker, :priority, :assigned_to).
                    all
                end
                def documents_items
                  Document.visible.order("#{Document.table_name}.created_on DESC").limit(10).all
                end
                def issuesassignedtome_items
                  Issue.visible.open.
                    where(:assigned_to_id => ([User.current.id] + User.current.group_ids)).
                    limit(10).
                    includes(:status, :project, :tracker, :priority).
                    order("#{IssuePriority.table_name}.position DESC, #{Issue.table_name}.updated_on DESC").
                    all
                end
                def issuesreportedbyme_items
                  Issue.visible.
                    where(:author_id => User.current.id).
                    limit(10).
                    includes(:status, :project, :tracker).
                    order("#{Issue.table_name}.updated_on DESC").
                    all
                end
                def issueswatched_items
                  Issue.visible.on_active_project.watched_by(User.current.id).recently_updated.limit(10).all
                end
                def news_items
                  News.visible.
                    where(:project_id => User.current.projects.map(&:id)).
                    limit(10).
                    includes(:project, :author).
                    order("#{News.table_name}.created_on DESC").
                    all
                end
                def timelog_items
                  TimeEntry.
                    where("#{TimeEntry.table_name}.user_id = ? AND #{TimeEntry.table_name}.spent_on BETWEEN ? AND ?", User.current.id, Date.today - 6, Date.today).
                    includes(:activity, :project, {:issue => [:tracker, :status]}).
                    order("#{TimeEntry.table_name}.spent_on DESC, #{Project.table_name}.name ASC, #{Tracker.table_name}.position ASC, #{Issue.table_name}.id ASC").
                    all
                end
              end

app/helpers/news_helper.rb +1 -1

              # encoding: utf-8
              #
              # Redmine - project management software
-             # Copyright (C) 2006-2012  Jean-Philippe Lang
+             # Copyright (C) 2006-2013  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 NewsHelper
              end

app/helpers/projects_helper.rb +1 -1

              # encoding: utf-8
              #
              # Redmine - project management software
-             # Copyright (C) 2006-2012  Jean-Philippe Lang
+             # Copyright (C) 2006-2013  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 ProjectsHelper
                def link_to_version(version, options = {})
                  return '' unless version && version.is_a?(Version)
                  link_to_if version.visible?, format_version_name(version), { :controller => 'versions', :action => 'show', :id => version }, options
                end
                def project_settings_tabs
                  tabs = [{:name => 'info', :action => :edit_project, :partial => 'projects/edit', :label => :label_information_plural},
                          {:name => 'modules', :action => :select_project_modules, :partial => 'projects/settings/modules', :label => :label_module_plural},
                          {:name => 'members', :action => :manage_members, :partial => 'projects/settings/members', :label => :label_member_plural},
                          {:name => 'versions', :action => :manage_versions, :partial => 'projects/settings/versions', :label => :label_version_plural},
                          {:name => 'categories', :action => :manage_categories, :partial => 'projects/settings/issue_categories', :label => :label_issue_category_plural},
                          {:name => 'wiki', :action => :manage_wiki, :partial => 'projects/settings/wiki', :label => :label_wiki},
                          {:name => 'repositories', :action => :manage_repository, :partial => 'projects/settings/repositories', :label => :label_repository_plural},
                          {:name => 'boards', :action => :manage_boards, :partial => 'projects/settings/boards', :label => :label_board_plural},
                          {:name => 'activities', :action => :manage_project_activities, :partial => 'projects/settings/activities', :label => :enumeration_activities}
                          ]
                  tabs.select {|tab| User.current.allowed_to?(tab[:action], @project)}
                end
                def parent_project_select_tag(project)
                  selected = project.parent
                  # retrieve the requested parent project
                  parent_id = (params[:project] && params[:project][:parent_id]) || params[:parent_id]
                  if parent_id
                    selected = (parent_id.blank? ? nil : Project.find(parent_id))
                  end
                  options = ''
                  options << "<option value=''></option>" if project.allowed_parents.include?(nil)
                  options << project_tree_options_for_select(project.allowed_parents.compact, :selected => selected)
                  content_tag('select', options.html_safe, :name => 'project[parent_id]', :id => 'project_parent_id')
                end
                # Renders the projects index
                def render_project_hierarchy(projects)
                  render_project_nested_lists(projects) do |project|
                    s = link_to_project(project, {}, :class => "#{project.css_classes} #{User.current.member_of?(project) ? 'my-project' : nil}")
                    if project.description.present?
                      s << content_tag('div', textilizable(project.short_description, :project => project), :class => 'wiki description')
                    end
                    s
                  end
                end
                # Returns a set of options for a select field, grouped by project.
                def version_options_for_select(versions, selected=nil)
                  grouped = Hash.new {|h,k| h[k] = []}
                  versions.each do |version|
                    grouped[version.project.name] << [version.name, version.id]
                  end
                  if grouped.keys.size > 1
                    grouped_options_for_select(grouped, selected && selected.id)
                  else
                    options_for_select((grouped.values.first || []), selected && selected.id)
                  end
                end
                def format_version_sharing(sharing)
                  sharing = 'none' unless Version::VERSION_SHARINGS.include?(sharing)
                  l("label_version_sharing_#{sharing}")
                end
              end

app/helpers/queries_helper.rb +1 -1

              # encoding: utf-8
              #
              # Redmine - project management software
-             # Copyright (C) 2006-2012  Jean-Philippe Lang
+             # Copyright (C) 2006-2013  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 QueriesHelper
                def filters_options_for_select(query)
                  options_for_select(filters_options(query))
                end
                def filters_options(query)
                  options = [[]]
                  sorted_options = query.available_filters.sort do |a, b|
                    ord = 0
                    if !(a[1][:order] == 20 && b[1][:order] == 20)
                      ord = a[1][:order] <=> b[1][:order]
                    else
                      cn = (CustomField::CUSTOM_FIELDS_NAMES.index(a[1][:field].class.name) <=>
                              CustomField::CUSTOM_FIELDS_NAMES.index(b[1][:field].class.name))
                      if cn != 0
                        ord = cn
                      else
                        f = (a[1][:field] <=> b[1][:field])
                        if f != 0
                          ord = f
                        else
                          # assigned_to or author
                          ord = (a[0] <=> b[0])
                        end
                      end
                    end
                    ord
                  end
                  options += sorted_options.map do |field, field_options|
                    [field_options[:name], field]
                  end
                end
                def available_block_columns_tags(query)
                  tags = ''.html_safe
                  query.available_block_columns.each do |column|
                    tags << content_tag('label', check_box_tag('c[]', column.name.to_s, query.has_column?(column)) + " #{column.caption}", :class => 'inline')
                  end
                  tags
                end
                def column_header(column)
                  column.sortable ? sort_header_tag(column.name.to_s, :caption => column.caption,
                                                                      :default_order => column.default_order) :
                                    content_tag('th', h(column.caption))
                end
                def column_content(column, issue)
                  value = column.value(issue)
                  if value.is_a?(Array)
                    value.collect {|v| column_value(column, issue, v)}.compact.join(', ').html_safe
                  else
                    column_value(column, issue, value)
                  end
                end
                def column_value(column, issue, value)
                  case value.class.name
                  when 'String'
                    if column.name == :subject
                      link_to(h(value), :controller => 'issues', :action => 'show', :id => issue)
                    elsif column.name == :description
                      issue.description? ? content_tag('div', textilizable(issue, :description), :class => "wiki") : ''
                    else
                      h(value)
                    end
                  when 'Time'
                    format_time(value)
                  when 'Date'
                    format_date(value)
                  when 'Fixnum', 'Float'
                    if column.name == :done_ratio
                      progress_bar(value, :width => '80px')
                    elsif  column.name == :spent_hours
                      sprintf "%.2f", value
                    elsif column.name == :hours
                      html_hours("%.2f" % value)
                    else
                      h(value.to_s)
                    end
                  when 'User'
                    link_to_user value
                  when 'Project'
                    link_to_project value
                  when 'Version'
                    link_to(h(value), :controller => 'versions', :action => 'show', :id => value)
                  when 'TrueClass'
                    l(:general_text_Yes)
                  when 'FalseClass'
                    l(:general_text_No)
                  when 'Issue'
                    value.visible? ? link_to_issue(value) : "##{value.id}"
                  when 'IssueRelation'
                    other = value.other_issue(issue)
                    content_tag('span',
                      (l(value.label_for(issue)) + " " + link_to_issue(other, :subject => false, :tracker => false)).html_safe,
                      :class => value.css_classes_for(issue))
                  else
                    h(value)
                  end
                end
                # Retrieve query from session or build a new query
                def retrieve_query
                  if !params[:query_id].blank?
                    cond = "project_id IS NULL"
                    cond << " OR project_id = #{@project.id}" if @project
                    @query = IssueQuery.find(params[:query_id], :conditions => cond)
                    raise ::Unauthorized unless @query.visible?
                    @query.project = @project
                    session[:query] = {:id => @query.id, :project_id => @query.project_id}
                    sort_clear
                  elsif api_request? || params[:set_filter] || session[:query].nil? || session[:query][:project_id] != (@project ? @project.id : nil)
                    # Give it a name, required to be valid
                    @query = IssueQuery.new(:name => "_")
                    @query.project = @project
                    @query.build_from_params(params)
                    session[:query] = {:project_id => @query.project_id, :filters => @query.filters, :group_by => @query.group_by, :column_names => @query.column_names}
                  else
                    # retrieve from session
                    @query = IssueQuery.find_by_id(session[:query][:id]) if session[:query][:id]
                    @query ||= IssueQuery.new(:name => "_", :filters => session[:query][:filters], :group_by => session[:query][:group_by], :column_names => session[:query][:column_names])
                    @query.project = @project
                  end
                end
                def retrieve_query_from_session
                  if session[:query]
                    if session[:query][:id]
                      @query = IssueQuery.find_by_id(session[:query][:id])
                      return unless @query
                    else
                      @query = IssueQuery.new(:name => "_", :filters => session[:query][:filters], :group_by => session[:query][:group_by], :column_names => session[:query][:column_names])
                    end
                    if session[:query].has_key?(:project_id)
                      @query.project_id = session[:query][:project_id]
                    else
                      @query.project = @project
                    end
                    @query
                  end
                end
              end

app/helpers/reports_helper.rb +1 -1

              # encoding: utf-8
              #
              # Redmine - project management software
-             # Copyright (C) 2006-2012  Jean-Philippe Lang
+             # Copyright (C) 2006-2013  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 ReportsHelper
                def aggregate(data, criteria)
                  a = 0
                  data.each { |row|
                    match = 1
                    criteria.each { |k, v|
                      match = 0 unless (row[k].to_s == v.to_s) || (k == 'closed' && row[k] == (v == 0 ? "f" : "t"))
                    } unless criteria.nil?
                    a = a + row["total"].to_i if match == 1
                  } unless data.nil?
                  a
                end
                def aggregate_link(data, criteria, *args)
                  a = aggregate data, criteria
                  a > 0 ? link_to(h(a), *args) : '-'
                end
                def aggregate_path(project, field, row, options={})
                  parameters = {:set_filter => 1, :subproject_id => '!*', field => row.id}.merge(options)
                  project_issues_path(row.is_a?(Project) ? row : project, parameters)
                end
              end

app/helpers/repositories_helper.rb +1 -1

              # encoding: utf-8
              #
              # Redmine - project management software
-             # Copyright (C) 2006-2012  Jean-Philippe Lang
+             # Copyright (C) 2006-2013  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 RepositoriesHelper
                def format_revision(revision)
                  if revision.respond_to? :format_identifier
                    revision.format_identifier
                  else
                    revision.to_s
                  end
                end
                def truncate_at_line_break(text, length = 255)
                  if text
                    text.gsub(%r{^(.{#{length}}[^\n]*)\n.+$}m, '\\1...')
                  end
                end
                def render_properties(properties)
                  unless properties.nil? || properties.empty?
                    content = ''
                    properties.keys.sort.each do |property|
                      content << content_tag('li', "<b>#{h property}</b>: <span>#{h properties[property]}</span>".html_safe)
                    end
                    content_tag('ul', content.html_safe, :class => 'properties')
                  end
                end
                def render_changeset_changes
                  changes = @changeset.filechanges.limit(1000).reorder('path').all.collect do |change|
                    case change.action
                    when 'A'
                      # Detects moved/copied files
                      if !change.from_path.blank?
                        change.action =
                           @changeset.filechanges.detect {|c| c.action == 'D' && c.path == change.from_path} ? 'R' : 'C'
                      end
                      change
                    when 'D'
                      @changeset.filechanges.detect {|c| c.from_path == change.path} ? nil : change
                    else
                      change
                    end
                  end.compact
                  tree = { }
                  changes.each do |change|
                    p = tree
                    dirs = change.path.to_s.split('/').select {|d| !d.blank?}
                    path = ''
                    dirs.each do |dir|
                      path += '/' + dir
                      p[:s] ||= {}
                      p = p[:s]
                      p[path] ||= {}
                      p = p[path]
                    end
                    p[:c] = change
                  end
                  render_changes_tree(tree[:s])
                end
                def render_changes_tree(tree)
                  return '' if tree.nil?
                  output = ''
                  output << '<ul>'
                  tree.keys.sort.each do |file|
                    style = 'change'
                    text = File.basename(h(file))
                    if s = tree[file][:s]
                      style << ' folder'
                      path_param = to_path_param(@repository.relative_path(file))
                      text = link_to(h(text), :controller => 'repositories',
                                           :action => 'show',
                                           :id => @project,
                                           :repository_id => @repository.identifier_param,
                                           :path => path_param,
                                           :rev => @changeset.identifier)
                      output << "<li class='#{style}'>#{text}"
                      output << render_changes_tree(s)
                      output << "</li>"
                    elsif c = tree[file][:c]
                      style << " change-#{c.action}"
                      path_param = to_path_param(@repository.relative_path(c.path))
                      text = link_to(h(text), :controller => 'repositories',
                                           :action => 'entry',
                                           :id => @project,
                                           :repository_id => @repository.identifier_param,
                                           :path => path_param,
                                           :rev => @changeset.identifier) unless c.action == 'D'
                      text << " - #{h(c.revision)}" unless c.revision.blank?
                      text << ' ('.html_safe + link_to(l(:label_diff), :controller => 'repositories',
                                                     :action => 'diff',
                                                     :id => @project,
                                                     :repository_id => @repository.identifier_param,
                                                     :path => path_param,
                                                     :rev => @changeset.identifier) + ') '.html_safe if c.action == 'M'
                      text << ' '.html_safe + content_tag('span', h(c.from_path), :class => 'copied-from') unless c.from_path.blank?
                      output << "<li class='#{style}'>#{text}</li>"
                    end
                  end
                  output << '</ul>'
                  output.html_safe
                end
                def repository_field_tags(form, repository)
                  method = repository.class.name.demodulize.underscore + "_field_tags"
                  if repository.is_a?(Repository) &&
                      respond_to?(method) && method != 'repository_field_tags'
                    send(method, form, repository)
                  end
                end
                def scm_select_tag(repository)
                  scm_options = [["--- #{l(:actionview_instancetag_blank_option)} ---", '']]
                  Redmine::Scm::Base.all.each do |scm|
                  if Setting.enabled_scm.include?(scm) ||
                        (repository && repository.class.name.demodulize == scm)
                      scm_options << ["Repository::#{scm}".constantize.scm_name, scm]
                    end
                  end
                  select_tag('repository_scm',
                             options_for_select(scm_options, repository.class.name.demodulize),
                             :disabled => (repository && !repository.new_record?),
                             :data => {:remote => true, :method => 'get'})
                end
                def with_leading_slash(path)
                  path.to_s.starts_with?('/') ? path : "/#{path}"
                end
                def without_leading_slash(path)
                  path.gsub(%r{^/+}, '')
                end
                def subversion_field_tags(form, repository)
                    content_tag('p', form.text_field(:url, :size => 60, :required => true,
                                     :disabled => !repository.safe_attribute?('url')) +
                                     '<br />'.html_safe +
                                     '(file:///, http://, https://, svn://, svn+[tunnelscheme]://)') +
                    content_tag('p', form.text_field(:login, :size => 30)) +
                    content_tag('p', form.password_field(
                                          :password, :size => 30, :name => 'ignore',
                                          :value => ((repository.new_record? || repository.password.blank?) ? '' : ('x'*15)),
                                          :onfocus => "this.value=''; this.name='repository[password]';",
                                          :onchange => "this.name='repository[password]';"))
                end
                def darcs_field_tags(form, repository)
                  content_tag('p', form.text_field(
                                   :url, :label => l(:field_path_to_repository),
                                   :size => 60, :required => true,
                                   :disabled => !repository.safe_attribute?('url'))) +
                  content_tag('p', form.select(
                                   :log_encoding, [nil] + Setting::ENCODINGS,
                                   :label => l(:field_commit_logs_encoding), :required => true))
                end
                def mercurial_field_tags(form, repository)
                  content_tag('p', form.text_field(
                                     :url, :label => l(:field_path_to_repository),
                                     :size => 60, :required => true,
                                     :disabled => !repository.safe_attribute?('url')
                                       ) +
                                   '<br />'.html_safe + l(:text_mercurial_repository_note)) +
                  content_tag('p', form.select(
                                      :path_encoding, [nil] + Setting::ENCODINGS,
                                      :label => l(:field_scm_path_encoding)
                                      ) +
                                   '<br />'.html_safe + l(:text_scm_path_encoding_note))
                end
                def git_field_tags(form, repository)
                  content_tag('p', form.text_field(
                                     :url, :label => l(:field_path_to_repository),
                                     :size => 60, :required => true,
                                     :disabled => !repository.safe_attribute?('url')
                                       ) +
                                    '<br />'.html_safe +
                                    l(:text_git_repository_note)) +
                  content_tag('p', form.select(
                                      :path_encoding, [nil] + Setting::ENCODINGS,
                                      :label => l(:field_scm_path_encoding)
                                      ) +
                                   '<br />'.html_safe + l(:text_scm_path_encoding_note)) +
                  content_tag('p', form.check_box(
                                      :extra_report_last_commit,
                                      :label => l(:label_git_report_last_commit)
                                       ))
                end
                def cvs_field_tags(form, repository)
                  content_tag('p', form.text_field(
                                   :root_url,
                                   :label => l(:field_cvsroot),
                                   :size => 60, :required => true,
                                   :disabled => !repository.safe_attribute?('root_url'))) +
                  content_tag('p', form.text_field(
                                   :url,
                                   :label => l(:field_cvs_module),
                                   :size => 30, :required => true,
                                   :disabled => !repository.safe_attribute?('url'))) +
                  content_tag('p', form.select(
                                   :log_encoding, [nil] + Setting::ENCODINGS,
                                   :label => l(:field_commit_logs_encoding), :required => true)) +
                  content_tag('p', form.select(
                                      :path_encoding, [nil] + Setting::ENCODINGS,
                                      :label => l(:field_scm_path_encoding)
                                      ) +
                                   '<br />'.html_safe + l(:text_scm_path_encoding_note))
                end
                def bazaar_field_tags(form, repository)
                  content_tag('p', form.text_field(
                                   :url, :label => l(:field_path_to_repository),
                                   :size => 60, :required => true,
                                   :disabled => !repository.safe_attribute?('url'))) +
                  content_tag('p', form.select(
                                   :log_encoding, [nil] + Setting::ENCODINGS,
                                   :label => l(:field_commit_logs_encoding), :required => true))
                end
                def filesystem_field_tags(form, repository)
                  content_tag('p', form.text_field(
                                   :url, :label => l(:field_root_directory),
                                   :size => 60, :required => true,
                                   :disabled => !repository.safe_attribute?('url'))) +
                  content_tag('p', form.select(
                                      :path_encoding, [nil] + Setting::ENCODINGS,
                                      :label => l(:field_scm_path_encoding)
                                      ) +
                                   '<br />'.html_safe + l(:text_scm_path_encoding_note))
                end
                def index_commits(commits, heads)
                  return nil if commits.nil? or commits.first.parents.nil?
                  refs_map = {}
                  heads.each do |head|
                    refs_map[head.scmid] ||= []
                    refs_map[head.scmid] << head
                  end
                  commits_by_scmid = {}
                  commits.reverse.each_with_index do |commit, commit_index|
                    commits_by_scmid[commit.scmid] = {
                      :parent_scmids => commit.parents.collect { |parent| parent.scmid },
                      :rdmid => commit_index,
                      :refs  => refs_map.include?(commit.scmid) ? refs_map[commit.scmid].join(" ") : nil,
                      :scmid => commit.scmid,
                      :href  => block_given? ? yield(commit.scmid) : commit.scmid
                    }
                  end
                  heads.sort! { |head1, head2| head1.to_s <=> head2.to_s }
                  space = nil
                  heads.each do |head|
                    if commits_by_scmid.include? head.scmid
                      space = index_head((space || -1) + 1, head, commits_by_scmid)
                    end
                  end
                  # when no head matched anything use first commit
                  space ||= index_head(0, commits.first, commits_by_scmid)
                  return commits_by_scmid, space
                end
                def index_head(space, commit, commits_by_scmid)
                  stack = [[space, commits_by_scmid[commit.scmid]]]
                  max_space = space
                  until stack.empty?
                    space, commit = stack.pop
                    commit[:space] = space if commit[:space].nil?
                    space -= 1
                    commit[:parent_scmids].each_with_index do |parent_scmid, parent_index|
                      parent_commit = commits_by_scmid[parent_scmid]
                      if parent_commit and parent_commit[:space].nil?
                        stack.unshift [space += 1, parent_commit]
                      end
                    end
                    max_space = space if max_space < space
                  end
                  max_space
                end
              end

app/helpers/roles_helper.rb +1 -1

              # encoding: utf-8
              #
              # Redmine - project management software
-             # Copyright (C) 2006-2012  Jean-Philippe Lang
+             # Copyright (C) 2006-2013  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 RolesHelper
              end

app/helpers/routes_helper.rb +1 -1

              # encoding: utf-8
              #
              # Redmine - project management software
-             # Copyright (C) 2006-2012  Jean-Philippe Lang
+             # Copyright (C) 2006-2013  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 RoutesHelper
                # Returns the path to project issues or to the cross-project
                # issue list if project is nil
                def _project_issues_path(project, *args)
                  if project
                    project_issues_path(project, *args)
                  else
                    issues_path(*args)
                  end
                end
                def _project_calendar_path(project, *args)
                  project ? project_calendar_path(project, *args) : issues_calendar_path(*args)
                end
                def _project_gantt_path(project, *args)
                  project ? project_gantt_path(project, *args) : issues_gantt_path(*args)
                end
              end

app/helpers/search_helper.rb +1 -1

              # encoding: utf-8
              #
              # Redmine - project management software
-             # Copyright (C) 2006-2012  Jean-Philippe Lang
+             # Copyright (C) 2006-2013  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 SearchHelper
                def highlight_tokens(text, tokens)
                  return text unless text && tokens && !tokens.empty?
                  re_tokens = tokens.collect {|t| Regexp.escape(t)}
                  regexp = Regexp.new "(#{re_tokens.join('|')})", Regexp::IGNORECASE
                  result = ''
                  text.split(regexp).each_with_index do |words, i|
                    if result.length > 1200
                      # maximum length of the preview reached
                      result << '...'
                      break
                    end
                    words = words.mb_chars
                    if i.even?
                      result << h(words.length > 100 ? "#{words.slice(0..44)} ... #{words.slice(-45..-1)}" : words)
                    else
                      t = (tokens.index(words.downcase) || 0) % 4
                      result << content_tag('span', h(words), :class => "highlight token-#{t}")
                    end
                  end
                  result.html_safe
                end
                def type_label(t)
                  l("label_#{t.singularize}_plural", :default => t.to_s.humanize)
                end
                def project_select_tag
                  options = [[l(:label_project_all), 'all']]
                  options << [l(:label_my_projects), 'my_projects'] unless User.current.memberships.empty?
                  options << [l(:label_and_its_subprojects, @project.name), 'subprojects'] unless @project.nil? || @project.descendants.active.empty?
                  options << [@project.name, ''] unless @project.nil?
                  label_tag("scope", l(:description_project_scope), :class => "hidden-for-sighted") +
                  select_tag('scope', options_for_select(options, params[:scope].to_s)) if options.size > 1
                end
                def render_results_by_type(results_by_type)
                  links = []
                  # Sorts types by results count
                  results_by_type.keys.sort {|a, b| results_by_type[b] <=> results_by_type[a]}.each do |t|
                    c = results_by_type[t]
                    next if c == 0
                    text = "#{type_label(t)} (#{c})"
                    links << link_to(h(text), :q => params[:q], :titles_only => params[:titles_only],
                                     :all_words => params[:all_words], :scope => params[:scope], t => 1)
                  end
                  ('<ul>'.html_safe +
                      links.map {|link| content_tag('li', link)}.join(' ').html_safe +
                      '</ul>'.html_safe) unless links.empty?
                end
              end

app/helpers/settings_helper.rb +1 -1

              # encoding: utf-8
              #
              # Redmine - project management software
-             # Copyright (C) 2006-2012  Jean-Philippe Lang
+             # Copyright (C) 2006-2013  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 SettingsHelper
                def administration_settings_tabs
                  tabs = [{:name => 'general', :partial => 'settings/general', :label => :label_general},
                          {:name => 'display', :partial => 'settings/display', :label => :label_display},
                          {:name => 'authentication', :partial => 'settings/authentication', :label => :label_authentication},
                          {:name => 'projects', :partial => 'settings/projects', :label => :label_project_plural},
                          {:name => 'issues', :partial => 'settings/issues', :label => :label_issue_tracking},
                          {:name => 'notifications', :partial => 'settings/notifications', :label => :field_mail_notification},
                          {:name => 'mail_handler', :partial => 'settings/mail_handler', :label => :label_incoming_emails},
                          {:name => 'repositories', :partial => 'settings/repositories', :label => :label_repository_plural}
                          ]
                end
                def setting_select(setting, choices, options={})
                  if blank_text = options.delete(:blank)
                    choices = [[blank_text.is_a?(Symbol) ? l(blank_text) : blank_text, '']] + choices
                  end
                  setting_label(setting, options).html_safe +
                    select_tag("settings[#{setting}]",
                               options_for_select(choices, Setting.send(setting).to_s),
                               options).html_safe
                end
                def setting_multiselect(setting, choices, options={})
                  setting_values = Setting.send(setting)
                  setting_values = [] unless setting_values.is_a?(Array)
                  content_tag("label", l(options[:label] || "setting_#{setting}")) +
                    hidden_field_tag("settings[#{setting}][]", '').html_safe +
                    choices.collect do |choice|
                      text, value = (choice.is_a?(Array) ? choice : [choice, choice])
                      content_tag(
                        'label',
                        check_box_tag(
                           "settings[#{setting}][]",
                           value,
                           Setting.send(setting).include?(value),
                           :id => nil
                         ) + text.to_s,
                        :class => (options[:inline] ? 'inline' : 'block')
                       )
                    end.join.html_safe
                end
                def setting_text_field(setting, options={})
                  setting_label(setting, options).html_safe +
                    text_field_tag("settings[#{setting}]", Setting.send(setting), options).html_safe
                end
                def setting_text_area(setting, options={})
                  setting_label(setting, options).html_safe +
                    text_area_tag("settings[#{setting}]", Setting.send(setting), options).html_safe
                end
                def setting_check_box(setting, options={})
                  setting_label(setting, options).html_safe +
                    hidden_field_tag("settings[#{setting}]", 0, :id => nil).html_safe +
                      check_box_tag("settings[#{setting}]", 1, Setting.send("#{setting}?"), options).html_safe
                end
                def setting_label(setting, options={})
                  label = options.delete(:label)
                  label != false ? label_tag("settings_#{setting}", l(label || "setting_#{setting}")).html_safe : ''
                end
                # Renders a notification field for a Redmine::Notifiable option
                def notification_field(notifiable)
                  return content_tag(:label,
                                     check_box_tag('settings[notified_events][]',
                                                   notifiable.name,
                                                   Setting.notified_events.include?(notifiable.name), :id => nil).html_safe +
                                       l_or_humanize(notifiable.name, :prefix => 'label_').html_safe,
                                     :class => notifiable.parent.present? ? "parent" : '').html_safe
                end
                def cross_project_subtasks_options
                  options = [
                    [:label_disabled, ''],
                    [:label_cross_project_system, 'system'],
                    [:label_cross_project_tree, 'tree'],
                    [:label_cross_project_hierarchy, 'hierarchy'],
                    [:label_cross_project_descendants, 'descendants']
                  ]
                  options.map {|label, value| [l(label), value.to_s]}
                end
              end

app/helpers/timelog_helper.rb +1 -1

              # encoding: utf-8
              #
              # Redmine - project management software
-             # Copyright (C) 2006-2012  Jean-Philippe Lang
+             # Copyright (C) 2006-2013  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 TimelogHelper
                include ApplicationHelper
                def render_timelog_breadcrumb
                  links = []
                  links << link_to(l(:label_project_all), {:project_id => nil, :issue_id => nil})
                  links << link_to(h(@project), {:project_id => @project, :issue_id => nil}) if @project
                  if @issue
                    if @issue.visible?
                      links << link_to_issue(@issue, :subject => false)
                    else
                      links << "##{@issue.id}"
                    end
                  end
                  breadcrumb links
                end
                # Returns a collection of activities for a select field.  time_entry
                # is optional and will be used to check if the selected TimeEntryActivity
                # is active.
                def activity_collection_for_select_options(time_entry=nil, project=nil)
                  project ||= @project
                  if project.nil?
                    activities = TimeEntryActivity.shared.active
                  else
                    activities = project.activities
                  end
                  collection = []
                  if time_entry && time_entry.activity && !time_entry.activity.active?
                    collection << [ "--- #{l(:actionview_instancetag_blank_option)} ---", '' ]
                  else
                    collection << [ "--- #{l(:actionview_instancetag_blank_option)} ---", '' ] unless activities.detect(&:is_default)
                  end
                  activities.each { |a| collection << [a.name, a.id] }
                  collection
                end
                def select_hours(data, criteria, value)
                	if value.to_s.empty?
                		data.select {|row| row[criteria].blank? }
                  else
                  	data.select {|row| row[criteria].to_s == value.to_s}
                  end
                end
                def sum_hours(data)
                  sum = 0
                  data.each do |row|
                    sum += row['hours'].to_f
                  end
                  sum
                end
                def options_for_period_select(value)
                  options_for_select([[l(:label_all_time), 'all'],
                                      [l(:label_today), 'today'],
                                      [l(:label_yesterday), 'yesterday'],
                                      [l(:label_this_week), 'current_week'],
                                      [l(:label_last_week), 'last_week'],
                                      [l(:label_last_n_weeks, 2), 'last_2_weeks'],
                                      [l(:label_last_n_days, 7), '7_days'],
                                      [l(:label_this_month), 'current_month'],
                                      [l(:label_last_month), 'last_month'],
                                      [l(:label_last_n_days, 30), '30_days'],
                                      [l(:label_this_year), 'current_year']],
                                      value)
                end
                def entries_to_csv(entries)
                  decimal_separator = l(:general_csv_decimal_separator)
                  custom_fields = TimeEntryCustomField.all
                  export = FCSV.generate(:col_sep => l(:general_csv_separator)) do |csv|
                    # csv header fields
                    headers = [l(:field_spent_on),
                               l(:field_user),
                               l(:field_activity),
                               l(:field_project),
                               l(:field_issue),
                               l(:field_tracker),
                               l(:field_subject),
                               l(:field_hours),
                               l(:field_comments)
                               ]
                    # Export custom fields
                    headers += custom_fields.collect(&:name)
                    csv << headers.collect {|c| Redmine::CodesetUtil.from_utf8(
                                                   c.to_s,
                                                   l(:general_csv_encoding) )  }
                    # csv lines
                    entries.each do |entry|
                      fields = [format_date(entry.spent_on),
                                entry.user,
                                entry.activity,
                                entry.project,
                                (entry.issue ? entry.issue.id : nil),
                                (entry.issue ? entry.issue.tracker : nil),
                                (entry.issue ? entry.issue.subject : nil),
                                entry.hours.to_s.gsub('.', decimal_separator),
                                entry.comments
                                ]
                      fields += custom_fields.collect {|f| show_value(entry.custom_field_values.detect {|v| v.custom_field_id == f.id}) }
                      csv << fields.collect {|c| Redmine::CodesetUtil.from_utf8(
                                                   c.to_s,
                                                   l(:general_csv_encoding) )  }
                    end
                  end
                  export
                end
                def format_criteria_value(criteria_options, value)
                  if value.blank?
                    "[#{l(:label_none)}]"
                  elsif k = criteria_options[:klass]
                    obj = k.find_by_id(value.to_i)
                    if obj.is_a?(Issue)
                      obj.visible? ? "#{obj.tracker} ##{obj.id}: #{obj.subject}" : "##{obj.id}"
                    else
                      obj
                    end
                  else
                    format_value(value, criteria_options[:format])
                  end
                end
                def report_to_csv(report)
                  decimal_separator = l(:general_csv_decimal_separator)
                  export = FCSV.generate(:col_sep => l(:general_csv_separator)) do |csv|
                    # Column headers
                    headers = report.criteria.collect {|criteria| l(report.available_criteria[criteria][:label]) }
                    headers += report.periods
                    headers << l(:label_total)
                    csv << headers.collect {|c| Redmine::CodesetUtil.from_utf8(
                                                  c.to_s,
                                                  l(:general_csv_encoding) ) }
                    # Content
                    report_criteria_to_csv(csv, report.available_criteria, report.columns, report.criteria, report.periods, report.hours)
                    # Total row
                    str_total = Redmine::CodesetUtil.from_utf8(l(:label_total), l(:general_csv_encoding))
                    row = [ str_total ] + [''] * (report.criteria.size - 1)
                    total = 0
                    report.periods.each do |period|
                      sum = sum_hours(select_hours(report.hours, report.columns, period.to_s))
                      total += sum
                      row << (sum > 0 ? ("%.2f" % sum).gsub('.',decimal_separator) : '')
                    end
                    row << ("%.2f" % total).gsub('.',decimal_separator)
                    csv << row
                  end
                  export
                end
                def report_criteria_to_csv(csv, available_criteria, columns, criteria, periods, hours, level=0)
                  decimal_separator = l(:general_csv_decimal_separator)
                  hours.collect {|h| h[criteria[level]].to_s}.uniq.each do |value|
                    hours_for_value = select_hours(hours, criteria[level], value)
                    next if hours_for_value.empty?
                    row = [''] * level
                    row << Redmine::CodesetUtil.from_utf8(
                                      format_criteria_value(available_criteria[criteria[level]], value).to_s,
                                      l(:general_csv_encoding) )
                    row += [''] * (criteria.length - level - 1)
                    total = 0
                    periods.each do |period|
                      sum = sum_hours(select_hours(hours_for_value, columns, period.to_s))
                      total += sum
                      row << (sum > 0 ? ("%.2f" % sum).gsub('.',decimal_separator) : '')
                    end
                    row << ("%.2f" % total).gsub('.',decimal_separator)
                    csv << row
                    if criteria.length > level + 1
                      report_criteria_to_csv(csv, available_criteria, columns, criteria, periods, hours_for_value, level + 1)
                    end
                  end
                end
              end

app/helpers/trackers_helper.rb +1 -1

              # encoding: utf-8
              #
              # Redmine - project management software
-             # Copyright (C) 2006-2012  Jean-Philippe Lang
+             # Copyright (C) 2006-2013  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 TrackersHelper
              end

app/helpers/users_helper.rb +1 -1

              # encoding: utf-8
              #
              # Redmine - project management software
-             # Copyright (C) 2006-2012  Jean-Philippe Lang
+             # Copyright (C) 2006-2013  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 UsersHelper
                def users_status_options_for_select(selected)
                  user_count_by_status = User.count(:group => 'status').to_hash
                  options_for_select([[l(:label_all), ''],
                                      ["#{l(:status_active)} (#{user_count_by_status[1].to_i})", '1'],
                                      ["#{l(:status_registered)} (#{user_count_by_status[2].to_i})", '2'],
                                      ["#{l(:status_locked)} (#{user_count_by_status[3].to_i})", '3']], selected.to_s)
                end
                def user_mail_notification_options(user)
                  user.valid_notification_options.collect {|o| [l(o.last), o.first]}
                end
                def change_status_link(user)
                  url = {:controller => 'users', :action => 'update', :id => user, :page => params[:page], :status => params[:status], :tab => nil}
                  if user.locked?
                    link_to l(:button_unlock), url.merge(:user => {:status => User::STATUS_ACTIVE}), :method => :put, :class => 'icon icon-unlock'
                  elsif user.registered?
                    link_to l(:button_activate), url.merge(:user => {:status => User::STATUS_ACTIVE}), :method => :put, :class => 'icon icon-unlock'
                  elsif user != User.current
                    link_to l(:button_lock), url.merge(:user => {:status => User::STATUS_LOCKED}), :method => :put, :class => 'icon icon-lock'
                  end
                end
                def user_settings_tabs
                  tabs = [{:name => 'general', :partial => 'users/general', :label => :label_general},
                          {:name => 'memberships', :partial => 'users/memberships', :label => :label_project_plural}
                          ]
                  if Group.all.any?
                    tabs.insert 1, {:name => 'groups', :partial => 'users/groups', :label => :label_group_plural}
                  end
                  tabs
                end
              end

app/helpers/versions_helper.rb +1 -1

              # encoding: utf-8
              #
              # Redmine - project management software
-             # Copyright (C) 2006-2012  Jean-Philippe Lang
+             # Copyright (C) 2006-2013  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 VersionsHelper
                def version_anchor(version)
                  if @project == version.project
                    anchor version.name
                  else
                    anchor "#{version.project.try(:identifier)}-#{version.name}"
                  end
                end
                STATUS_BY_CRITERIAS = %w(tracker status priority author assigned_to category)
                def render_issue_status_by(version, criteria)
                  criteria = 'tracker' unless STATUS_BY_CRITERIAS.include?(criteria)
                  h = Hash.new {|k,v| k[v] = [0, 0]}
                  begin
                    # Total issue count
                    Issue.count(:group => criteria,
                                :conditions => ["#{Issue.table_name}.fixed_version_id = ?", version.id]).each {|c,s| h[c][0] = s}
                    # Open issues count
                    Issue.count(:group => criteria,
                                :include => :status,
                                :conditions => ["#{Issue.table_name}.fixed_version_id = ? AND #{IssueStatus.table_name}.is_closed = ?", version.id, false]).each {|c,s| h[c][1] = s}
                  rescue ActiveRecord::RecordNotFound
                  # When grouping by an association, Rails throws this exception if there's no result (bug)
                  end
                  # Sort with nil keys in last position
                  counts = h.keys.sort {|a,b| a.nil? ? 1 : (b.nil? ? -1 : a <=> b)}.collect {|k| {:group => k, :total => h[k][0], :open => h[k][1], :closed => (h[k][0] - h[k][1])}}
                  max = counts.collect {|c| c[:total]}.max
                  render :partial => 'issue_counts', :locals => {:version => version, :criteria => criteria, :counts => counts, :max => max}
                end
                def status_by_options_for_select(value)
                  options_for_select(STATUS_BY_CRITERIAS.collect {|criteria| [l("field_#{criteria}".to_sym), criteria]}, value)
                end
              end

app/helpers/watchers_helper.rb +1 -1

              # encoding: utf-8
              #
              # Redmine - project management software
-             # Copyright (C) 2006-2012  Jean-Philippe Lang
+             # Copyright (C) 2006-2013  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 WatchersHelper
                def watcher_tag(object, user, options={})
                  content_tag("span", watcher_link(object, user), :class => watcher_css(object))
                end
                def watcher_link(object, user)
                  return '' unless user && user.logged? && object.respond_to?('watched_by?')
                  watched = object.watched_by?(user)
                  url = {:controller => 'watchers',
                         :action => (watched ? 'unwatch' : 'watch'),
                         :object_type => object.class.to_s.underscore,
                         :object_id => object.id}
                  link_to((watched ? l(:button_unwatch) : l(:button_watch)), url,
                          :remote => true, :method => 'post', :class => (watched ? 'icon icon-fav' : 'icon icon-fav-off'))
                end
                # Returns the css class used to identify watch links for a given +object+
                def watcher_css(object)
                  "#{object.class.to_s.underscore}-#{object.id}-watcher"
                end
                # Returns a comma separated list of users watching the given object
                def watchers_list(object)
                  remove_allowed = User.current.allowed_to?("delete_#{object.class.name.underscore}_watchers".to_sym, object.project)
                  content = ''.html_safe
                  lis = object.watcher_users.collect do |user|
                    s = ''.html_safe
                    s << avatar(user, :size => "16").to_s
                    s << link_to_user(user, :class => 'user')
                    if remove_allowed
                      url = {:controller => 'watchers',
                             :action => 'destroy',
                             :object_type => object.class.to_s.underscore,
                             :object_id => object.id,
                             :user_id => user}
                      s << ' '
                      s << link_to(image_tag('delete.png'), url,
                                   :remote => true, :method => 'post', :style => "vertical-align: middle", :class => "delete")
                    end
                    content << content_tag('li', s)
                  end
                  content.present? ? content_tag('ul', content) : content
                end
                def watchers_checkboxes(object, users, checked=nil)
                  users.map do |user|
                    c = checked.nil? ? object.watched_by?(user) : checked
                    tag = check_box_tag 'issue[watcher_user_ids][]', user.id, c, :id => nil
                    content_tag 'label', "#{tag} #{h(user)}".html_safe,
                                :id => "issue_watcher_user_ids_#{user.id}",
                                :class => "floating"
                  end.join.html_safe
                end
              end

app/helpers/welcome_helper.rb +1 -1

              # encoding: utf-8
              #
              # Redmine - project management software
-             # Copyright (C) 2006-2012  Jean-Philippe Lang
+             # Copyright (C) 2006-2013  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 WelcomeHelper
              end

app/helpers/wiki_helper.rb +1 -1

              # encoding: utf-8
              #
              # Redmine - project management software
-             # Copyright (C) 2006-2012  Jean-Philippe Lang
+             # Copyright (C) 2006-2013  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 = ''.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; ') : ''
                      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, :version => nil})
                  })
                end
              end

app/helpers/workflows_helper.rb +1 -1

              # encoding: utf-8
              #
              # Redmine - project management software
-             # Copyright (C) 2006-2012  Jean-Philippe Lang
+             # Copyright (C) 2006-2013  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 WorkflowsHelper
                def field_required?(field)
                  field.is_a?(CustomField) ? field.is_required? : %w(project_id tracker_id subject priority_id is_private).include?(field)
                end
                def field_permission_tag(permissions, status, field)
                  name = field.is_a?(CustomField) ? field.id.to_s : field
                  options = [["", ""], [l(:label_readonly), "readonly"]]
                  options << [l(:label_required), "required"] unless field_required?(field)
                  select_tag("permissions[#{name}][#{status.id}]", options_for_select(options, permissions[status.id][name]))
                end
              end

app/models/attachment.rb +1 -1

              # Redmine - project management software
-             # Copyright (C) 2006-2012  Jean-Philippe Lang
+             # Copyright (C) 2006-2013  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 "digest/md5"
              require "fileutils"
              class Attachment < ActiveRecord::Base
                belongs_to :container, :polymorphic => true
                belongs_to :author, :class_name => "User", :foreign_key => "author_id"
                validates_presence_of :filename, :author
                validates_length_of :filename, :maximum => 255
                validates_length_of :disk_filename, :maximum => 255
                validates_length_of :description, :maximum => 255
                validate :validate_max_file_size
                acts_as_event :title => :filename,
                              :url => Proc.new {|o| {:controller => 'attachments', :action => 'download', :id => o.id, :filename => o.filename}}
                acts_as_activity_provider :type => 'files',
                                          :permission => :view_files,
                                          :author_key => :author_id,
                                          :find_options => {:select => "#{Attachment.table_name}.*",
                                                            :joins => "LEFT JOIN #{Version.table_name} ON #{Attachment.table_name}.container_type='Version' AND #{Version.table_name}.id = #{Attachment.table_name}.container_id " +
                                                                      "LEFT JOIN #{Project.table_name} ON #{Version.table_name}.project_id = #{Project.table_name}.id OR ( #{Attachment.table_name}.container_type='Project' AND #{Attachment.table_name}.container_id = #{Project.table_name}.id )"}
                acts_as_activity_provider :type => 'documents',
                                          :permission => :view_documents,
                                          :author_key => :author_id,
                                          :find_options => {:select => "#{Attachment.table_name}.*",
                                                            :joins => "LEFT JOIN #{Document.table_name} ON #{Attachment.table_name}.container_type='Document' AND #{Document.table_name}.id = #{Attachment.table_name}.container_id " +
                                                                      "LEFT JOIN #{Project.table_name} ON #{Document.table_name}.project_id = #{Project.table_name}.id"}
                cattr_accessor :storage_path
                @@storage_path = Redmine::Configuration['attachments_storage_path'] || File.join(Rails.root, "files")
                cattr_accessor :thumbnails_storage_path
                @@thumbnails_storage_path = File.join(Rails.root, "tmp", "thumbnails")
                before_save :files_to_final_location
                after_destroy :delete_from_disk
                # Returns an unsaved copy of the attachment
                def copy(attributes=nil)
                  copy = self.class.new
                  copy.attributes = self.attributes.dup.except("id", "downloads")
                  copy.attributes = attributes if attributes
                  copy
                end
                def validate_max_file_size
                  if @temp_file && self.filesize > Setting.attachment_max_size.to_i.kilobytes
                    errors.add(:base, l(:error_attachment_too_big, :max_size => Setting.attachment_max_size.to_i.kilobytes))
                  end
                end
                def file=(incoming_file)
                  unless incoming_file.nil?
                    @temp_file = incoming_file
                    if @temp_file.size > 0
                      if @temp_file.respond_to?(:original_filename)
                        self.filename = @temp_file.original_filename
                        self.filename.force_encoding("UTF-8") if filename.respond_to?(:force_encoding)
                      end
                      if @temp_file.respond_to?(:content_type)
                        self.content_type = @temp_file.content_type.to_s.chomp
                      end
                      if content_type.blank? && filename.present?
                        self.content_type = Redmine::MimeType.of(filename)
                      end
                      self.filesize = @temp_file.size
                    end
                  end
                end
                def file
                  nil
                end
                def filename=(arg)
                  write_attribute :filename, sanitize_filename(arg.to_s)
                  filename
                end
                # Copies the temporary file to its final location
                # and computes its MD5 hash
                def files_to_final_location
                  if @temp_file && (@temp_file.size > 0)
                    self.disk_directory = target_directory
                    self.disk_filename = Attachment.disk_filename(filename, disk_directory)
                    logger.info("Saving attachment '#{self.diskfile}' (#{@temp_file.size} bytes)")
                    path = File.dirname(diskfile)
                    unless File.directory?(path)
                      FileUtils.mkdir_p(path)
                    end
                    md5 = Digest::MD5.new
                    File.open(diskfile, "wb") do |f|
                      if @temp_file.respond_to?(:read)
                        buffer = ""
                        while (buffer = @temp_file.read(8192))
                          f.write(buffer)
                          md5.update(buffer)
                        end
                      else
                        f.write(@temp_file)
                        md5.update(@temp_file)
                      end
                    end
                    self.digest = md5.hexdigest
                  end
                  @temp_file = nil
                  # Don't save the content type if it's longer than the authorized length
                  if self.content_type && self.content_type.length > 255
                    self.content_type = nil
                  end
                end
                # Deletes the file from the file system if it's not referenced by other attachments
                def delete_from_disk
                  if Attachment.where("disk_filename = ? AND id <> ?", disk_filename, id).empty?
                    delete_from_disk!
                  end
                end
                # Returns file's location on disk
                def diskfile
                  File.join(self.class.storage_path, disk_directory.to_s, disk_filename.to_s)
                end
                def title
                  title = filename.to_s
                  if description.present?
                    title << " (#{description})"
                  end
                  title
                end
                def increment_download
                  increment!(:downloads)
                end
                def project
                  container.try(:project)
                end
                def visible?(user=User.current)
                  if container_id
                    container && container.attachments_visible?(user)
                  else
                    author == user
                  end
                end
                def deletable?(user=User.current)
                  if container_id
                    container && container.attachments_deletable?(user)
                  else
                    author == user
                  end
                end
                def image?
                  !!(self.filename =~ /\.(bmp|gif|jpg|jpe|jpeg|png)$/i)
                end
                def thumbnailable?
                  image?
                end
                # Returns the full path the attachment thumbnail, or nil
                # if the thumbnail cannot be generated.
                def thumbnail(options={})
                  if thumbnailable? && readable?
                    size = options[:size].to_i
                    if size > 0
                      # Limit the number of thumbnails per image
                      size = (size / 50) * 50
                      # Maximum thumbnail size
                      size = 800 if size > 800
                    else
                      size = Setting.thumbnails_size.to_i
                    end
                    size = 100 unless size > 0
                    target = File.join(self.class.thumbnails_storage_path, "#{id}_#{digest}_#{size}.thumb")
                    begin
                      Redmine::Thumbnail.generate(self.diskfile, target, size)
                    rescue => e
                      logger.error "An error occured while generating thumbnail for #{disk_filename} to #{target}\nException was: #{e.message}" if logger
                      return nil
                    end
                  end
                end
                # Deletes all thumbnails
                def self.clear_thumbnails
                  Dir.glob(File.join(thumbnails_storage_path, "*.thumb")).each do |file|
                    File.delete file
                  end
                end
                def is_text?
                  Redmine::MimeType.is_type?('text', filename)
                end
                def is_diff?
                  self.filename =~ /\.(patch|diff)$/i
                end
                # Returns true if the file is readable
                def readable?
                  File.readable?(diskfile)
                end
                # Returns the attachment token
                def token
                  "#{id}.#{digest}"
                end
                # Finds an attachment that matches the given token and that has no container
                def self.find_by_token(token)
                  if token.to_s =~ /^(\d+)\.([0-9a-f]+)$/
                    attachment_id, attachment_digest = $1, $2
                    attachment = Attachment.where(:id => attachment_id, :digest => attachment_digest).first
                    if attachment && attachment.container.nil?
                      attachment
                    end
                  end
                end
                # Bulk attaches a set of files to an object
                #
                # Returns a Hash of the results:
                # :files => array of the attached files
                # :unsaved => array of the files that could not be attached
                def self.attach_files(obj, attachments)
                  result = obj.save_attachments(attachments, User.current)
                  obj.attach_saved_attachments
                  result
                end
                def self.latest_attach(attachments, filename)
                  attachments.sort_by(&:created_on).reverse.detect {
                    |att| att.filename.downcase == filename.downcase
                   }
                end
                def self.prune(age=1.day)
                  Attachment.where("created_on < ? AND (container_type IS NULL OR container_type = '')", Time.now - age).destroy_all
                end
                # Moves an existing attachment to its target directory
                def move_to_target_directory!
                  if !new_record? & readable?
                    src = diskfile
                    self.disk_directory = target_directory
                    dest = diskfile
                    if src != dest && FileUtils.mkdir_p(File.dirname(dest)) && FileUtils.mv(src, dest)
                      update_column :disk_directory, disk_directory
                    end
                  end
                end
                # Moves existing attachments that are stored at the root of the files
                # directory (ie. created before Redmine 2.3) to their target subdirectories
                def self.move_from_root_to_target_directory
                  Attachment.where("disk_directory IS NULL OR disk_directory = ''").find_each do |attachment|
                    attachment.move_to_target_directory!
                  end
                end
                private
                # Physically deletes the file from the file system
                def delete_from_disk!
                  if disk_filename.present? && File.exist?(diskfile)
                    File.delete(diskfile)
                  end
                end
                def sanitize_filename(value)
                  # get only the filename, not the whole path
                  just_filename = value.gsub(/^.*(\\|\/)/, '')
                  # Finally, replace invalid characters with underscore
                  @filename = just_filename.gsub(/[\/\?\%\*\:\|\"\'<>]+/, '_')
                end
                # Returns the subdirectory in which the attachment will be saved
                def target_directory
                  time = created_on || DateTime.now
                  time.strftime("%Y/%m")
                end
                # Returns an ASCII or hashed filename that do not
                # exists yet in the given subdirectory
                def self.disk_filename(filename, directory=nil)
                  timestamp = DateTime.now.strftime("%y%m%d%H%M%S")
                  ascii = ''
                  if filename =~ %r{^[a-zA-Z0-9_\.\-]*$}
                    ascii = filename
                  else
                    ascii = Digest::MD5.hexdigest(filename)
                    # keep the extension if any
                    ascii << $1 if filename =~ %r{(\.[a-zA-Z0-9]+)$}
                  end
                  while File.exist?(File.join(storage_path, directory.to_s, "#{timestamp}_#{ascii}"))
                    timestamp.succ!
                  end
                  "#{timestamp}_#{ascii}"
                end
              end

app/models/auth_source.rb +1 -1

              # Redmine - project management software
-             # Copyright (C) 2006-2012  Jean-Philippe Lang
+             # Copyright (C) 2006-2013  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.
              # Generic exception for when the AuthSource can not be reached
              # (eg. can not connect to the LDAP)
              class AuthSourceException < Exception; end
              class AuthSourceTimeoutException < AuthSourceException; end
              class AuthSource < ActiveRecord::Base
                include Redmine::SubclassFactory
                include Redmine::Ciphering
                has_many :users
                validates_presence_of :name
                validates_uniqueness_of :name
                validates_length_of :name, :maximum => 60
                def authenticate(login, password)
                end
                def test_connection
                end
                def auth_method_name
                  "Abstract"
                end
                def account_password
                  read_ciphered_attribute(:account_password)
                end
                def account_password=(arg)
                  write_ciphered_attribute(:account_password, arg)
                end
                def searchable?
                  false
                end
                def self.search(q)
                  results = []
                  AuthSource.all.each do |source|
                    begin
                      if source.searchable?
                        results += source.search(q)
                      end
                    rescue AuthSourceException => e
                      logger.error "Error while searching users in #{source.name}: #{e.message}"
                    end
                  end
                  results
                end
                def allow_password_changes?
                  self.class.allow_password_changes?
                end
                # Does this auth source backend allow password changes?
                def self.allow_password_changes?
                  false
                end
                # Try to authenticate a user not yet registered against available sources
                def self.authenticate(login, password)
                  AuthSource.where(:onthefly_register => true).all.each do |source|
                    begin
                      logger.debug "Authenticating '#{login}' against '#{source.name}'" if logger && logger.debug?
                      attrs = source.authenticate(login, password)
                    rescue => e
                      logger.error "Error during authentication: #{e.message}"
                      attrs = nil
                    end
                    return attrs if attrs
                  end
                  return nil
                end
              end

app/models/auth_source_ldap.rb +1 -1

              # Redmine - project management software
-             # Copyright (C) 2006-2012  Jean-Philippe Lang
+             # Copyright (C) 2006-2013  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 'iconv'
              require 'net/ldap'
              require 'net/ldap/dn'
              require 'timeout'
              class AuthSourceLdap < AuthSource
                validates_presence_of :host, :port, :attr_login
                validates_length_of :name, :host, :maximum => 60, :allow_nil => true
                validates_length_of :account, :account_password, :base_dn, :filter, :maximum => 255, :allow_blank => true
                validates_length_of :attr_login, :attr_firstname, :attr_lastname, :attr_mail, :maximum => 30, :allow_nil => true
                validates_numericality_of :port, :only_integer => true
                validates_numericality_of :timeout, :only_integer => true, :allow_blank => true
                validate :validate_filter
                before_validation :strip_ldap_attributes
                def initialize(attributes=nil, *args)
                  super
                  self.port = 389 if self.port == 0
                end
                def authenticate(login, password)
                  return nil if login.blank? || password.blank?
                  with_timeout do
                    attrs = get_user_dn(login, password)
                    if attrs && attrs[:dn] && authenticate_dn(attrs[:dn], password)
                      logger.debug "Authentication successful for '#{login}'" if logger && logger.debug?
                      return attrs.except(:dn)
                    end
                  end
                rescue Net::LDAP::LdapError => e
                  raise AuthSourceException.new(e.message)
                end
                # test the connection to the LDAP
                def test_connection
                  with_timeout do
                    ldap_con = initialize_ldap_con(self.account, self.account_password)
                    ldap_con.open { }
                  end
                rescue Net::LDAP::LdapError => e
                  raise AuthSourceException.new(e.message)
                end
                def auth_method_name
                  "LDAP"
                end
                # Returns true if this source can be searched for users
                def searchable?
                  !account.to_s.include?("$login") && %w(login firstname lastname mail).all? {|a| send("attr_#{a}?")}
                end
                # Searches the source for users and returns an array of results
                def search(q)
                  q = q.to_s.strip
                  return [] unless searchable? && q.present?
                  results = []
                  search_filter = base_filter & Net::LDAP::Filter.begins(self.attr_login, q)
                  ldap_con = initialize_ldap_con(self.account, self.account_password)
                  ldap_con.search(:base => self.base_dn,
                                  :filter => search_filter,
                                  :attributes => ['dn', self.attr_login, self.attr_firstname, self.attr_lastname, self.attr_mail],
                                  :size => 10) do |entry|
                    attrs = get_user_attributes_from_ldap_entry(entry)
                    attrs[:login] = AuthSourceLdap.get_attr(entry, self.attr_login)
                    results << attrs
                  end
                  results
                rescue Net::LDAP::LdapError => e
                  raise AuthSourceException.new(e.message)
                end
                private
                def with_timeout(&block)
                  timeout = self.timeout
                  timeout = 20 unless timeout && timeout > 0
                  Timeout.timeout(timeout) do
                    return yield
                  end
                rescue Timeout::Error => e
                  raise AuthSourceTimeoutException.new(e.message)
                end
                def ldap_filter
                  if filter.present?
                    Net::LDAP::Filter.construct(filter)
                  end
                rescue Net::LDAP::LdapError
                  nil
                end
                def base_filter
                  filter = Net::LDAP::Filter.eq("objectClass", "*")
                  if f = ldap_filter
                    filter = filter & f
                  end
                  filter
                end
                def validate_filter
                  if filter.present? && ldap_filter.nil?
                    errors.add(:filter, :invalid)
                  end
                end
                def strip_ldap_attributes
                  [:attr_login, :attr_firstname, :attr_lastname, :attr_mail].each do |attr|
                    write_attribute(attr, read_attribute(attr).strip) unless read_attribute(attr).nil?
                  end
                end
                def initialize_ldap_con(ldap_user, ldap_password)
                  options = { :host => self.host,
                              :port => self.port,
                              :encryption => (self.tls ? :simple_tls : nil)
                            }
                  options.merge!(:auth => { :method => :simple, :username => ldap_user, :password => ldap_password }) unless ldap_user.blank? && ldap_password.blank?
                  Net::LDAP.new options
                end
                def get_user_attributes_from_ldap_entry(entry)
                  {
                   :dn => entry.dn,
                   :firstname => AuthSourceLdap.get_attr(entry, self.attr_firstname),
                   :lastname => AuthSourceLdap.get_attr(entry, self.attr_lastname),
                   :mail => AuthSourceLdap.get_attr(entry, self.attr_mail),
                   :auth_source_id => self.id
                  }
                end
                # Return the attributes needed for the LDAP search.  It will only
                # include the user attributes if on-the-fly registration is enabled
                def search_attributes
                  if onthefly_register?
                    ['dn', self.attr_firstname, self.attr_lastname, self.attr_mail]
                  else
                    ['dn']
                  end
                end
                # Check if a DN (user record) authenticates with the password
                def authenticate_dn(dn, password)
                  if dn.present? && password.present?
                    initialize_ldap_con(dn, password).bind
                  end
                end
                # Get the user's dn and any attributes for them, given their login
                def get_user_dn(login, password)
                  ldap_con = nil
                  if self.account && self.account.include?("$login")
                    ldap_con = initialize_ldap_con(self.account.sub("$login", Net::LDAP::DN.escape(login)), password)
                  else
                    ldap_con = initialize_ldap_con(self.account, self.account_password)
                  end
                  attrs = {}
                  search_filter = base_filter & Net::LDAP::Filter.eq(self.attr_login, login)
                  ldap_con.search( :base => self.base_dn,
                                   :filter => search_filter,
                                   :attributes=> search_attributes) do |entry|
                    if onthefly_register?
                      attrs = get_user_attributes_from_ldap_entry(entry)
                    else
                      attrs = {:dn => entry.dn}
                    end
                    logger.debug "DN found for #{login}: #{attrs[:dn]}" if logger && logger.debug?
                  end
                  attrs
                end
                def self.get_attr(entry, attr_name)
                  if !attr_name.blank?
                    entry[attr_name].is_a?(Array) ? entry[attr_name].first : entry[attr_name]
                  end
                end
              end

app/models/board.rb +1 -1

              # Redmine - project management software
-             # Copyright (C) 2006-2012  Jean-Philippe Lang
+             # Copyright (C) 2006-2013  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 Board < ActiveRecord::Base
                include Redmine::SafeAttributes
                belongs_to :project
                has_many :topics, :class_name => 'Message', :conditions => "#{Message.table_name}.parent_id IS NULL", :order => "#{Message.table_name}.created_on DESC"
                has_many :messages, :dependent => :destroy, :order => "#{Message.table_name}.created_on DESC"
                belongs_to :last_message, :class_name => 'Message', :foreign_key => :last_message_id
                acts_as_tree :dependent => :nullify
                acts_as_list :scope => '(project_id = #{project_id} AND parent_id #{parent_id ? "= #{parent_id}" : "IS NULL"})'
                acts_as_watchable
                validates_presence_of :name, :description
                validates_length_of :name, :maximum => 30
                validates_length_of :description, :maximum => 255
                validate :validate_board
                scope :visible, lambda {|*args|
                  includes(:project).where(Project.allowed_to_condition(args.shift || User.current, :view_messages, *args))
                }
                safe_attributes 'name', 'description', 'parent_id', 'move_to'
                def visible?(user=User.current)
                  !user.nil? && user.allowed_to?(:view_messages, project)
                end
                def reload(*args)
                  @valid_parents = nil
                  super
                end
                def to_s
                  name
                end
                def valid_parents
                  @valid_parents ||= project.boards - self_and_descendants
                end
                def reset_counters!
                  self.class.reset_counters!(id)
                end
                # Updates topics_count, messages_count and last_message_id attributes for +board_id+
                def self.reset_counters!(board_id)
                  board_id = board_id.to_i
                  update_all("topics_count = (SELECT COUNT(*) FROM #{Message.table_name} WHERE board_id=#{board_id} AND parent_id IS NULL)," +
                             " messages_count = (SELECT COUNT(*) FROM #{Message.table_name} WHERE board_id=#{board_id})," +
                             " last_message_id = (SELECT MAX(id) FROM #{Message.table_name} WHERE board_id=#{board_id})",
                             ["id = ?", board_id])
                end
                def self.board_tree(boards, parent_id=nil, level=0)
                  tree = []
                  boards.select {|board| board.parent_id == parent_id}.sort_by(&:position).each do |board|
                    tree << [board, level]
                    tree += board_tree(boards, board.id, level+1)
                  end
                  if block_given?
                    tree.each do |board, level|
                      yield board, level
                    end
                  end
                  tree
                end
                protected
                def validate_board
                  if parent_id && parent_id_changed?
                    errors.add(:parent_id, :invalid) unless valid_parents.include?(parent)
                  end
                end
              end

app/models/change.rb +1 -1

              # Redmine - project management software
-             # Copyright (C) 2006-2012  Jean-Philippe Lang
+             # Copyright (C) 2006-2013  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 Change < ActiveRecord::Base
                belongs_to :changeset
                validates_presence_of :changeset_id, :action, :path
                before_save :init_path
                before_validation :replace_invalid_utf8_of_path
                def relative_path
                  changeset.repository.relative_path(path)
                end
                def replace_invalid_utf8_of_path
                  self.path      = Redmine::CodesetUtil.replace_invalid_utf8(self.path)
                  self.from_path = Redmine::CodesetUtil.replace_invalid_utf8(self.from_path)
                end
                def init_path
                  self.path ||= ""
                end
              end

app/models/changeset.rb +1 -1

              # Redmine - project management software
-             # Copyright (C) 2006-2012  Jean-Philippe Lang
+             # Copyright (C) 2006-2013  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 'iconv'
              class Changeset < ActiveRecord::Base
                belongs_to :repository
                belongs_to :user
                has_many :filechanges, :class_name => 'Change', :dependent => :delete_all
                has_and_belongs_to_many :issues
                has_and_belongs_to_many :parents,
                                        :class_name => "Changeset",
                                        :join_table => "#{table_name_prefix}changeset_parents#{table_name_suffix}",
                                        :association_foreign_key => 'parent_id', :foreign_key => 'changeset_id'
                has_and_belongs_to_many :children,
                                        :class_name => "Changeset",
                                        :join_table => "#{table_name_prefix}changeset_parents#{table_name_suffix}",
                                        :association_foreign_key => 'changeset_id', :foreign_key => 'parent_id'
                acts_as_event :title => Proc.new {|o| o.title},
                              :description => :long_comments,
                              :datetime => :committed_on,
                              :url => Proc.new {|o| {:controller => 'repositories', :action => 'revision', :id => o.repository.project, :repository_id => o.repository.identifier_param, :rev => o.identifier}}
                acts_as_searchable :columns => 'comments',
                                   :include => {:repository => :project},
                                   :project_key => "#{Repository.table_name}.project_id",
                                   :date_column => 'committed_on'
                acts_as_activity_provider :timestamp => "#{table_name}.committed_on",
                                          :author_key => :user_id,
                                          :find_options => {:include => [:user, {:repository => :project}]}
                validates_presence_of :repository_id, :revision, :committed_on, :commit_date
                validates_uniqueness_of :revision, :scope => :repository_id
                validates_uniqueness_of :scmid, :scope => :repository_id, :allow_nil => true
                scope :visible, lambda {|*args|
                  includes(:repository => :project).where(Project.allowed_to_condition(args.shift || User.current, :view_changesets, *args))
                }
                after_create :scan_for_issues
                before_create :before_create_cs
                def revision=(r)
                  write_attribute :revision, (r.nil? ? nil : r.to_s)
                end
                # Returns the identifier of this changeset; depending on repository backends
                def identifier
                  if repository.class.respond_to? :changeset_identifier
                    repository.class.changeset_identifier self
                  else
                    revision.to_s
                  end
                end
                def committed_on=(date)
                  self.commit_date = date
                  super
                end
                # Returns the readable identifier
                def format_identifier
                  if repository.class.respond_to? :format_changeset_identifier
                    repository.class.format_changeset_identifier self
                  else
                    identifier
                  end
                end
                def project
                  repository.project
                end
                def author
                  user || committer.to_s.split('<').first
                end
                def before_create_cs
                  self.committer = self.class.to_utf8(self.committer, repository.repo_log_encoding)
                  self.comments  = self.class.normalize_comments(
                                     self.comments, repository.repo_log_encoding)
                  self.user = repository.find_committer_user(self.committer)
                end
                def scan_for_issues
                  scan_comment_for_issue_ids
                end
                TIMELOG_RE = /
                  (
                  ((\d+)(h|hours?))((\d+)(m|min)?)?
                  |
                  ((\d+)(h|hours?|m|min))
                  |
                  (\d+):(\d+)
                  |
                  (\d+([\.,]\d+)?)h?
                  )
                  /x
                def scan_comment_for_issue_ids
                  return if comments.blank?
                  # keywords used to reference issues
                  ref_keywords = Setting.commit_ref_keywords.downcase.split(",").collect(&:strip)
                  ref_keywords_any = ref_keywords.delete('*')
                  # keywords used to fix issues
                  fix_keywords = Setting.commit_fix_keywords.downcase.split(",").collect(&:strip)
                  kw_regexp = (ref_keywords + fix_keywords).collect{|kw| Regexp.escape(kw)}.join("|")
                  referenced_issues = []
                  comments.scan(/([\s\(\[,-]|^)((#{kw_regexp})[\s:]+)?(#\d+(\s+@#{TIMELOG_RE})?([\s,;&]+#\d+(\s+@#{TIMELOG_RE})?)*)(?=[[:punct:]]|\s|<|$)/i) do |match|
                    action, refs = match[2], match[3]
                    next unless action.present? || ref_keywords_any
                    refs.scan(/#(\d+)(\s+@#{TIMELOG_RE})?/).each do |m|
                      issue, hours = find_referenced_issue_by_id(m[0].to_i), m[2]
                      if issue
                        referenced_issues << issue
                        fix_issue(issue) if fix_keywords.include?(action.to_s.downcase)
                        log_time(issue, hours) if hours && Setting.commit_logtime_enabled?
                      end
                    end
                  end
                  referenced_issues.uniq!
                  self.issues = referenced_issues unless referenced_issues.empty?
                end
                def short_comments
                  @short_comments || split_comments.first
                end
                def long_comments
                  @long_comments || split_comments.last
                end
                def text_tag(ref_project=nil)
                  tag = if scmid?
                    "commit:#{scmid}"
                  else
                    "r#{revision}"
                  end
                  if repository && repository.identifier.present?
                    tag = "#{repository.identifier}|#{tag}"
                  end
                  if ref_project && project && ref_project != project
                    tag = "#{project.identifier}:#{tag}"
                  end
                  tag
                end
                # Returns the title used for the changeset in the activity/search results
                def title
                  repo = (repository && repository.identifier.present?) ? " (#{repository.identifier})" : ''
                  comm = short_comments.blank? ? '' : (': ' + short_comments)
                  "#{l(:label_revision)} #{format_identifier}#{repo}#{comm}"
                end
                # Returns the previous changeset
                def previous
                  @previous ||= Changeset.where(["id < ? AND repository_id = ?", id, repository_id]).order('id DESC').first
                end
                # Returns the next changeset
                def next
                  @next ||= Changeset.where(["id > ? AND repository_id = ?", id, repository_id]).order('id ASC').first
                end
                # Creates a new Change from it's common parameters
                def create_change(change)
                  Change.create(:changeset     => self,
                                :action        => change[:action],
                                :path          => change[:path],
                                :from_path     => change[:from_path],
                                :from_revision => change[:from_revision])
                end
                # Finds an issue that can be referenced by the commit message
                def find_referenced_issue_by_id(id)
                  return nil if id.blank?
                  issue = Issue.find_by_id(id.to_i, :include => :project)
                  if Setting.commit_cross_project_ref?
                    # all issues can be referenced/fixed
                  elsif issue
                    # issue that belong to the repository project, a subproject or a parent project only
                    unless issue.project &&
                              (project == issue.project || project.is_ancestor_of?(issue.project) ||
                               project.is_descendant_of?(issue.project))
                      issue = nil
                    end
                  end
                  issue
                end
                private
                def fix_issue(issue)
                  status = IssueStatus.find_by_id(Setting.commit_fix_status_id.to_i)
                  if status.nil?
                    logger.warn("No status matches commit_fix_status_id setting (#{Setting.commit_fix_status_id})") if logger
                    return issue
                  end
                  # the issue may have been updated by the closure of another one (eg. duplicate)
                  issue.reload
                  # don't change the status is the issue is closed
                  return if issue.status && issue.status.is_closed?
                  journal = issue.init_journal(user || User.anonymous, ll(Setting.default_language, :text_status_changed_by_changeset, text_tag(issue.project)))
                  issue.status = status
                  unless Setting.commit_fix_done_ratio.blank?
                    issue.done_ratio = Setting.commit_fix_done_ratio.to_i
                  end
                  Redmine::Hook.call_hook(:model_changeset_scan_commit_for_issue_ids_pre_issue_update,
                                          { :changeset => self, :issue => issue })
                  unless issue.save
                    logger.warn("Issue ##{issue.id} could not be saved by changeset #{id}: #{issue.errors.full_messages}") if logger
                  end
                  issue
                end
                def log_time(issue, hours)
                  time_entry = TimeEntry.new(
                    :user => user,
                    :hours => hours,
                    :issue => issue,
                    :spent_on => commit_date,
                    :comments => l(:text_time_logged_by_changeset, :value => text_tag(issue.project),
                                   :locale => Setting.default_language)
                    )
                  time_entry.activity = log_time_activity unless log_time_activity.nil?
                  unless time_entry.save
                    logger.warn("TimeEntry could not be created by changeset #{id}: #{time_entry.errors.full_messages}") if logger
                  end
                  time_entry
                end
                def log_time_activity
                  if Setting.commit_logtime_activity_id.to_i > 0
                    TimeEntryActivity.find_by_id(Setting.commit_logtime_activity_id.to_i)
                  end
                end
                def split_comments
                  comments =~ /\A(.+?)\r?\n(.*)$/m
                  @short_comments = $1 || comments
                  @long_comments = $2.to_s.strip
                  return @short_comments, @long_comments
                end
                public
                # Strips and reencodes a commit log before insertion into the database
                def self.normalize_comments(str, encoding)
                  Changeset.to_utf8(str.to_s.strip, encoding)
                end
                def self.to_utf8(str, encoding)
                  Redmine::CodesetUtil.to_utf8(str, encoding)
                end
              end

app/models/comment.rb +1 -1

              # Redmine - project management software
-             # Copyright (C) 2006-2012  Jean-Philippe Lang
+             # Copyright (C) 2006-2013  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 Comment < ActiveRecord::Base
                include Redmine::SafeAttributes
                belongs_to :commented, :polymorphic => true, :counter_cache => true
                belongs_to :author, :class_name => 'User', :foreign_key => 'author_id'
                validates_presence_of :commented, :author, :comments
                safe_attributes 'comments'
              end

app/models/comment_observer.rb +1 -1

              # Redmine - project management software
-             # Copyright (C) 2006-2012  Jean-Philippe Lang
+             # Copyright (C) 2006-2013  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 CommentObserver < ActiveRecord::Observer
                def after_create(comment)
                  if comment.commented.is_a?(News) && Setting.notified_events.include?('news_comment_added')
                    Mailer.news_comment_added(comment).deliver
                  end
                end
              end

app/models/custom_field.rb +1 -1

              # Redmine - project management software
-             # Copyright (C) 2006-2012  Jean-Philippe Lang
+             # Copyright (C) 2006-2013  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
                after_save :handle_multiplicity_change
                scope :sorted, lambda { order("#{table_name}.position ASC") }
                CUSTOM_FIELDS_TABS = [
                  {:name => 'IssueCustomField', :partial => 'custom_fields/index',
                   :label => :label_issue_plural},
                  {:name => 'TimeEntryCustomField', :partial => 'custom_fields/index',
                   :label => :label_spent_time},
                  {:name => 'ProjectCustomField', :partial => 'custom_fields/index',
                   :label => :label_project_plural},
                  {:name => 'VersionCustomField', :partial => 'custom_fields/index',
                   :label => :label_version_plural},
                  {:name => 'UserCustomField', :partial => 'custom_fields/index',
                   :label => :label_user_plural},
                  {:name => 'GroupCustomField', :partial => 'custom_fields/index',
                   :label => :label_group_plural},
                  {:name => 'TimeEntryActivityCustomField', :partial => 'custom_fields/index',
                   :label => TimeEntryActivity::OptionName},
                  {:name => 'IssuePriorityCustomField', :partial => 'custom_fields/index',
                   :label => IssuePriority::OptionName},
                  {:name => 'DocumentCategoryCustomField', :partial => 'custom_fields/index',
                   :label => DocumentCategory::OptionName}
                ]
                CUSTOM_FIELDS_NAMES = CUSTOM_FIELDS_TABS.collect{|v| v[:name]}
                def field_format=(arg)
                  # cannot change format of a saved custom field
                  super if new_record?
                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
                    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
                    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)
                    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
                def value_from_keyword(keyword, customized)
                  possible_values_options = possible_values_options(customized)
                  if possible_values_options.present?
                    keyword = keyword.to_s.downcase
                    if v = possible_values_options.detect {|text, id| text.downcase == keyword}
                      if v.is_a?(Array)
                        v.last
                      else
                        v
                      end
                    end
                  else
                    keyword
                  end
                end
                # Returns a ORDER BY clause that can used to sort customized
                # objects by their value of the custom field.
                # Returns nil 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(#{join_alias}.value, '')"
                    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
                      "CAST(CASE #{join_alias}.value WHEN '' THEN '0' ELSE #{join_alias}.value END AS decimal(30,3))"
                    when 'user', 'version'
                      value_class.fields_for_order_statement(value_join_alias)
                    else
                      nil
                  end
                end
                # Returns a GROUP BY clause that can used to group by custom value
                # Returns nil if the custom field can not be used for grouping.
                def group_statement
                  return nil if multiple?
                  case field_format
                    when 'list', 'date', 'bool', 'int'
                      order_statement
                    when 'user', 'version'
                      "COALESCE(#{join_alias}.value, '')"
                    else
                      nil
                  end
                end
                def join_for_order_statement
                  case field_format
                    when 'user', 'version'
                      "LEFT OUTER JOIN #{CustomValue.table_name} #{join_alias}" +
                        " ON #{join_alias}.customized_type = '#{self.class.customized_class.base_class.name}'" +
                        " AND #{join_alias}.customized_id = #{self.class.customized_class.table_name}.id" +
                        " AND #{join_alias}.custom_field_id = #{id}" +
                        " AND #{join_alias}.value <> ''" +
                        " AND #{join_alias}.id = (SELECT max(#{join_alias}_2.id) FROM #{CustomValue.table_name} #{join_alias}_2" +
                          " WHERE #{join_alias}_2.customized_type = #{join_alias}.customized_type" +
                          " AND #{join_alias}_2.customized_id = #{join_alias}.customized_id" +
                          " AND #{join_alias}_2.custom_field_id = #{join_alias}.custom_field_id)" +
                        " LEFT OUTER JOIN #{value_class.table_name} #{value_join_alias}" +
                        " ON CAST(CASE #{join_alias}.value WHEN '' THEN '0' ELSE #{join_alias}.value END AS decimal(30,0)) = #{value_join_alias}.id"
                    when 'int', 'float'
                      "LEFT OUTER JOIN #{CustomValue.table_name} #{join_alias}" +
                        " ON #{join_alias}.customized_type = '#{self.class.customized_class.base_class.name}'" +
                        " AND #{join_alias}.customized_id = #{self.class.customized_class.table_name}.id" +
                        " AND #{join_alias}.custom_field_id = #{id}" +
                        " AND #{join_alias}.value <> ''" +
                        " AND #{join_alias}.id = (SELECT max(#{join_alias}_2.id) FROM #{CustomValue.table_name} #{join_alias}_2" +
                          " WHERE #{join_alias}_2.customized_type = #{join_alias}.customized_type" +
                          " AND #{join_alias}_2.customized_id = #{join_alias}.customized_id" +
                          " AND #{join_alias}_2.custom_field_id = #{join_alias}.custom_field_id)"
                    when 'string', 'text', 'list', 'date', 'bool'
                      "LEFT OUTER JOIN #{CustomValue.table_name} #{join_alias}" +
                        " ON #{join_alias}.customized_type = '#{self.class.customized_class.base_class.name}'" +
                        " AND #{join_alias}.customized_id = #{self.class.customized_class.table_name}.id" +
                        " AND #{join_alias}.custom_field_id = #{id}" +
                        " AND #{join_alias}.id = (SELECT max(#{join_alias}_2.id) FROM #{CustomValue.table_name} #{join_alias}_2" +
                          " WHERE #{join_alias}_2.customized_type = #{join_alias}.customized_type" +
                          " AND #{join_alias}_2.customized_id = #{join_alias}.customized_id" +
                          " AND #{join_alias}_2.custom_field_id = #{join_alias}.custom_field_id)"
                    else
                      nil
                  end
                end
                def join_alias
                  "cf_#{id}"
                end
                def value_join_alias
                  join_alias + "_" + field_format
                end
                def <=>(field)
                  position <=> field.position
                end
                # Returns the class that values represent
                def value_class
                  case field_format
                    when 'user', 'version'
                      field_format.classify.constantize
                    else
                      nil
                  end
                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
                  where(:is_for_all => true).order('position').all
                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
                def format_in?(*args)
                  args.include?(field_format)
                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
                # Removes multiple values for the custom field after setting the multiple attribute to false
                # We kepp the value with the highest id for each customized object
                def handle_multiplicity_change
                  if !new_record? && multiple_was && !multiple
                    ids = custom_values.
                      where("EXISTS(SELECT 1 FROM #{CustomValue.table_name} cve WHERE cve.custom_field_id = #{CustomValue.table_name}.custom_field_id" +
                        " AND cve.customized_type = #{CustomValue.table_name}.customized_type AND cve.customized_id = #{CustomValue.table_name}.customized_id" +
                        " AND cve.id > #{CustomValue.table_name}.id)").
                      pluck(:id)
                    if ids.any?
                      custom_values.where(:id => ids).delete_all
                    end
                  end
                end
              end

app/models/custom_field_value.rb +1 -1

              # Redmine - project management software
-             # Copyright (C) 2006-2012  Jean-Philippe Lang
+             # Copyright (C) 2006-2013  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 CustomFieldValue
                attr_accessor :custom_field, :customized, :value
                def custom_field_id
                  custom_field.id
                end
                def true?
                  self.value == '1'
                end
                def editable?
                  custom_field.editable?
                end
                def visible?
                  custom_field.visible?
                end
                def required?
                  custom_field.is_required?
                end
                def to_s
                  value.to_s
                end
                def validate_value
                  custom_field.validate_field_value(value).each do |message|
                    customized.errors.add(:base, custom_field.name + ' ' + message)
                  end
                end
              end

app/models/custom_value.rb +1 -1

              # Redmine - project management software
-             # Copyright (C) 2006-2012  Jean-Philippe Lang
+             # Copyright (C) 2006-2013  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 CustomValue < ActiveRecord::Base
                belongs_to :custom_field
                belongs_to :customized, :polymorphic => true
                def initialize(attributes=nil, *args)
                  super
                  if new_record? && custom_field && (customized_type.blank? || (customized && customized.new_record?))
                    self.value ||= custom_field.default_value
                  end
                end
                # Returns true if the boolean custom value is true
                def true?
                  self.value == '1'
                end
                def editable?
                  custom_field.editable?
                end
                def visible?
                  custom_field.visible?
                end
                def required?
                  custom_field.is_required?
                end
                def to_s
                  value.to_s
                end
              end

app/models/document.rb +1 -1

              # Redmine - project management software
-             # Copyright (C) 2006-2012  Jean-Philippe Lang
+             # Copyright (C) 2006-2013  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 Document < ActiveRecord::Base
                include Redmine::SafeAttributes
                belongs_to :project
                belongs_to :category, :class_name => "DocumentCategory", :foreign_key => "category_id"
                acts_as_attachable :delete_permission => :manage_documents
                acts_as_searchable :columns => ['title', "#{table_name}.description"], :include => :project
                acts_as_event :title => Proc.new {|o| "#{l(:label_document)}: #{o.title}"},
                              :author => Proc.new {|o| o.attachments.reorder("#{Attachment.table_name}.created_on ASC").first.try(:author) },
                              :url => Proc.new {|o| {:controller => 'documents', :action => 'show', :id => o.id}}
                acts_as_activity_provider :find_options => {:include => :project}
                validates_presence_of :project, :title, :category
                validates_length_of :title, :maximum => 60
                scope :visible, lambda {|*args|
                  includes(:project).where(Project.allowed_to_condition(args.shift || User.current, :view_documents, *args))
                }
                safe_attributes 'category_id', 'title', 'description'
                def visible?(user=User.current)
                  !user.nil? && user.allowed_to?(:view_documents, project)
                end
                def initialize(attributes=nil, *args)
                  super
                  if new_record?
                    self.category ||= DocumentCategory.default
                  end
                end
                def updated_on
                  unless @updated_on
                    a = attachments.last
                    @updated_on = (a && a.created_on) || created_on
                  end
                  @updated_on
                end
              end

app/models/document_category.rb +1 -1

              # Redmine - project management software
-             # Copyright (C) 2006-2012  Jean-Philippe Lang
+             # Copyright (C) 2006-2013  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 DocumentCategory < Enumeration
                has_many :documents, :foreign_key => 'category_id'
                OptionName = :enumeration_doc_categories
                def option_name
                  OptionName
                end
                def objects_count
                  documents.count
                end
                def transfer_relations(to)
                  documents.update_all("category_id = #{to.id}")
                end
                def self.default
                  d = super
                  d = first if d.nil?
                  d
                end
              end

app/models/document_category_custom_field.rb +1 -1

              # Redmine - project management software
-             # Copyright (C) 2006-2012  Jean-Philippe Lang
+             # Copyright (C) 2006-2013  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 DocumentCategoryCustomField < CustomField
                def type_name
                  :enumeration_doc_categories
                end
              end

app/models/document_observer.rb +1 -1

              # Redmine - project management software
-             # Copyright (C) 2006-2012  Jean-Philippe Lang
+             # Copyright (C) 2006-2013  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 DocumentObserver < ActiveRecord::Observer
                def after_create(document)
                  Mailer.document_added(document).deliver if Setting.notified_events.include?('document_added')
                end
              end

app/models/enabled_module.rb +1 -1

              # Redmine - project management software
-             # Copyright (C) 2006-2012  Jean-Philippe Lang
+             # Copyright (C) 2006-2013  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 EnabledModule < ActiveRecord::Base
                belongs_to :project
                validates_presence_of :name
                validates_uniqueness_of :name, :scope => :project_id
                after_create :module_enabled
                private
                # after_create callback used to do things when a module is enabled
                def module_enabled
                  case name
                  when 'wiki'
                    # Create a wiki with a default start page
                    if project && project.wiki.nil?
                      Wiki.create(:project => project, :start_page => 'Wiki')
                    end
                  end
                end
              end

app/models/enumeration.rb +1 -1

              # Redmine - project management software
-             # Copyright (C) 2006-2012  Jean-Philippe Lang
+             # Copyright (C) 2006-2013  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 Enumeration < ActiveRecord::Base
                include Redmine::SubclassFactory
                default_scope :order => "#{Enumeration.table_name}.position ASC"
                belongs_to :project
                acts_as_list :scope => 'type = \'#{type}\''
                acts_as_customizable
                acts_as_tree :order => "#{Enumeration.table_name}.position ASC"
                before_destroy :check_integrity
                before_save    :check_default
                attr_protected :type
                validates_presence_of :name
                validates_uniqueness_of :name, :scope => [:type, :project_id]
                validates_length_of :name, :maximum => 30
                scope :shared, lambda { where(:project_id => nil) }
                scope :sorted, lambda { order("#{table_name}.position ASC") }
                scope :active, lambda { where(:active => true) }
                scope :named, lambda {|arg| where("LOWER(#{table_name}.name) = LOWER(?)", arg.to_s.strip)}
                def self.default
                  # Creates a fake default scope so Enumeration.default will check
                  # it's type.  STI subclasses will automatically add their own
                  # types to the finder.
                  if self.descends_from_active_record?
                    where(:is_default => true, :type => 'Enumeration').first
                  else
                    # STI classes are
                    where(:is_default => true).first
                  end
                end
                # Overloaded on concrete classes
                def option_name
                  nil
                end
                def check_default
                  if is_default? && is_default_changed?
                    Enumeration.update_all({:is_default => false}, {:type => type})
                  end
                end
                # Overloaded on concrete classes
                def objects_count
 
                end
                def in_use?
                  self.objects_count != 0
                end
                # Is this enumeration overiding a system level enumeration?
                def is_override?
                  !self.parent.nil?
                end
                alias :destroy_without_reassign :destroy
                # Destroy the enumeration
                # If a enumeration is specified, objects are reassigned
                def destroy(reassign_to = nil)
                  if reassign_to && reassign_to.is_a?(Enumeration)
                    self.transfer_relations(reassign_to)
                  end
                  destroy_without_reassign
                end
                def <=>(enumeration)
                  position <=> enumeration.position
                end
                def to_s; name end
                # Returns the Subclasses of Enumeration.  Each Subclass needs to be
                # required in development mode.
                #
                # Note: subclasses is protected in ActiveRecord
                def self.get_subclasses
                  subclasses
                end
                # Does the +new+ Hash override the previous Enumeration?
                def self.overridding_change?(new, previous)
                  if (same_active_state?(new['active'], previous.active)) && same_custom_values?(new,previous)
                    return false
                  else
                    return true
                  end
                end
                # Does the +new+ Hash have the same custom values as the previous Enumeration?
                def self.same_custom_values?(new, previous)
                  previous.custom_field_values.each do |custom_value|
                    if custom_value.value != new["custom_field_values"][custom_value.custom_field_id.to_s]
                      return false
                    end
                  end
                  return true
                end
                # Are the new and previous fields equal?
                def self.same_active_state?(new, previous)
                  new = (new == "1" ? true : false)
                  return new == previous
                end
              private
                def check_integrity
                  raise "Can't delete enumeration" if self.in_use?
                end
              end
              # Force load the subclasses in development mode
              require_dependency 'time_entry_activity'
              require_dependency 'document_category'
              require_dependency 'issue_priority'

app/models/group.rb +1 -1

              # Redmine - project management software
-             # Copyright (C) 2006-2012  Jean-Philippe Lang
+             # Copyright (C) 2006-2013  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 Group < Principal
                include Redmine::SafeAttributes
                has_and_belongs_to_many :users, :after_add => :user_added,
                                                :after_remove => :user_removed
                acts_as_customizable
                validates_presence_of :lastname
                validates_uniqueness_of :lastname, :case_sensitive => false
                validates_length_of :lastname, :maximum => 30
                before_destroy :remove_references_before_destroy
                scope :sorted, lambda { order("#{table_name}.lastname ASC") }
                safe_attributes 'name',
                  'user_ids',
                  'custom_field_values',
                  'custom_fields',
                  :if => lambda {|group, user| user.admin?}
                def to_s
                  lastname.to_s
                end
                def name
                  lastname
                end
                def name=(arg)
                  self.lastname = arg
                end
                def user_added(user)
                  members.each do |member|
                    next if member.project.nil?
                    user_member = Member.find_by_project_id_and_user_id(member.project_id, user.id) || Member.new(:project_id => member.project_id, :user_id => user.id)
                    member.member_roles.each do |member_role|
                      user_member.member_roles << MemberRole.new(:role => member_role.role, :inherited_from => member_role.id)
                    end
                    user_member.save!
                  end
                end
                def user_removed(user)
                  members.each do |member|
                    MemberRole.
                      includes(:member).
                      where("#{Member.table_name}.user_id = ? AND #{MemberRole.table_name}.inherited_from IN (?)", user.id, member.member_role_ids).
                      all.
                      each(&:destroy)
                  end
                end
                def self.human_attribute_name(attribute_key_name, *args)
                  attr_name = attribute_key_name.to_s
                  if attr_name == 'lastname'
                    attr_name = "name"
                  end
                  super(attr_name, *args)
                end
                private
                # Removes references that are not handled by associations
                def remove_references_before_destroy
                  return if self.id.nil?
                  Issue.update_all 'assigned_to_id = NULL', ['assigned_to_id = ?', id]
                end
              end

app/models/group_custom_field.rb +1 -1

              # Redmine - project management software
-             # Copyright (C) 2006-2012  Jean-Philippe Lang
+             # Copyright (C) 2006-2013  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 GroupCustomField < CustomField
                def type_name
                  :label_group_plural
                end
              end

app/models/issue.rb 0 0

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

app/models/issue_category.rb 0 0

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

app/models/issue_custom_field.rb 0 0

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

app/models/issue_observer.rb 0 0

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

app/models/issue_priority.rb 0 0

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

app/models/issue_priority_custom_field.rb 0 0

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

app/models/issue_query.rb 0 0

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

app/models/issue_relation.rb 0 0

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

app/models/issue_status.rb 0 0

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

app/models/journal.rb 0 0

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

app/models/journal_detail.rb 0 0

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

app/models/journal_observer.rb 0 0

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

app/models/mail_handler.rb 0 0

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

app/models/mailer.rb 0 0

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

app/models/member.rb 0 0

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

app/models/member_role.rb 0 0

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

app/models/message.rb 0 0

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

app/models/message_observer.rb 0 0

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

app/models/news.rb 0 0

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

app/models/news_observer.rb 0 0

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

app/models/principal.rb 0 0

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

app/models/project.rb 0 0

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

app/models/project_custom_field.rb 0 0

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

app/models/query.rb 0 0

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

app/models/repository.rb 0 0

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

app/models/repository/bazaar.rb 0 0

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

app/models/repository/cvs.rb 0 0

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

app/models/repository/darcs.rb 0 0

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

app/models/repository/filesystem.rb 0 0

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

app/models/repository/git.rb 0 0

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

app/models/repository/mercurial.rb 0 0

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

app/models/repository/subversion.rb 0 0

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

app/models/role.rb 0 0

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

app/models/setting.rb 0 0

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

app/models/time_entry.rb 0 0

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

app/models/time_entry_activity.rb 0 0

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

app/models/time_entry_activity_custom_field.rb 0 0

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

app/models/time_entry_custom_field.rb 0 0

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

app/models/time_entry_query.rb 0 0

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

app/models/token.rb 0 0

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

app/models/tracker.rb 0 0

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

app/models/user.rb 0 0

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

app/models/user_custom_field.rb 0 0

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

app/models/user_preference.rb 0 0

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

app/models/version.rb 0 0

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

app/models/version_custom_field.rb 0 0

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

app/models/watcher.rb 0 0

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

app/models/wiki.rb 0 0

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

app/models/wiki_content.rb 0 0

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

app/models/wiki_content_observer.rb 0 0

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

app/models/wiki_page.rb 0 0

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

app/models/wiki_redirect.rb 0 0

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

app/models/workflow_permission.rb 0 0

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

app/models/workflow_rule.rb 0 0

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

app/models/workflow_transition.rb 0 0

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

app/views/layouts/base.html.erb 0 0

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

config/routes.rb 0 0

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

config/settings.yml 0 0

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

doc/CHANGELOG 0 0

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

doc/INSTALL 0 0

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

doc/README_FOR_APP 0 0

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

doc/UPGRADING 0 0

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

lib/plugins/acts_as_activity_provider/lib/acts_as_activity_provider.rb 0 0

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

lib/plugins/acts_as_attachable/lib/acts_as_attachable.rb 0 0

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

lib/plugins/acts_as_customizable/lib/acts_as_customizable.rb 0 0

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

lib/plugins/acts_as_event/lib/acts_as_event.rb 0 0

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

lib/plugins/acts_as_searchable/lib/acts_as_searchable.rb 0 0

	1		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
The requested commit or file is too big and content was truncated. Show full diff

lib/redmine/access_control.rb 0 0

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

lib/redmine/access_keys.rb 0 0

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

lib/redmine/activity.rb 0 0

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

lib/redmine/activity/fetcher.rb 0 0

	1		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
The requested commit or file is too big and content was truncated. Show full diff

lib/redmine/configuration.rb 0 0

	1		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
The requested commit or file is too big and content was truncated. Show full diff

lib/redmine/core_ext/date/calculations.rb 0 0

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

lib/redmine/core_ext/string/conversions.rb 0 0

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

lib/redmine/core_ext/string/inflections.rb 0 0

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

lib/redmine/custom_field_format.rb 0 0

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

lib/redmine/default_data/loader.rb 0 0

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

lib/redmine/export/pdf.rb 0 0

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

lib/redmine/helpers/calendar.rb 0 0

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

lib/redmine/helpers/diff.rb 0 0

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

lib/redmine/helpers/gantt.rb 0 0

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

lib/redmine/helpers/time_report.rb 0 0

	1		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
The requested commit or file is too big and content was truncated. Show full diff

lib/redmine/i18n.rb 0 0

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

lib/redmine/imap.rb 0 0

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

lib/redmine/menu_manager.rb 0 0

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

lib/redmine/mime_type.rb 0 0

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

lib/redmine/pagination.rb 0 0

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

lib/redmine/platform.rb 0 0

	1		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
The requested commit or file is too big and content was truncated. Show full diff

lib/redmine/pop3.rb 0 0

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

lib/redmine/safe_attributes.rb 0 0

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

lib/redmine/search.rb 0 0

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

lib/redmine/subclass_factory.rb 0 0

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

lib/redmine/syntax_highlighting.rb 0 0

	1		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
The requested commit or file is too big and content was truncated. Show full diff

lib/redmine/thumbnail.rb 0 0

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

lib/redmine/unified_diff.rb 0 0

	1		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
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
The requested commit or file is too big and content was truncated. Show full diff

lib/redmine/views/builders.rb 0 0

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

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

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

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

	1		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
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
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
The requested commit or file is too big and content was truncated. Show full diff

lib/redmine/views/other_formats_builder.rb 0 0

	1		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
The requested commit or file is too big and content was truncated. Show full diff

lib/redmine/wiki_formatting/macros.rb 0 0

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

lib/redmine/wiki_formatting/textile/formatter.rb 0 0

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

lib/redmine/wiki_formatting/textile/helper.rb 0 0

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

lib/tasks/ciphering.rake 0 0

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

lib/tasks/email.rake 0 0

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

lib/tasks/migrate_from_mantis.rake 0 0

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

lib/tasks/migrate_from_trac.rake 0 0

	1		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
The requested commit or file is too big and content was truncated. Show full diff

lib/tasks/reminder.rake 0 0

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

public/javascripts/application.js 0 0

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

public/javascripts/attachments.js 0 0

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

test/extra/redmine_pm/repository_git_test.rb 0 0

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

test/extra/redmine_pm/repository_subversion_test.rb 0 0

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

test/extra/redmine_pm/test_case.rb 0 0

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

test/functional/account_controller_openid_test.rb 0 0

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

test/functional/account_controller_test.rb 0 0

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

test/functional/activities_controller_test.rb 0 0

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

test/functional/admin_controller_test.rb 0 0

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

test/functional/attachments_controller_test.rb 0 0

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

test/functional/auth_sources_controller_test.rb 0 0

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

test/functional/auto_completes_controller_test.rb 0 0

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

test/functional/boards_controller_test.rb 0 0

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

test/functional/calendars_controller_test.rb 0 0

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

test/functional/comments_controller_test.rb 0 0

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

test/functional/context_menus_controller_test.rb 0 0

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

test/functional/custom_fields_controller_test.rb 0 0

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

test/functional/documents_controller_test.rb 0 0

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

test/functional/enumerations_controller_test.rb 0 0

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

test/functional/files_controller_test.rb 0 0

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

test/functional/gantts_controller_test.rb 0 0

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

test/functional/groups_controller_test.rb 0 0

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

test/functional/issue_categories_controller_test.rb 0 0

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

test/functional/issue_relations_controller_test.rb 0 0

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

test/functional/issue_statuses_controller_test.rb 0 0

	1		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
The requested commit or file is too big and content was truncated. Show full diff

test/functional/issues_controller_transaction_test.rb 0 0

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

test/functional/journals_controller_test.rb 0 0

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

test/functional/mail_handler_controller_test.rb 0 0

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

test/functional/members_controller_test.rb 0 0

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

test/functional/messages_controller_test.rb 0 0

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

test/functional/my_controller_test.rb 0 0

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

test/functional/news_controller_test.rb 0 0

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

test/functional/previews_controller_test.rb 0 0

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

test/functional/project_enumerations_controller_test.rb 0 0

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

test/functional/projects_controller_test.rb 0 0

	1		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
The requested commit or file is too big and content was truncated. Show full diff

test/functional/reports_controller_test.rb 0 0

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

test/functional/repositories_bazaar_controller_test.rb 0 0

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

test/functional/repositories_controller_test.rb 0 0

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

test/functional/repositories_cvs_controller_test.rb 0 0

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

test/functional/repositories_darcs_controller_test.rb 0 0

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

test/functional/repositories_filesystem_controller_test.rb 0 0

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

test/functional/repositories_git_controller_test.rb 0 0

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

test/functional/repositories_mercurial_controller_test.rb 0 0

	1		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
The requested commit or file is too big and content was truncated. Show full diff

test/functional/roles_controller_test.rb 0 0

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

test/functional/search_controller_test.rb 0 0

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

test/functional/sessions_test.rb 0 0

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

test/functional/settings_controller_test.rb 0 0

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

test/functional/sys_controller_test.rb 0 0

	1		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
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
The requested commit or file is too big and content was truncated. Show full diff

test/functional/trackers_controller_test.rb 0 0

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

test/functional/users_controller_test.rb 0 0

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

test/functional/versions_controller_test.rb 0 0

	1		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
The requested commit or file is too big and content was truncated. Show full diff

test/functional/welcome_controller_test.rb 0 0

	1		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
The requested commit or file is too big and content was truncated. Show full diff

test/functional/wikis_controller_test.rb 0 0

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

test/functional/workflows_controller_test.rb 0 0

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

test/integration/account_test.rb 0 0

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

test/integration/admin_test.rb 0 0

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

test/integration/api_test/attachments_test.rb 0 0

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

test/integration/api_test/authentication_test.rb 0 0

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

test/integration/api_test/enumerations_test.rb 0 0

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

test/integration/api_test/groups_test.rb 0 0

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

test/integration/api_test/issue_categories_test.rb 0 0

	1		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
The requested commit or file is too big and content was truncated. Show full diff

test/integration/api_test/issue_statuses_test.rb 0 0

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

test/integration/api_test/issues_test.rb 0 0

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

test/integration/api_test/jsonp_test.rb 0 0

	1		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
The requested commit or file is too big and content was truncated. Show full diff

test/integration/api_test/news_test.rb 0 0

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

test/integration/api_test/projects_test.rb 0 0

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

test/integration/api_test/queries_test.rb 0 0

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

test/integration/api_test/roles_test.rb 0 0

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

test/integration/api_test/time_entries_test.rb 0 0

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

test/integration/api_test/trackers_test.rb 0 0

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

test/integration/api_test/users_test.rb 0 0

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

test/integration/api_test/versions_test.rb 0 0

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

test/integration/api_test/wiki_pages_test.rb 0 0

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

test/integration/application_test.rb 0 0

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

test/integration/attachments_test.rb 0 0

	1		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
The requested commit or file is too big and content was truncated. Show full diff

test/integration/layout_test.rb 0 0

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

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

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

test/integration/lib/redmine/menu_manager_test.rb 0 0

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

test/integration/lib/redmine/themes_test.rb 0 0

	1		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
The requested commit or file is too big and content was truncated. Show full diff

test/integration/repositories_git_test.rb 0 0

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

test/integration/routing/account_test.rb 0 0

	1		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
The requested commit or file is too big and content was truncated. Show full diff

test/integration/routing/admin_test.rb 0 0

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

test/integration/routing/attachments_test.rb 0 0

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

test/integration/routing/auth_sources_test.rb 0 0

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

test/integration/routing/auto_completes_test.rb 0 0

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

test/integration/routing/boards_test.rb 0 0

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

test/integration/routing/calendars_test.rb 0 0

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

test/integration/routing/comments_test.rb 0 0

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

test/integration/routing/context_menus_test.rb 0 0

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

test/integration/routing/custom_fields_test.rb 0 0

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

test/integration/routing/documents_test.rb 0 0

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

test/integration/routing/enumerations_test.rb 0 0

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

test/integration/routing/files_test.rb 0 0

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

test/integration/routing/gantts_test.rb 0 0

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

test/integration/routing/groups_test.rb 0 0

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

test/integration/routing/issue_categories_test.rb 0 0

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

test/integration/routing/issue_relations_test.rb 0 0

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

test/integration/routing/issue_statuses_test.rb 0 0

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

test/integration/routing/issues_test.rb 0 0

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

test/integration/routing/journals_test.rb 0 0

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

test/integration/routing/mail_handler_test.rb 0 0

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

test/integration/routing/members_test.rb 0 0

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

test/integration/routing/messages_test.rb 0 0

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

test/integration/routing/my_test.rb 0 0

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

test/integration/routing/news_test.rb 0 0

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

test/integration/routing/previews_test.rb 0 0

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

test/integration/routing/project_enumerations_test.rb 0 0

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

test/integration/routing/projects_test.rb 0 0

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

test/integration/routing/queries_test.rb 0 0

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

test/integration/routing/reports_test.rb 0 0

	1		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
The requested commit or file is too big and content was truncated. Show full diff

test/integration/routing/roles_test.rb 0 0

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

test/integration/routing/search_test.rb 0 0

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

test/integration/routing/settings_test.rb 0 0

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

test/integration/routing/sys_test.rb 0 0

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

test/integration/routing/timelog_test.rb 0 0

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

test/integration/routing/trackers_test.rb 0 0

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

test/integration/routing/users_test.rb 0 0

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

test/integration/routing/versions_test.rb 0 0

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

test/integration/routing/watchers_test.rb 0 0

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

test/integration/routing/welcome_test.rb 0 0

	1		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
The requested commit or file is too big and content was truncated. Show full diff

test/integration/routing/wikis_test.rb 0 0

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

test/integration/routing/workflows_test.rb 0 0

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

test/integration/users_test.rb 0 0

	1		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
The requested commit or file is too big and content was truncated. Show full diff

test/unit/activity_test.rb 0 0

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

test/unit/attachment_test.rb 0 0

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

test/unit/auth_source_ldap_test.rb 0 0

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

test/unit/board_test.rb 0 0

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

test/unit/changeset_test.rb 0 0

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

test/unit/comment_test.rb 0 0

	1		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
The requested commit or file is too big and content was truncated. Show full diff

test/unit/custom_field_user_format_test.rb 0 0

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

test/unit/custom_field_version_format_test.rb 0 0

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

test/unit/custom_value_test.rb 0 0

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

test/unit/default_data_test.rb 0 0

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

test/unit/document_category_test.rb 0 0

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

test/unit/document_test.rb 0 0

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

test/unit/enabled_module_test.rb 0 0

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

test/unit/enumeration_test.rb 0 0

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

test/unit/group_test.rb 0 0

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

test/unit/helpers/activities_helper_test.rb 0 0

	1		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
The requested commit or file is too big and content was truncated. Show full diff

test/unit/helpers/custom_fields_helper_test.rb 0 0

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

test/unit/helpers/issues_helper_test.rb 0 0

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

test/unit/helpers/projects_helper_test.rb 0 0

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

test/unit/helpers/queries_helper_test.rb 0 0

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

test/unit/helpers/search_helper_test.rb 0 0

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

test/unit/helpers/sort_helper_test.rb 0 0

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

test/unit/helpers/timelog_helper_test.rb 0 0

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

test/unit/initializers/patches_test.rb 0 0

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

test/unit/issue_category_test.rb 0 0

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

test/unit/issue_nested_set_test.rb 0 0

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

test/unit/issue_priority_test.rb 0 0

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

test/unit/issue_relation_test.rb 0 0

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

test/unit/issue_status_test.rb 0 0

	1		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
The requested commit or file is too big and content was truncated. Show full diff

test/unit/issue_transaction_test.rb 0 0

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

test/unit/journal_observer_test.rb 0 0

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

test/unit/journal_test.rb 0 0

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

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

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

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

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

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

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

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

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

test/unit/lib/redmine/export/pdf_test.rb 0 0

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

test/unit/lib/redmine/helpers/calendar_test.rb 0 0

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

test/unit/lib/redmine/helpers/gantt_test.rb 0 0

	1		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
The requested commit or file is too big and content was truncated. Show full diff

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

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

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

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

test/unit/lib/redmine/menu_manager/mapper_test.rb 0 0

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

test/unit/lib/redmine/menu_manager/menu_helper_test.rb 0 0

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

test/unit/lib/redmine/scm/adapters/bazaar_adapter_test.rb 0 0

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

test/unit/lib/redmine/scm/adapters/cvs_adapter_test.rb 0 0

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

test/unit/lib/redmine/scm/adapters/darcs_adapter_test.rb 0 0

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

test/unit/lib/redmine/scm/adapters/filesystem_adapter_test.rb 0 0

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

test/unit/lib/redmine/scm/adapters/git_adapter_test.rb 0 0

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

test/unit/lib/redmine/scm/adapters/mercurial_adapter_test.rb 0 0

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

test/unit/lib/redmine/scm/adapters/subversion_adapter_test.rb 0 0

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

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

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

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

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

test/unit/lib/redmine/utils/date_calculation.rb 0 0

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

test/unit/lib/redmine/views/builders/json_test.rb 0 0

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

test/unit/lib/redmine/views/builders/xml_test.rb 0 0

	1		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
The requested commit or file is too big and content was truncated. Show full diff

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

	1		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_test.rb 0 0

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

test/unit/lib/redmine_test.rb 0 0

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

test/unit/mail_handler_test.rb 0 0

	1		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
The requested commit or file is too big and content was truncated. Show full diff

test/unit/member_test.rb 0 0

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

test/unit/message_test.rb 0 0

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

test/unit/news_test.rb 0 0

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

test/unit/principal_test.rb 0 0

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

test/unit/project_nested_set_test.rb 0 0

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

test/unit/project_test.rb 0 0

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

test/unit/query_test.rb 0 0

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

test/unit/repository_bazaar_test.rb 0 0

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

test/unit/repository_cvs_test.rb 0 0

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

test/unit/repository_darcs_test.rb 0 0

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

test/unit/repository_filesystem_test.rb 0 0

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

test/unit/repository_git_test.rb 0 0

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

test/unit/repository_mercurial_test.rb 0 0

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

test/unit/repository_subversion_test.rb 0 0

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

test/unit/repository_test.rb 0 0

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

test/unit/role_test.rb 0 0

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

test/unit/search_test.rb 0 0

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

test/unit/setting_test.rb 0 0

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

test/unit/time_entry_activity_test.rb 0 0

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

test/unit/time_entry_test.rb 0 0

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

test/unit/token_test.rb 0 0

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

test/unit/user_preference_test.rb 0 0

	1		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
The requested commit or file is too big and content was truncated. Show full diff

test/unit/version_test.rb 0 0

	1		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
The requested commit or file is too big and content was truncated. Show full diff

test/unit/wiki_content_test.rb 0 0

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

test/unit/wiki_content_version_test.rb 0 0

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

test/unit/wiki_page_test.rb 0 0

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

test/unit/wiki_redirect_test.rb 0 0

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

test/unit/wiki_test.rb 0 0

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

test/unit/workflow_test.rb 0 0

	1		NO CONTENT: modified file
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