diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-03-09 06:13:02 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-03-09 06:13:02 +0300 |
commit | 44a883b53a586ff5966adce0aacfaa9d31e80441 (patch) | |
tree | b2040c2fa853aec7dd181c5c6d8129b638ee3693 /app/views/projects/pipelines | |
parent | de19091107816cd08b0b83f7d908776e71a43606 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/views/projects/pipelines')
-rw-r--r-- | app/views/projects/pipelines/new.html.haml | 2 | ||||
-rw-r--r-- | app/views/projects/pipelines/show.html.haml | 16 |
2 files changed, 13 insertions, 5 deletions
diff --git a/app/views/projects/pipelines/new.html.haml b/app/views/projects/pipelines/new.html.haml index d2b2a58fcf8..ee51ee9b0e2 100644 --- a/app/views/projects/pipelines/new.html.haml +++ b/app/views/projects/pipelines/new.html.haml @@ -9,6 +9,8 @@ pipelines_path: project_pipelines_path(@project), config_variables_path: config_variables_namespace_project_pipelines_path(@project.namespace, @project), default_branch: @project.default_branch, + pipelines_editor_path: project_ci_pipeline_editor_path(@project), + can_view_pipeline_editor: can_view_pipeline_editor?(@project), ref_param: params[:ref] || @project.default_branch, var_param: params[:var].to_json, file_param: params[:file_var].to_json, diff --git a/app/views/projects/pipelines/show.html.haml b/app/views/projects/pipelines/show.html.haml index 9b0a81a2f60..15d729c89b9 100644 --- a/app/views/projects/pipelines/show.html.haml +++ b/app/views/projects/pipelines/show.html.haml @@ -17,11 +17,17 @@ = render "projects/pipelines/info", commit: @pipeline.commit - if pipeline_has_errors - .bs-callout.bs-callout-danger - %h4= _('Unable to create pipeline') - %ul - - @pipeline.yaml_errors.split("\n").each do |error| - %li= error + = render Pajamas::AlertComponent.new(title: s_('Pipelines|Unable to create pipeline'), + variant: :danger, + dismissible: false, + alert_options: { class: 'gl-mb-5' }) do |c| + = c.body do + %ul + - @pipeline.yaml_errors.split("\n").each do |error| + %li= error + - if can_view_pipeline_editor?(@project) + = render Pajamas::ButtonComponent.new(href: project_ci_pipeline_editor_path(@project), variant: :confirm) do + = s_("Pipelines|Go to the pipeline editor") - else #js-pipeline-tabs{ data: js_pipeline_tabs_data(@project, @pipeline, @current_user) } |