summaryrefslogtreecommitdiff
path: root/app/views
diff options
context:
space:
mode:
authormicael.bergeron <micaelbergeron@gmail.com>2017-12-01 14:08:30 -0500
committermicael.bergeron <micaelbergeron@gmail.com>2017-12-07 09:06:59 -0500
commit360b94ceba146935a40b02f39ed3d833eaea134a (patch)
tree37a6c9b9e3424dfc0cb5446ddb17be97bb34f379 /app/views
parent17075a0bdc0c271e9f7a4f25829c0517656d5871 (diff)
downloadgitlab-ce-360b94ceba146935a40b02f39ed3d833eaea134a.tar.gz
adding view and feature specs
Diffstat (limited to 'app/views')
-rw-r--r--app/views/projects/merge_requests/diffs/_not_all_comments_displayed.html.haml2
-rw-r--r--app/views/projects/merge_requests/show.html.haml8
2 files changed, 5 insertions, 5 deletions
diff --git a/app/views/projects/merge_requests/diffs/_not_all_comments_displayed.html.haml b/app/views/projects/merge_requests/diffs/_not_all_comments_displayed.html.haml
index faabba5fc35..529fbb8547a 100644
--- a/app/views/projects/merge_requests/diffs/_not_all_comments_displayed.html.haml
+++ b/app/views/projects/merge_requests/diffs/_not_all_comments_displayed.html.haml
@@ -12,6 +12,6 @@
- else
viewing an old version of the diff
.pull-right
- = link_to diffs_project_merge_request_path(@project, @merge_request), class: 'btn btn-sm' do
+ = link_to diffs_project_merge_request_path(@merge_request.project, @merge_request), class: 'btn btn-sm' do
Show latest version
= "of the diff" if @commit
diff --git a/app/views/projects/merge_requests/show.html.haml b/app/views/projects/merge_requests/show.html.haml
index 0d7abe8137f..abff702fd9d 100644
--- a/app/views/projects/merge_requests/show.html.haml
+++ b/app/views/projects/merge_requests/show.html.haml
@@ -38,21 +38,21 @@
.nav-links.scrolling-tabs
%ul.merge-request-tabs
%li.notes-tab
- = tab_link_for :show, force_link: @commit.present? do
+ = tab_link_for @merge_request, :show, force_link: @commit.present? do
Discussion
%span.badge= @merge_request.related_notes.user.count
- if @merge_request.source_project
%li.commits-tab
- = tab_link_for :commits do
+ = tab_link_for @merge_request, :commits do
Commits
%span.badge= @commits_count
- if @pipelines.any?
%li.pipelines-tab
- = tab_link_for :pipelines do
+ = tab_link_for @merge_request, :pipelines do
Pipelines
%span.badge.js-pipelines-mr-count= @pipelines.size
%li.diffs-tab
- = tab_link_for :diffs do
+ = tab_link_for @merge_request, :diffs do
Changes
%span.badge= @merge_request.diff_size
#resolve-count-app.line-resolve-all-container.prepend-top-10{ "v-cloak" => true }