Nemcio/Redmine
1
0
Fork 0
mirror of https://github.com/redmine/redmine.git synced 2025-11-11 15:56:03 +01:00
Code Issues Packages Projects Releases Activity

Remove trailing whitespaces from app (#31506).

Browse Source 
Patch by Marius BALTEANU.


git-svn-id: http://svn.redmine.org/redmine/trunk@18230 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Go MAEDA
2019-06-06 14:47:34 +00:00
parent ac6ab7e74e
commit 2e0ec5b0e6
6 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/attachments_controller.rb
View File

@@ -239,7 +239,7 @@ class AttachmentsController < ApplicationController
def detect_content_type(attachment, is_thumb = false) def detect_content_type(attachment, is_thumb = false)
content_type = attachment.content_type content_type = attachment.content_type
if content_type.blank? || content_type == "application/octet-stream" if content_type.blank? || content_type == "application/octet-stream"
content_type = content_type =
Redmine::MimeType.of(attachment.filename).presence || Redmine::MimeType.of(attachment.filename).presence ||
"application/octet-stream" "application/octet-stream"
end end

2
app/controllers/previews_controller.rb
View File

@@ -18,7 +18,7 @@
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
class PreviewsController < ApplicationController class PreviewsController < ApplicationController
before_action :find_project, :except => :text before_action :find_project, :except => :text
before_action :find_attachments before_action :find_attachments
def issue def issue

4
app/helpers/members_helper.rb
View File

@@ -36,7 +36,7 @@ module MembersHelper
s + content_tag('span', links, :class => 'pagination') s + content_tag('span', links, :class => 'pagination')
end end
# Returns inheritance information for an inherited member role # Returns inheritance information for an inherited member role
def render_role_inheritance(member, role) def render_role_inheritance(member, role)
content = member.role_inheritance(role).map do |h| content = member.role_inheritance(role).map do |h|
if h.is_a?(Project) if h.is_a?(Project)
@@ -45,7 +45,7 @@ module MembersHelper
l(:label_inherited_from_group, :name => h.name.to_s) l(:label_inherited_from_group, :name => h.name.to_s)
end end
end.compact.uniq end.compact.uniq
if content.present? if content.present?
content_tag('span', content.join(", "), :class => "info") content_tag('span', content.join(", "), :class => "info")
end end

2
app/helpers/search_helper.rb
View File

@@ -63,7 +63,7 @@ module SearchHelper
:all_words => params[:all_words], :scope => params[:scope], t => 1) :all_words => params[:all_words], :scope => params[:scope], t => 1)
end end
('<ul>'.html_safe + ('<ul>'.html_safe +
links.map {|link| content_tag('li', link)}.join(' ').html_safe + links.map {|link| content_tag('li', link)}.join(' ').html_safe +
'</ul>'.html_safe) unless links.empty? '</ul>'.html_safe) unless links.empty?
end end
end end

6
app/helpers/workflows_helper.rb
View File

@@ -21,7 +21,7 @@ module WorkflowsHelper
def options_for_workflow_select(name, objects, selected, options={}) def options_for_workflow_select(name, objects, selected, options={})
option_tags = ''.html_safe option_tags = ''.html_safe
multiple = false multiple = false
if selected if selected
if selected.size == objects.size if selected.size == objects.size
selected = 'all' selected = 'all'
else else
@@ -51,7 +51,7 @@ module WorkflowsHelper
options = [["", ""], [l(:label_readonly), "readonly"]] options = [["", ""], [l(:label_readonly), "readonly"]]
options << [l(:label_required), "required"] unless field_required?(field) options << [l(:label_required), "required"] unless field_required?(field)
html_options = {} html_options = {}
if perm = permissions[status.id][name] if perm = permissions[status.id][name]
if perm.uniq.size > 1 || perm.size < @roles.size * @trackers.size if perm.uniq.size > 1 || perm.size < @roles.size * @trackers.size
options << [l(:label_no_change_option), "no_change"] options << [l(:label_no_change_option), "no_change"]
@@ -76,7 +76,7 @@ module WorkflowsHelper
def transition_tag(workflows, old_status, new_status, name) def transition_tag(workflows, old_status, new_status, name)
w = workflows.select {|w| w.old_status == old_status && w.new_status == new_status}.size w = workflows.select {|w| w.old_status == old_status && w.new_status == new_status}.size
tag_name = "transitions[#{ old_status.try(:id) || 0 }][#{new_status.id}][#{name}]" tag_name = "transitions[#{ old_status.try(:id) || 0 }][#{new_status.id}][#{name}]"
if old_status == new_status if old_status == new_status
check_box_tag(tag_name, "1", true, check_box_tag(tag_name, "1", true,

2
app/models/mail_handler.rb
View File

@@ -459,7 +459,7 @@ class MailHandler < ActionMailer::Base
end end
end end
# Returns the text content of the email. # Returns the text content of the email.
# If the value of Setting.mail_handler_preferred_body_part is 'html', # If the value of Setting.mail_handler_preferred_body_part is 'html',
# it returns text converted from the text/html part of the email. # it returns text converted from the text/html part of the email.
# Otherwise, it returns text/plain part. # Otherwise, it returns text/plain part.