diff options
| author | Hannes Rosenögger <123haynes@gmail.com> | 2015-05-12 14:46:58 +0000 |
|---|---|---|
| committer | Hannes Rosenögger <123haynes@gmail.com> | 2015-05-12 14:46:58 +0000 |
| commit | 1dd0caf4d95c6d09fe54041fd7aff9f8661bfbef (patch) | |
| tree | 9af0408d3129cc4bf59abff98bdd1af069afa892 /app/models | |
| parent | 8b9e3af8bf7a6089a11ef3f5eb91dfef4940a3f4 (diff) | |
| parent | bf4b4384590c271d1dfadf874d185c2f6130ad0e (diff) | |
| download | gitlab-ce-1dd0caf4d95c6d09fe54041fd7aff9f8661bfbef.tar.gz | |
Merge branch 'fix-avatar-removal' into 'master'
Fix bug where avatar filenames were not actually deleted from the database during removal
This would result in a 404 error in certain views.
The `save` call was being rolled back due to an error in the validation step.
Relax the validation step so that this works.
Closes #1570
See merge request !620
Diffstat (limited to 'app/models')
| -rw-r--r-- | app/models/group.rb | 2 | ||||
| -rw-r--r-- | app/models/project.rb | 2 | ||||
| -rw-r--r-- | app/models/user.rb | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/app/models/group.rb b/app/models/group.rb index 1386a9eccc9..687458adac4 100644 --- a/app/models/group.rb +++ b/app/models/group.rb @@ -20,7 +20,7 @@ class Group < Namespace has_many :group_members, dependent: :destroy, as: :source, class_name: 'GroupMember' has_many :users, through: :group_members - validate :avatar_type, if: ->(user) { user.avatar_changed? } + validate :avatar_type, if: ->(user) { user.avatar.present? && user.avatar_changed? } validates :avatar, file_size: { maximum: 200.kilobytes.to_i } mount_uploader :avatar, AvatarUploader diff --git a/app/models/project.rb b/app/models/project.rb index bc77e7217ee..09d3ffd22fe 100644 --- a/app/models/project.rb +++ b/app/models/project.rb @@ -144,7 +144,7 @@ class Project < ActiveRecord::Base validates :star_count, numericality: { greater_than_or_equal_to: 0 } validate :check_limit, on: :create validate :avatar_type, - if: ->(project) { project.avatar && project.avatar_changed? } + if: ->(project) { project.avatar.present? && project.avatar_changed? } validates :avatar, file_size: { maximum: 200.kilobytes.to_i } mount_uploader :avatar, AvatarUploader diff --git a/app/models/user.rb b/app/models/user.rb index d088d2d8630..4dd37e73564 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -148,7 +148,7 @@ class User < ActiveRecord::Base validates :notification_level, inclusion: { in: Notification.notification_levels }, presence: true validate :namespace_uniq, if: ->(user) { user.username_changed? } - validate :avatar_type, if: ->(user) { user.avatar_changed? } + validate :avatar_type, if: ->(user) { user.avatar.present? && user.avatar_changed? } validate :unique_email, if: ->(user) { user.email_changed? } validate :owns_notification_email, if: ->(user) { user.notification_email_changed? } validate :owns_public_email, if: ->(user) { user.public_email_changed? } @@ -309,7 +309,7 @@ class User < ActiveRecord::Base if primary_email_record primary_email_record.destroy self.emails.create(email: self.email_was) - + self.update_secondary_emails! end end |