From 903ccf7c93eb9490c76857bffe744249cc07de09 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Tue, 7 Apr 2020 12:09:34 +0000 Subject: Add latest changes from gitlab-org/gitlab@master --- app/views/projects/import/jira/show.html.haml | 45 ++++++++++++---------- .../merge_requests/_merge_request.html.haml | 4 +- .../projects/prometheus/metrics/_form.html.haml | 4 ++ .../projects/prometheus/metrics/edit.html.haml | 6 +++ .../projects/prometheus/metrics/new.html.haml | 6 +++ 5 files changed, 41 insertions(+), 24 deletions(-) create mode 100644 app/views/projects/prometheus/metrics/_form.html.haml create mode 100644 app/views/projects/prometheus/metrics/edit.html.haml create mode 100644 app/views/projects/prometheus/metrics/new.html.haml (limited to 'app/views/projects') diff --git a/app/views/projects/import/jira/show.html.haml b/app/views/projects/import/jira/show.html.haml index c734297d7f3..cfc4baa1c25 100644 --- a/app/views/projects/import/jira/show.html.haml +++ b/app/views/projects/import/jira/show.html.haml @@ -1,24 +1,27 @@ -- title = _('Jira Issue Import') -- page_title title -- breadcrumb_title title -- header_title _("Projects"), root_path +- if Feature.enabled?(:jira_issue_import_vue, @project) + .js-jira-import-root{ data: { project_path: @project.full_path } } +- else + - title = _('Jira Issue Import') + - page_title title + - breadcrumb_title title + - header_title _("Projects"), root_path -= render 'import/shared/errors' + = render 'import/shared/errors' -- if @project.import_state&.in_progress? - %h3.page-title.d-flex.align-items-center - = sprite_icon('issues', size: 16, css_class: 'mr-1') - = _('Import in progress') -- elsif @jira_projects.present? - %h3.page-title.d-flex.align-items-center - = sprite_icon('issues', size: 16, css_class: 'mr-1') - = _('Import issues from Jira') + - if @project.import_state&.in_progress? + %h3.page-title.d-flex.align-items-center + = sprite_icon('issues', size: 16, css_class: 'mr-1') + = _('Import in progress') + - elsif @jira_projects.present? + %h3.page-title.d-flex.align-items-center + = sprite_icon('issues', size: 16, css_class: 'mr-1') + = _('Import issues from Jira') - = form_tag import_project_import_jira_path(@project), method: :post do - .form-group.row - = label_tag :jira_project_key, _('From project'), class: 'col-form-label col-md-2' - .col-md-4 - = select_tag :jira_project_key, options_for_select(@jira_projects, ''), { class: 'select2' } - .form-actions - = submit_tag _('Import issues'), class: 'btn btn-success' - = link_to _('Cancel'), project_issues_path(@project), class: 'btn btn-cancel' + = form_tag import_project_import_jira_path(@project), method: :post do + .form-group.row + = label_tag :jira_project_key, _('From project'), class: 'col-form-label col-md-2' + .col-md-4 + = select_tag :jira_project_key, options_for_select(@jira_projects, ''), { class: 'select2' } + .form-actions + = submit_tag _('Import issues'), class: 'btn btn-success' + = link_to _('Cancel'), project_issues_path(@project), class: 'btn btn-cancel' diff --git a/app/views/projects/merge_requests/_merge_request.html.haml b/app/views/projects/merge_requests/_merge_request.html.haml index 1bde1a41975..f7f5388a54a 100644 --- a/app/views/projects/merge_requests/_merge_request.html.haml +++ b/app/views/projects/merge_requests/_merge_request.html.haml @@ -47,9 +47,7 @@ %li.issuable-status.d-none.d-sm-inline-block = icon('ban') = _('CLOSED') - - if can?(current_user, :read_pipeline, merge_request.head_pipeline) - %li.issuable-pipeline-status.d-none.d-sm-flex - = render 'ci/status/icon', status: merge_request.head_pipeline.detailed_status(current_user), option_css_classes: 'd-flex' + = render 'shared/merge_request_pipeline_status', merge_request: merge_request - if merge_request.open? && merge_request.broken? %li.issuable-pipeline-broken.d-none.d-sm-flex = link_to merge_request_path(merge_request), class: "has-tooltip", title: _('Cannot be merged automatically') do diff --git a/app/views/projects/prometheus/metrics/_form.html.haml b/app/views/projects/prometheus/metrics/_form.html.haml new file mode 100644 index 00000000000..a87d81e6325 --- /dev/null +++ b/app/views/projects/prometheus/metrics/_form.html.haml @@ -0,0 +1,4 @@ +- project = local_assigns.fetch(:project) +- metric = local_assigns.fetch(:metric) + +#js-custom-metrics{ data: custom_metrics_data(project, metric) } diff --git a/app/views/projects/prometheus/metrics/edit.html.haml b/app/views/projects/prometheus/metrics/edit.html.haml new file mode 100644 index 00000000000..15a9c922ca6 --- /dev/null +++ b/app/views/projects/prometheus/metrics/edit.html.haml @@ -0,0 +1,6 @@ +- add_to_breadcrumbs _("Settings"), edit_project_path(@project) +- add_to_breadcrumbs _("Integrations"), project_settings_integrations_path(@project) +- add_to_breadcrumbs "Prometheus", edit_project_service_path(@project, PrometheusService) +- breadcrumb_title s_('Metrics|Edit metric') +- page_title @metric.title, s_('Metrics|Edit metric') += render 'form', project: @project, metric: @metric diff --git a/app/views/projects/prometheus/metrics/new.html.haml b/app/views/projects/prometheus/metrics/new.html.haml new file mode 100644 index 00000000000..fa925d090cb --- /dev/null +++ b/app/views/projects/prometheus/metrics/new.html.haml @@ -0,0 +1,6 @@ +- add_to_breadcrumbs _("Settings"), edit_project_path(@project) +- add_to_breadcrumbs _("Integrations"), project_settings_integrations_path(@project) +- add_to_breadcrumbs "Prometheus", edit_project_service_path(@project, PrometheusService) +- breadcrumb_title s_('Metrics|New metric') +- page_title s_('Metrics|New metric') += render 'form', project: @project, metric: @metric -- cgit v1.2.3