diff options
-rw-r--r-- | app/helpers/application_helper.rb | 2 | ||||
-rw-r--r-- | app/models/mailer.rb | 4 | ||||
-rw-r--r-- | app/models/project.rb | 2 | ||||
-rw-r--r-- | app/models/project_custom_field.rb | 2 | ||||
-rw-r--r-- | app/models/repository/cvs.rb | 2 | ||||
-rw-r--r-- | app/models/version.rb | 2 | ||||
-rw-r--r-- | app/models/wiki_page.rb | 4 | ||||
-rw-r--r-- | config/initializers/10-patches.rb | 2 | ||||
-rw-r--r-- | lib/redmine/export/csv.rb | 2 | ||||
-rw-r--r-- | lib/redmine/export/pdf.rb | 2 | ||||
-rw-r--r-- | lib/redmine/wiki_formatting/common_mark/markdown_filter.rb | 2 |
11 files changed, 13 insertions, 13 deletions
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 910f1f431..1dd96cbad 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -1689,7 +1689,7 @@ module ApplicationHelper elsif current_theme && current_theme.images.include?(source) source = current_theme.image_path(source) end - super(source, options) + super end # Overrides Rails' javascript_include_tag with plugins support diff --git a/app/models/mailer.rb b/app/models/mailer.rb index 716482ec3..ddbc7b394 100644 --- a/app/models/mailer.rb +++ b/app/models/mailer.rb @@ -53,7 +53,7 @@ class Mailer < ActionMailer::Base lang ||= Setting.default_language set_language_if_valid(lang) - super(action, *args) + super ensure User.current = initial_user ::I18n.locale = initial_language @@ -714,7 +714,7 @@ class Mailer < ActionMailer::Base end if block - super(headers, &block) + super else super(headers) do |format| format.text diff --git a/app/models/project.rb b/app/models/project.rb index 909080a11..09927b4cc 100644 --- a/app/models/project.rb +++ b/app/models/project.rb @@ -902,7 +902,7 @@ class Project < ApplicationRecord attrs['custom_fields'].reject! {|c| !editable_custom_field_ids.include?(c['id'].to_s)} end - super(attrs, user) + super end # Returns an auto-generated project identifier based on the last identifier used diff --git a/app/models/project_custom_field.rb b/app/models/project_custom_field.rb index be2892b56..6c11b225f 100644 --- a/app/models/project_custom_field.rb +++ b/app/models/project_custom_field.rb @@ -28,6 +28,6 @@ class ProjectCustomField < CustomField def visibility_by_project_condition(project_key=nil, user=User.current, id_column=nil) project_key ||= "#{Project.table_name}.id" - super(project_key, user, id_column) + super end end diff --git a/app/models/repository/cvs.rb b/app/models/repository/cvs.rb index 532f8b328..6797c1893 100644 --- a/app/models/repository/cvs.rb +++ b/app/models/repository/cvs.rb @@ -204,7 +204,7 @@ class Repository::Cvs < Repository # Overrides Repository#validate_repository_path to validate # against root_url attribute. def validate_repository_path(attribute=:root_url) - super(attribute) + super end private diff --git a/app/models/version.rb b/app/models/version.rb index ec1a9f77b..937ec9221 100644 --- a/app/models/version.rb +++ b/app/models/version.rb @@ -187,7 +187,7 @@ class Version < ApplicationRecord attrs['custom_fields'].reject! {|c| !editable_custom_field_ids.include?(c['id'].to_s)} end - super(attrs, user) + super end # Returns true if +user+ or current user is allowed to view the version diff --git a/app/models/wiki_page.rb b/app/models/wiki_page.rb index 4f7e55c39..cf23612c0 100644 --- a/app/models/wiki_page.rb +++ b/app/models/wiki_page.rb @@ -108,7 +108,7 @@ class WikiPage < ApplicationRecord end end - super(attrs, user) + super end # Manages redirects if page is renamed or moved @@ -210,7 +210,7 @@ class WikiPage < ApplicationRecord end def attachments_deletable?(usr=User.current) - editable_by?(usr) && super(usr) + editable_by?(usr) && super end def parent_title diff --git a/config/initializers/10-patches.rb b/config/initializers/10-patches.rb index 20d442add..df8afc291 100644 --- a/config/initializers/10-patches.rb +++ b/config/initializers/10-patches.rb @@ -98,7 +98,7 @@ module ActionView if (Array(values) & [:xml, :json]).any? values << :api end - super(values) + super end end) end diff --git a/lib/redmine/export/csv.rb b/lib/redmine/export/csv.rb index 9e0f23c5c..8e56b38f3 100644 --- a/lib/redmine/export/csv.rb +++ b/lib/redmine/export/csv.rb @@ -57,7 +57,7 @@ module Redmine field end end - super(row) + super end end end diff --git a/lib/redmine/export/pdf.rb b/lib/redmine/export/pdf.rb index a0aeec0c9..acb09bdce 100644 --- a/lib/redmine/export/pdf.rb +++ b/lib/redmine/export/pdf.rb @@ -57,7 +57,7 @@ module Redmine style.delete!('I') if family.to_s.casecmp('dejavusans') == 0 && current_language.to_s.casecmp("vi") != 0 # DejaVuSansMono Italic Arabic font has problem style.delete!('I') if family.to_s.casecmp('dejavusansmono') == 0 - super(family, style, size, fontfile) + super end alias_method :set_font, :SetFont diff --git a/lib/redmine/wiki_formatting/common_mark/markdown_filter.rb b/lib/redmine/wiki_formatting/common_mark/markdown_filter.rb index 8b28c2e95..916c8883c 100644 --- a/lib/redmine/wiki_formatting/common_mark/markdown_filter.rb +++ b/lib/redmine/wiki_formatting/common_mark/markdown_filter.rb @@ -27,7 +27,7 @@ module Redmine # options class MarkdownFilter < HTML::Pipeline::TextFilter def initialize(text, context = nil, result = nil) - super(text, context, result) + super @text = @text.delete "\r" end |