diff options
| author | Phil Hughes <me@iamphill.com> | 2018-03-06 12:08:30 +0300 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2018-03-06 12:08:30 +0300 |
| commit | 60d95d8f24c64633fc5facb68ee3e77c0ae639b2 (patch) | |
| tree | 297aa3e0b0a35befff5345dbdce2b24f20b092a0 /app/views | |
| parent | a28045124f33c67068246df91d9c0ca17c3ad035 (diff) | |
| parent | e3251a4077d4667239b23437921f49a1d195406c (diff) | |
Merge branch '38587-pipelines-empty-state' into 'master'
Resolve "Pipelines view should handle empty state and buttons properly"
Closes #38587
See merge request gitlab-org/gitlab-ce!17433
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/projects/pipelines/index.html.haml | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/app/views/projects/pipelines/index.html.haml b/app/views/projects/pipelines/index.html.haml index cf95cdbfec2..3e6b3346787 100644 --- a/app/views/projects/pipelines/index.html.haml +++ b/app/views/projects/pipelines/index.html.haml @@ -7,8 +7,9 @@ "help-auto-devops-path" => help_page_path('topics/autodevops/index.md'), "empty-state-svg-path" => image_path('illustrations/pipelines_empty.svg'), "error-state-svg-path" => image_path('illustrations/pipelines_failed.svg'), - "new-pipeline-path" => new_project_pipeline_path(@project), + "no-pipelines-svg-path" => image_path('illustrations/pipelines_pending.svg'), "can-create-pipeline" => can?(current_user, :create_pipeline, @project).to_s, - "has-ci" => @repository.gitlab_ci_yml, - "ci-lint-path" => ci_lint_path, - "reset-cache-path" => reset_cache_project_settings_ci_cd_path(@project) } } + "new-pipeline-path" => can?(current_user, :create_pipeline, @project) && new_project_pipeline_path(@project), + "ci-lint-path" => can?(current_user, :create_pipeline, @project) && ci_lint_path, + "reset-cache-path" => can?(current_user, :admin_pipeline, @project) && reset_cache_project_settings_ci_cd_path(@project) , + "has-gitlab-ci" => (@project.has_ci? && @project.builds_enabled?).to_s } } |