diff options
| author | Zeger-Jan van de Weg <zegerjan@gitlab.com> | 2016-03-15 19:13:26 +0100 |
|---|---|---|
| committer | Zeger-Jan van de Weg <zegerjan@gitlab.com> | 2016-03-15 19:16:16 +0100 |
| commit | 59064aeeef8562a87d4d03efa9b11012a007e261 (patch) | |
| tree | 1ecb34e1355a4eb714615b2a9c2727155e8f3ec9 /app/models/user.rb | |
| parent | aaf4434b0e24da916d4392aa9cd001cdb8e0c7dc (diff) | |
| parent | bc590ce63bd2f1af5545b648e6d028a557e7c792 (diff) | |
| download | gitlab-ce-4009-external-users.tar.gz | |
Merge branch 'master' into 4009-external-users4009-external-users
Diffstat (limited to 'app/models/user.rb')
| -rw-r--r-- | app/models/user.rb | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/app/models/user.rb b/app/models/user.rb index 179f142fe3c..c011af03591 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -100,9 +100,6 @@ class User < ActiveRecord::Base # Virtual attribute for authenticating by either username or email attr_accessor :login - # Virtual attributes to define avatar cropping - attr_accessor :avatar_crop_x, :avatar_crop_y, :avatar_crop_size - # # Relations # @@ -168,11 +165,6 @@ class User < ActiveRecord::Base validate :owns_public_email, if: ->(user) { user.public_email_changed? } validates :avatar, file_size: { maximum: 200.kilobytes.to_i } - validates :avatar_crop_x, :avatar_crop_y, :avatar_crop_size, - numericality: { only_integer: true }, - presence: true, - if: ->(user) { user.avatar? && user.avatar_changed? } - before_validation :generate_password, on: :create before_validation :restricted_signup_domains, on: :create before_validation :sanitize_attrs |