diff options
| author | Mike Greiling <mike@pixelcog.com> | 2018-10-05 15:40:19 +0000 |
|---|---|---|
| committer | Mike Greiling <mike@pixelcog.com> | 2018-10-05 15:40:19 +0000 |
| commit | f90fc922dbcb8db5f8aadc6eee3d5a8c8c414375 (patch) | |
| tree | 042200ae796fda60a90c25cdcec793c443fe3be6 /app/views/dashboard/merge_requests.html.haml | |
| parent | 393331b40bc9044b658896028869d29eed126a71 (diff) | |
| parent | 1b16ef307f9206afd0abdb4dcf7faa45a5daafd8 (diff) | |
| download | gitlab-ce-f90fc922dbcb8db5f8aadc6eee3d5a8c8c414375.tar.gz | |
Merge branch 'ce-6983-promote-starting-a-gitlab-com-trial' into 'master'
CE port Resolve "Promote starting a GitLab.com trial"
See merge request gitlab-org/gitlab-ce!21551
Diffstat (limited to 'app/views/dashboard/merge_requests.html.haml')
| -rw-r--r-- | app/views/dashboard/merge_requests.html.haml | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/app/views/dashboard/merge_requests.html.haml b/app/views/dashboard/merge_requests.html.haml index 61aae31be60..27f53a8d1c6 100644 --- a/app/views/dashboard/merge_requests.html.haml +++ b/app/views/dashboard/merge_requests.html.haml @@ -2,6 +2,9 @@ - page_title _("Merge Requests") - @breadcrumb_link = merge_requests_dashboard_path(assignee_id: current_user.id) += content_for :above_breadcrumbs_content do + = render_if_exists "shared/gold_trial_callout" + .top-area = render 'shared/issuable/nav', type: :merge_requests, display_count: !@no_filters_set .nav-controls |