diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-24 21:09:08 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-24 21:09:08 +0000 |
| commit | 7671216b60e2796a050358ff808b4a0c2de3d22f (patch) | |
| tree | 605dfc1339a3cd7dc7353ac6d725191086a9acca /app/views/projects | |
| parent | c2367afbf57ebc65d5b78a743b5d6a91f0aece9f (diff) | |
| download | gitlab-ce-7671216b60e2796a050358ff808b4a0c2de3d22f.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/views/projects')
| -rw-r--r-- | app/views/projects/blob/_pipeline_tour_success.html.haml | 1 | ||||
| -rw-r--r-- | app/views/projects/blob/show.html.haml | 2 | ||||
| -rw-r--r-- | app/views/projects/merge_requests/_widget.html.haml | 1 |
3 files changed, 4 insertions, 0 deletions
diff --git a/app/views/projects/blob/_pipeline_tour_success.html.haml b/app/views/projects/blob/_pipeline_tour_success.html.haml new file mode 100644 index 00000000000..7ecbc1974ec --- /dev/null +++ b/app/views/projects/blob/_pipeline_tour_success.html.haml @@ -0,0 +1 @@ +.js-success-pipeline-modal{ 'data-commit-cookie': suggest_pipeline_commit_cookie_name, 'data-pipelines-path': project_pipelines_path(@project) } diff --git a/app/views/projects/blob/show.html.haml b/app/views/projects/blob/show.html.haml index 7c73bbc7479..c66300aa947 100644 --- a/app/views/projects/blob/show.html.haml +++ b/app/views/projects/blob/show.html.haml @@ -14,3 +14,5 @@ - title = "Replace #{@blob.name}" = render 'projects/blob/upload', title: title, placeholder: title, button_title: 'Replace file', form_path: project_update_blob_path(@project, @id), method: :put + += render partial: 'pipeline_tour_success' if show_suggest_pipeline_creation_celebration? diff --git a/app/views/projects/merge_requests/_widget.html.haml b/app/views/projects/merge_requests/_widget.html.haml index 3fe6f0a6640..1853d40c2e4 100644 --- a/app/views/projects/merge_requests/_widget.html.haml +++ b/app/views/projects/merge_requests/_widget.html.haml @@ -10,5 +10,6 @@ window.gl.mrWidgetData.troubleshooting_docs_path = '#{help_page_path('user/project/merge_requests/reviewing_and_managing_merge_requests.md', anchor: 'troubleshooting')}'; window.gl.mrWidgetData.security_approvals_help_page_path = '#{help_page_path('user/application_security/index.html', anchor: 'security-approvals-in-merge-requests-ultimate')}'; window.gl.mrWidgetData.eligible_approvers_docs_path = '#{help_page_path('user/project/merge_requests/merge_request_approvals', anchor: 'eligible-approvers')}'; + window.gl.mrWidgetData.pipelines_empty_svg_path = '#{image_path('illustrations/pipelines_empty.svg')}'; #js-vue-mr-widget.mr-widget |