diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-03-16 15:11:17 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-03-16 15:11:17 +0000 |
| commit | dad48b4af20204db430a6c62c4641283e24dd89a (patch) | |
| tree | c8b4644cf30e2babe572f20b89257bcd8fa4b6d6 /app/views/projects | |
| parent | e2999d09ec050b12b6de9121d9aedc38c12477fd (diff) | |
| download | gitlab-ce-dad48b4af20204db430a6c62c4641283e24dd89a.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/views/projects')
| -rw-r--r-- | app/views/projects/issues/show.html.haml | 1 | ||||
| -rw-r--r-- | app/views/projects/merge_requests/show.html.haml | 3 |
2 files changed, 4 insertions, 0 deletions
diff --git a/app/views/projects/issues/show.html.haml b/app/views/projects/issues/show.html.haml index c3949a83e3f..a94862c75a6 100644 --- a/app/views/projects/issues/show.html.haml +++ b/app/views/projects/issues/show.html.haml @@ -4,3 +4,4 @@ - page_title "#{@issue.title} (#{@issue.to_reference})", _("Issues") = render 'projects/issuable/show', issuable: @issue += render 'shared/issuable/invite_members_trigger', project: @project diff --git a/app/views/projects/merge_requests/show.html.haml b/app/views/projects/merge_requests/show.html.haml index d664ee709dd..f0dcaf24e07 100644 --- a/app/views/projects/merge_requests/show.html.haml +++ b/app/views/projects/merge_requests/show.html.haml @@ -108,3 +108,6 @@ = render "projects/commit/change", type: 'cherry-pick', commit: @merge_request.merge_commit #js-review-bar + += render 'shared/issuable/invite_members_trigger', project: @project + |