diff options
| author | Filipa Lacerda <filipa@gitlab.com> | 2017-04-19 17:38:54 +0100 |
|---|---|---|
| committer | Filipa Lacerda <filipa@gitlab.com> | 2017-04-19 17:38:54 +0100 |
| commit | c539480d55ce1114aba189fec01b403ec1499f2e (patch) | |
| tree | da4abfae825e9c9ff027540bbf7c8156ae5c5bc4 /app/models | |
| parent | c188841f3ce8c944fc86c3ba7f16a87d1be843be (diff) | |
| parent | 29ddc15f8d9b094bb7052875f7728ee48f7ad06b (diff) | |
| download | gitlab-ce-environments-vue-2.tar.gz | |
Merge branch 'master' into environments-vue-2environments-vue-2
* master:
Remove node modules cache because we already use artifacts
Added and updated droplab docs
Display issuable state only in notes and issuable description
Use refs instead of query the DOM
Remove unused argument
Only destroy the component's tooltip
Fixed project & group icons not being clickable
Destroy tooltip in async buttons and tooltips
Diffstat (limited to 'app/models')
| -rw-r--r-- | app/models/concerns/issuable.rb | 2 | ||||
| -rw-r--r-- | app/models/note.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/models/concerns/issuable.rb b/app/models/concerns/issuable.rb index 3d2258d5e3e..26dbf4d9570 100644 --- a/app/models/concerns/issuable.rb +++ b/app/models/concerns/issuable.rb @@ -23,7 +23,7 @@ module Issuable included do cache_markdown_field :title, pipeline: :single_line - cache_markdown_field :description + cache_markdown_field :description, issuable_state_filter_enabled: true belongs_to :author, class_name: "User" belongs_to :assignee, class_name: "User" diff --git a/app/models/note.rb b/app/models/note.rb index 630d0adbece..e720bfba030 100644 --- a/app/models/note.rb +++ b/app/models/note.rb @@ -16,7 +16,7 @@ class Note < ActiveRecord::Base ignore_column :original_discussion_id - cache_markdown_field :note, pipeline: :note + cache_markdown_field :note, pipeline: :note, issuable_state_filter_enabled: true # Attribute containing rendered and redacted Markdown as generated by # Banzai::ObjectRenderer. |