diff options
| author | Matija Čupić <matteeyah@gmail.com> | 2018-02-02 21:56:22 +0100 |
|---|---|---|
| committer | Matija Čupić <matteeyah@gmail.com> | 2018-02-02 21:56:22 +0100 |
| commit | 40753029e40b9c2824648a966048595d36efc793 (patch) | |
| tree | 62d97ed6a45a0d2cecc76faf2fea87e63212dde8 /app/models/note.rb | |
| parent | cc209519c892355f019335bbe0107af2f434846b (diff) | |
| parent | a00aed74af67dd72a2aa7bf7e485ff7bdb949ea4 (diff) | |
| download | gitlab-ce-40753029e40b9c2824648a966048595d36efc793.tar.gz | |
Merge branch 'master' into 38175-add-domain-field-to-auto-devops-application-setting
Diffstat (limited to 'app/models/note.rb')
| -rw-r--r-- | app/models/note.rb | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/app/models/note.rb b/app/models/note.rb index a84db8982e5..01a778a7424 100644 --- a/app/models/note.rb +++ b/app/models/note.rb @@ -3,7 +3,6 @@ # A note of this type is never resolvable. class Note < ActiveRecord::Base extend ActiveModel::Naming - include Gitlab::CurrentSettings include Participable include Mentionable include Awardable @@ -196,7 +195,7 @@ class Note < ActiveRecord::Base end def max_attachment_size - current_application_settings.max_attachment_size.megabytes.to_i + Gitlab::CurrentSettings.max_attachment_size.megabytes.to_i end def hook_attrs |