diff options
| author | Felipe Artur <fcardozo@gitlab.com> | 2018-06-21 15:22:40 +0300 |
|---|---|---|
| committer | Tim Zallmann <tzallmann@gitlab.com> | 2018-06-21 15:22:40 +0300 |
| commit | 3e66795ef1ff1228906239763910b051d8afcc37 (patch) | |
| tree | df6424d9ec008f5d1da455f8465681b371c4a11e /app/helpers/notes_helper.rb | |
| parent | 14e35ac9b19d358d84e0cfd167f74036937285b6 (diff) | |
Changes tab VUE refactoring
Diffstat (limited to 'app/helpers/notes_helper.rb')
| -rw-r--r-- | app/helpers/notes_helper.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/app/helpers/notes_helper.rb b/app/helpers/notes_helper.rb index 7f67574a428..5459bb63397 100644 --- a/app/helpers/notes_helper.rb +++ b/app/helpers/notes_helper.rb @@ -174,11 +174,11 @@ module NotesHelper discussion.resolved_by_push? ? 'Automatically resolved' : 'Resolved' end - def has_vue_discussions_cookie? - cookies[:vue_mr_discussions] == 'true' + def rendered_for_merge_request? + params[:from_merge_request].present? end def serialize_notes? - has_vue_discussions_cookie? && !params['html'] + rendered_for_merge_request? || params['html'].nil? end end |