diff options
| author | Luke "Jared" Bennett <lbennett@gitlab.com> | 2017-05-17 17:09:03 +0100 |
|---|---|---|
| committer | Luke "Jared" Bennett <lbennett@gitlab.com> | 2017-05-18 09:51:58 +0100 |
| commit | 1f8a9b558d552925a176e1dd6ba6ef54fc2ee20a (patch) | |
| tree | 4052308af3a436aa055c2c7c6c6775c2a41fd784 /app/models | |
| parent | 6dd88474bed70c2aa70c7fdf7ba6dbdc29dc8998 (diff) | |
| download | gitlab-ce-fix-realtime-edited-text-for-issues.tar.gz | |
Added editable concernfix-realtime-edited-text-for-issues
Added editable concern spec
Snippet include Editable
Diffstat (limited to 'app/models')
| -rw-r--r-- | app/models/concerns/editable.rb | 7 | ||||
| -rw-r--r-- | app/models/concerns/issuable.rb | 1 | ||||
| -rw-r--r-- | app/models/note.rb | 1 | ||||
| -rw-r--r-- | app/models/snippet.rb | 1 |
4 files changed, 10 insertions, 0 deletions
diff --git a/app/models/concerns/editable.rb b/app/models/concerns/editable.rb new file mode 100644 index 00000000000..c62c7e1e936 --- /dev/null +++ b/app/models/concerns/editable.rb @@ -0,0 +1,7 @@ +module Editable + extend ActiveSupport::Concern + + def is_edited? + last_edited_at.present? && last_edited_at != created_at + end +end diff --git a/app/models/concerns/issuable.rb b/app/models/concerns/issuable.rb index 075ec575f9d..ea10d004c9c 100644 --- a/app/models/concerns/issuable.rb +++ b/app/models/concerns/issuable.rb @@ -15,6 +15,7 @@ module Issuable include Taskable include TimeTrackable include Importable + include Editable # This object is used to gather issuable meta data for displaying # upvotes, downvotes, notes and closing merge requests count for issues and merge requests diff --git a/app/models/note.rb b/app/models/note.rb index 46d0a4f159f..4cb3c6f062a 100644 --- a/app/models/note.rb +++ b/app/models/note.rb @@ -13,6 +13,7 @@ class Note < ActiveRecord::Base include AfterCommitQueue include ResolvableNote include IgnorableColumn + include Editable ignore_column :original_discussion_id diff --git a/app/models/snippet.rb b/app/models/snippet.rb index 882e2fa0594..6c3358685fe 100644 --- a/app/models/snippet.rb +++ b/app/models/snippet.rb @@ -8,6 +8,7 @@ class Snippet < ActiveRecord::Base include Awardable include Mentionable include Spammable + include Editable cache_markdown_field :title, pipeline: :single_line cache_markdown_field :content |