Commit a4fedc50 authored by marutosijp's avatar marutosijp

Replace tabs with spaces (#26333).

Patched by Mischa The Evil.

git-svn-id: https://svn.redmine.org/redmine/trunk@16753 e93f8b46-1217-0410-a6f0-8f06a7374b81
parent c2d3910b
...@@ -354,7 +354,7 @@ class Mailer < ActionMailer::Base ...@@ -354,7 +354,7 @@ class Mailer < ActionMailer::Base
:subject => "[#{Setting.app_title}] #{l(:mail_subject_security_notification)}" :subject => "[#{Setting.app_title}] #{l(:mail_subject_security_notification)}"
end end
# Notifies admins about settings changes # Notifies admins about settings changes
def self.security_settings_updated(changes) def self.security_settings_updated(changes)
return unless changes.present? return unless changes.present?
......
...@@ -31,7 +31,7 @@ class Member < ActiveRecord::Base ...@@ -31,7 +31,7 @@ class Member < ActiveRecord::Base
scope :active, lambda { joins(:principal).where(:users => {:status => Principal::STATUS_ACTIVE})} scope :active, lambda { joins(:principal).where(:users => {:status => Principal::STATUS_ACTIVE})}
# Sort by first role and principal # Sort by first role and principal
scope :sorted, lambda { scope :sorted, lambda {
includes(:member_roles, :roles, :principal). includes(:member_roles, :roles, :principal).
reorder("#{Role.table_name}.position"). reorder("#{Role.table_name}.position").
......
...@@ -527,8 +527,8 @@ class Project < ActiveRecord::Base ...@@ -527,8 +527,8 @@ class Project < ActiveRecord::Base
member member
end end
# Default role that is given to non-admin users that # Default role that is given to non-admin users that
# create a project # create a project
def self.default_member_role def self.default_member_role
Role.givable.find_by_id(Setting.new_project_user_role_id.to_i) || Role.givable.first Role.givable.find_by_id(Setting.new_project_user_role_id.to_i) || Role.givable.first
end end
......
...@@ -118,7 +118,7 @@ class Setting < ActiveRecord::Base ...@@ -118,7 +118,7 @@ class Setting < ActiveRecord::Base
setting.value setting.value
end end
# Updates multiple settings from params and sends a security notification if needed # Updates multiple settings from params and sends a security notification if needed
def self.set_all_from_params(settings) def self.set_all_from_params(settings)
return nil unless settings.is_a?(Hash) return nil unless settings.is_a?(Hash)
settings = settings.dup.symbolize_keys settings = settings.dup.symbolize_keys
......
...@@ -173,11 +173,11 @@ ...@@ -173,11 +173,11 @@
-webkit-transform: scale(1,.8); -webkit-transform: scale(1,.8);
-ms-transform: scale(1,.8); -ms-transform: scale(1,.8);
transform: scale(1,.8); transform: scale(1,.8);
padding-top:8px; padding-top:8px;
} }
#project-jump .drdn-content { #project-jump .drdn-content {
position:absolute; position:absolute;
left:0px; left:0px;
top:64px; top:64px;
width:100%; width:100%;
...@@ -186,7 +186,7 @@ ...@@ -186,7 +186,7 @@
} }
#project-jump .drdn-content .autocomplete { #project-jump .drdn-content .autocomplete {
height:40px; height:40px;
font-size:20px; font-size:20px;
} }
#project-jump .drdn-content a { #project-jump .drdn-content a {
padding:8px; padding:8px;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment