diff options
author | Filipa Lacerda <filipa@gitlab.com> | 2017-09-01 14:18:00 +0300 |
---|---|---|
committer | Filipa Lacerda <filipa@gitlab.com> | 2017-09-01 14:56:47 +0300 |
commit | 354df65295028ac09ed7e4a924e39ff567b38a4b (patch) | |
tree | 07ec147976026a1983986b048c93cd31ee21ca32 /app/views/projects | |
parent | df3d4764034bdad9f6151ab8808b71e1e5088d9c (diff) |
Creates auto devops callout
Diffstat (limited to 'app/views/projects')
-rw-r--r-- | app/views/projects/merge_requests/index.html.haml | 2 | ||||
-rw-r--r-- | app/views/projects/pipelines/index.html.haml | 35 | ||||
-rw-r--r-- | app/views/projects/show.html.haml | 3 | ||||
-rw-r--r-- | app/views/projects/tree/show.html.haml | 2 |
4 files changed, 26 insertions, 16 deletions
diff --git a/app/views/projects/merge_requests/index.html.haml b/app/views/projects/merge_requests/index.html.haml index c020e7db380..f3ec6467a8a 100644 --- a/app/views/projects/merge_requests/index.html.haml +++ b/app/views/projects/merge_requests/index.html.haml @@ -20,6 +20,8 @@ - if @project.merge_requests.exists? %div{ class: container_class } + -# TODO add verfication + = render 'shared/auto_devops_callout' .top-area = render 'shared/issuable/nav', type: :merge_requests .nav-controls{ class: ("visible-xs" if show_new_nav?) } diff --git a/app/views/projects/pipelines/index.html.haml b/app/views/projects/pipelines/index.html.haml index 3ce20378038..37b20d42a8f 100644 --- a/app/views/projects/pipelines/index.html.haml +++ b/app/views/projects/pipelines/index.html.haml @@ -2,20 +2,23 @@ - page_title "Pipelines" = render "projects/pipelines/head" -#pipelines-list-vue{ data: { endpoint: project_pipelines_path(@project, format: :json), - "css-class" => container_class, - "help-page-path" => help_page_path('ci/quick_start/README'), - "help-auto-devops-path" => help_page_path('topics/autodevops/index.md'), - "new-pipeline-path" => new_project_pipeline_path(@project), - "can-create-pipeline" => can?(current_user, :create_pipeline, @project).to_s, - "all-path" => project_pipelines_path(@project), - "pending-path" => project_pipelines_path(@project, scope: :pending), - "running-path" => project_pipelines_path(@project, scope: :running), - "finished-path" => project_pipelines_path(@project, scope: :finished), - "branches-path" => project_pipelines_path(@project, scope: :branches), - "tags-path" => project_pipelines_path(@project, scope: :tags), - "has-ci" => @repository.gitlab_ci_yml || @project.auto_devops_enabled?, - "ci-lint-path" => ci_lint_path } } +%div{ 'class' => container_class } + -# TODO add verfication + = render 'shared/auto_devops_callout' -= page_specific_javascript_bundle_tag('common_vue') -= page_specific_javascript_bundle_tag('pipelines') + #pipelines-list-vue{ data: { endpoint: project_pipelines_path(@project, format: :json), + "help-page-path" => help_page_path('ci/quick_start/README'), + "help-auto-devops-path" => help_page_path('topics/autodevops/index.md'), + "new-pipeline-path" => new_project_pipeline_path(@project), + "can-create-pipeline" => can?(current_user, :create_pipeline, @project).to_s, + "all-path" => project_pipelines_path(@project), + "pending-path" => project_pipelines_path(@project, scope: :pending), + "running-path" => project_pipelines_path(@project, scope: :running), + "finished-path" => project_pipelines_path(@project, scope: :finished), + "branches-path" => project_pipelines_path(@project, scope: :branches), + "tags-path" => project_pipelines_path(@project, scope: :tags), + "has-ci" => @repository.gitlab_ci_yml || @project.auto_devops_enabled?, + "ci-lint-path" => ci_lint_path } } + + = page_specific_javascript_bundle_tag('common_vue') + = page_specific_javascript_bundle_tag('pipelines') diff --git a/app/views/projects/show.html.haml b/app/views/projects/show.html.haml index a9b39cedb1d..06822ee2cce 100644 --- a/app/views/projects/show.html.haml +++ b/app/views/projects/show.html.haml @@ -81,5 +81,8 @@ - view_path = default_project_view + -# TODO add verfication + = render 'shared/auto_devops_callout' + %div{ class: project_child_container_class(view_path) } = render view_path diff --git a/app/views/projects/tree/show.html.haml b/app/views/projects/tree/show.html.haml index 375e6764add..a4e2b15ed19 100644 --- a/app/views/projects/tree/show.html.haml +++ b/app/views/projects/tree/show.html.haml @@ -14,5 +14,7 @@ = render "projects/commits/head" %div{ class: [container_class, ("limit-container-width" unless fluid_layout)] } + -# TODO add verfication + = render 'shared/auto_devops_callout' = render 'projects/last_push' = render 'projects/files', commit: @last_commit, project: @project, ref: @ref, content_url: project_tree_path(@project, @id) |