From 0fc1906201be897fb1d7b1424cd3955f0e224eb4 Mon Sep 17 00:00:00 2001 From: Jean-Philippe Lang Date: Wed, 22 Oct 2014 18:28:33 +0000 Subject: [PATCH] Removed deprecated stuff for Redmine 3.0. git-svn-id: http://svn.redmine.org/redmine/trunk@13483 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- app/helpers/application_helper.rb | 10 ---------- app/helpers/watchers_helper.rb | 5 ----- app/models/enumeration.rb | 6 ------ app/models/setting.rb | 21 --------------------- app/models/version.rb | 12 ------------ 5 files changed, 54 deletions(-) diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 0cb4c4c00..7e9cdce90 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -137,8 +137,6 @@ module ApplicationHelper def link_to_project(project, options={}, html_options = nil) if project.archived? h(project.name) - elsif options.key?(:action) - raise "#link_to_project no longer accepts :action option in Redmine 3.0" else link_to project.name, project_path(project, options), html_options end @@ -1054,14 +1052,6 @@ module ApplicationHelper 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 diff --git a/app/helpers/watchers_helper.rb b/app/helpers/watchers_helper.rb index 28f912bbc..a6a9c3dde 100644 --- a/app/helpers/watchers_helper.rb +++ b/app/helpers/watchers_helper.rb @@ -19,11 +19,6 @@ module WatchersHelper - def watcher_tag(object, user, options={}) - ActiveSupport::Deprecation.warn "#watcher_tag is deprecated and will be removed in Redmine 3.0. Use #watcher_link instead." - watcher_link(object, user) - end - def watcher_link(objects, user) return '' unless user && user.logged? objects = Array.wrap(objects) diff --git a/app/models/enumeration.rb b/app/models/enumeration.rb index 8c82a0dc8..9e76211cd 100644 --- a/app/models/enumeration.rb +++ b/app/models/enumeration.rb @@ -103,12 +103,6 @@ class Enumeration < ActiveRecord::Base subclasses end - # TODO: remove in Redmine 3.0 - def self.overridding_change?(new, previous) - ActiveSupport::Deprecation.warn "Enumeration#overridding_change? is deprecated and will be removed in Redmine 3.0. Please use #overriding_change?." - overriding_change?(new, previous) - end - # Does the +new+ Hash override the previous Enumeration? def self.overriding_change?(new, previous) if (same_active_state?(new['active'], previous.active)) && same_custom_values?(new,previous) diff --git a/app/models/setting.rb b/app/models/setting.rb index 3881f90f1..c207de22b 100644 --- a/app/models/setting.rb +++ b/app/models/setting.rb @@ -196,27 +196,6 @@ END_SRC a end - def self.commit_fix_keywords - ActiveSupport::Deprecation.warn "Setting.commit_fix_keywords is deprecated and will be removed in Redmine 3" - if commit_update_keywords.is_a?(Array) - commit_update_keywords.first && commit_update_keywords.first['keywords'] - end - end - - def self.commit_fix_status_id - ActiveSupport::Deprecation.warn "Setting.commit_fix_status_id is deprecated and will be removed in Redmine 3" - if commit_update_keywords.is_a?(Array) - commit_update_keywords.first && commit_update_keywords.first['status_id'] - end - end - - def self.commit_fix_done_ratio - ActiveSupport::Deprecation.warn "Setting.commit_fix_done_ratio is deprecated and will be removed in Redmine 3" - if commit_update_keywords.is_a?(Array) - commit_update_keywords.first && commit_update_keywords.first['done_ratio'] - end - end - def self.openid? Object.const_defined?(:OpenID) && self[:openid].to_i > 0 end diff --git a/app/models/version.rb b/app/models/version.rb index 45c7c25a6..878c611ed 100644 --- a/app/models/version.rb +++ b/app/models/version.rb @@ -126,12 +126,6 @@ class Version < ActiveRecord::Base end end - # TODO: remove in Redmine 3.0 - def completed_pourcent - ActiveSupport::Deprecation.warn "Version#completed_pourcent is deprecated and will be removed in Redmine 3.0. Please use #completed_percent instead." - completed_percent - end - # Returns the percentage of issues that have been marked as 'closed'. def closed_percent if issues_count == 0 @@ -141,12 +135,6 @@ class Version < ActiveRecord::Base end end - # TODO: remove in Redmine 3.0 - def closed_pourcent - ActiveSupport::Deprecation.warn "Version#closed_pourcent is deprecated and will be removed in Redmine 3.0. Please use #closed_percent instead." - closed_percent - end - # Returns true if the version is overdue: due date reached and some open issues def overdue? effective_date && (effective_date < Date.today) && (open_issues_count > 0) -- 2.39.5