diff options
| author | Oswaldo Ferreira <oswaldo@gitlab.com> | 2018-10-23 09:49:45 +0000 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2018-10-23 09:49:45 +0000 |
| commit | 86ead874e217fb1aceb2d09daf29a9a6ade0ff62 (patch) | |
| tree | 16d7130d8b4ce09bff582e4506ca191253a2895c /app/views/projects/issues/show.html.haml | |
| parent | 10bb8297ebe5fc01540b20c3fd365234779b6837 (diff) | |
| download | gitlab-ce-86ead874e217fb1aceb2d09daf29a9a6ade0ff62.tar.gz | |
Resolve "Filter discussion (tab) by comments or activity in issues and merge requests"
Diffstat (limited to 'app/views/projects/issues/show.html.haml')
| -rw-r--r-- | app/views/projects/issues/show.html.haml | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/app/views/projects/issues/show.html.haml b/app/views/projects/issues/show.html.haml index c39fd0063be..b50b3ca207b 100644 --- a/app/views/projects/issues/show.html.haml +++ b/app/views/projects/issues/show.html.haml @@ -77,11 +77,12 @@ #related-branches{ data: { url: related_branches_project_issue_path(@project, @issue) } } // This element is filled in using JavaScript. - .content-block.emoji-block + .content-block.emoji-block.emoji-block-sticky .row - .col-sm-8.js-noteable-awards + .col-md-12.col-lg-6.js-noteable-awards = render 'award_emoji/awards_block', awardable: @issue, inline: true - .col-sm-4.new-branch-col + .col-md-12.col-lg-6.new-branch-col + #js-vue-discussion-filter{ data: { default_filter: current_user&.notes_filter_for(@issue), notes_filters: UserPreference.notes_filters.to_json } } = render 'new_branch' unless @issue.confidential? %section.issuable-discussion |