diff options
| author | Dmitriy Zaporozhets <dzaporozhets@gitlab.com> | 2015-02-19 17:57:27 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dzaporozhets@gitlab.com> | 2015-02-19 17:57:27 +0000 |
| commit | 19c5c4453598d6ac2d88b15456c9919d3330df88 (patch) | |
| tree | 0858476b0f6292ee1069c223283d8bc2cb932fc9 /app/models | |
| parent | 3c2139ed172c607467ec6cf412d7ed33147bac22 (diff) | |
| parent | 8184a6564454faf0f9ae9dfee1377c3407d08447 (diff) | |
| download | gitlab-ce-19c5c4453598d6ac2d88b15456c9919d3330df88.tar.gz | |
Merge branch 'revert-upload-refactor' into 'master'
Revert upload refactor
See merge request !1548
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 | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/app/models/group.rb b/app/models/group.rb index da9621a2a1a..d6ec0be6081 100644 --- a/app/models/group.rb +++ b/app/models/group.rb @@ -23,7 +23,7 @@ class Group < Namespace validate :avatar_type, if: ->(user) { user.avatar_changed? } validates :avatar, file_size: { maximum: 200.kilobytes.to_i } - mount_uploader :avatar, AvatarUploader + mount_uploader :avatar, AttachmentUploader after_create :post_create_hook after_destroy :post_destroy_hook diff --git a/app/models/project.rb b/app/models/project.rb index e2c7f76eb09..56e1aa29040 100644 --- a/app/models/project.rb +++ b/app/models/project.rb @@ -138,7 +138,7 @@ class Project < ActiveRecord::Base if: ->(project) { project.avatar && project.avatar_changed? } validates :avatar, file_size: { maximum: 200.kilobytes.to_i } - mount_uploader :avatar, AvatarUploader + mount_uploader :avatar, AttachmentUploader # Scopes scope :sorted_by_activity, -> { reorder(last_activity_at: :desc) } diff --git a/app/models/user.rb b/app/models/user.rb index 3bbbd23c1bd..a9776b633a6 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -177,7 +177,7 @@ class User < ActiveRecord::Base end end - mount_uploader :avatar, AvatarUploader + mount_uploader :avatar, AttachmentUploader # Scopes scope :admins, -> { where(admin: true) } |