diff options
author | Douwe Maan <douwe@selenight.nl> | 2017-08-31 18:02:19 +0200 |
---|---|---|
committer | Douwe Maan <douwe@selenight.nl> | 2017-08-31 18:02:19 +0200 |
commit | 92edb3edab89dcb7b87bad3ac0fe7fed404fea85 (patch) | |
tree | b96e7b9d37a789ad252ee5c01a6c2811b9bc88d5 /app/models/snippet.rb | |
parent | 7c215dd23dfa942d6b83252403ce326df96ab3ea (diff) | |
parent | 9aef0427eb9986fc27a399ea6b47e1518d6ebdac (diff) | |
download | gitlab-ce-92edb3edab89dcb7b87bad3ac0fe7fed404fea85.tar.gz |
Merge branch 'master' into issue-discussions-refactor
# Conflicts:
# app/models/issue.rb
Diffstat (limited to 'app/models/snippet.rb')
-rw-r--r-- | app/models/snippet.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/app/models/snippet.rb b/app/models/snippet.rb index 09d5ff46618..9533aa7f555 100644 --- a/app/models/snippet.rb +++ b/app/models/snippet.rb @@ -10,6 +10,8 @@ class Snippet < ActiveRecord::Base include Spammable include Editable + extend Gitlab::CurrentSettings + cache_markdown_field :title, pipeline: :single_line cache_markdown_field :description cache_markdown_field :content |