1 files changed, 36 insertions, 36 deletions
diff --git a/app/models/user.rb b/app/models/user.rb
index ff27660a6ee..92c81c83d41 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -11,58 +11,58 @@ class User < ActiveRecord::Base
 
   attr_accessor :force_random_password
 
-  has_many :users_projects, :dependent => :destroy
-  has_many :projects, :through => :users_projects
-  has_many :my_own_projects, :class_name => "Project", :foreign_key => :owner_id
-  has_many :keys, :dependent => :destroy
+  has_many :users_projects, dependent: :destroy
+  has_many :projects, through: :users_projects
+  has_many :my_own_projects, class_name: "Project", foreign_key: :owner_id
+  has_many :keys, dependent: :destroy
 
   has_many :events,
-    :class_name => "Event",
-    :foreign_key => :author_id,
-    :dependent => :destroy
+    class_name: "Event",
+    foreign_key: :author_id,
+    dependent: :destroy
 
   has_many :recent_events,
-    :class_name => "Event",
-    :foreign_key => :author_id,
-    :order => "id DESC"
+    class_name: "Event",
+    foreign_key: :author_id,
+    order: "id DESC"
 
   has_many :issues,
-    :foreign_key => :author_id,
-    :dependent => :destroy
+    foreign_key: :author_id,
+    dependent: :destroy
 
   has_many :notes,
-    :foreign_key => :author_id,
-    :dependent => :destroy
+    foreign_key: :author_id,
+    dependent: :destroy
 
   has_many :assigned_issues,
-    :class_name => "Issue",
-    :foreign_key => :assignee_id,
-    :dependent => :destroy
+    class_name: "Issue",
+    foreign_key: :assignee_id,
+    dependent: :destroy
 
   has_many :merge_requests,
-    :foreign_key => :author_id,
-    :dependent => :destroy
+    foreign_key: :author_id,
+    dependent: :destroy
 
   has_many :assigned_merge_requests,
-    :class_name => "MergeRequest",
-    :foreign_key => :assignee_id,
-    :dependent => :destroy
+    class_name: "MergeRequest",
+    foreign_key: :assignee_id,
+    dependent: :destroy
 
   validates :projects_limit,
-            :presence => true,
-            :numericality => {:greater_than_or_equal_to => 0}
+            presence: true,
+            numericality: {greater_than_or_equal_to: 0}
 
-  validates :bio, :length => { :within => 0..255 }
+  validates :bio, length: { within: 0..255 }
 
   before_save :ensure_authentication_token
   alias_attribute :private_token, :authentication_token
 
-  scope :not_in_project, lambda { |project|  where("id not in (:ids)", :ids => project.users.map(&:id) ) }
-  scope :admins, where(:admin =>  true)
-  scope :blocked, where(:blocked =>  true)
-  scope :active, where(:blocked =>  false)
+  scope :not_in_project, lambda { |project|  where("id not in (:ids)", ids: project.users.map(&:id) ) }
+  scope :admins, where(admin:  true)
+  scope :blocked, where(blocked:  true)
+  scope :active, where(blocked:  false)
 
-  before_validation :generate_password, :on => :create
+  before_validation :generate_password, on: :create
 
   def generate_password
     if self.force_random_password
@@ -94,17 +94,17 @@ class User < ActiveRecord::Base
     else
       password = Devise.friendly_token[0, 8].downcase
       @user = User.create(
-        :name => name,
-        :email => email,
-        :password => password,
-        :password_confirmation => password,
-        :projects_limit => Gitlab.config.default_projects_limit
+        name: name,
+        email: email,
+        password: password,
+        password_confirmation: password,
+        projects_limit: Gitlab.config.default_projects_limit
       )
     end
   end
 
   def self.search query
-    where("name like :query or email like :query", :query => "%#{query}%")
+    where("name like :query or email like :query", query: "%#{query}%")
   end
 end
 # == Schema Information