diff options
| author | Dmitriy Zaporozhets <dzaporozhets@gitlab.com> | 2015-02-25 23:36:03 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dzaporozhets@gitlab.com> | 2015-02-25 23:36:03 +0000 |
| commit | 0d884ff2b1beae085050fe6729bd88783891fc71 (patch) | |
| tree | a6b623a0dd9de7e8c540a6c547829c2415912d41 /app/models/project.rb | |
| parent | a52529f9b6258b2ae2793930096c3fcbe40078f3 (diff) | |
| parent | 43f1ab9c12630e85861003c424da43314c2768a8 (diff) | |
| download | gitlab-ce-0d884ff2b1beae085050fe6729bd88783891fc71.tar.gz | |
Merge branch 'extend_markdown_upload' into 'master'
Generalizes image upload in drag and drop in markdown to all files
From https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/265 by Hannes Rosenögger.
- [x] Rebase on master when !1553 is merged in
See merge request !1530
Diffstat (limited to 'app/models/project.rb')
| -rw-r--r-- | app/models/project.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/project.rb b/app/models/project.rb index 1606a83158d..d33b25db201 100644 --- a/app/models/project.rb +++ b/app/models/project.rb @@ -144,7 +144,7 @@ class Project < ActiveRecord::Base if: ->(project) { project.avatar && project.avatar_changed? } validates :avatar, file_size: { maximum: 200.kilobytes.to_i } - mount_uploader :avatar, AttachmentUploader + mount_uploader :avatar, AvatarUploader # Scopes scope :sorted_by_activity, -> { reorder(last_activity_at: :desc) } |