Add latest changes from gitlab-org/gitlab@master
This commit is contained in:
parent
f70958a893
commit
6429e3ca2b
|
@ -2,7 +2,7 @@
|
|||
- group_path = root_url
|
||||
- group_path << parent.full_path + '/' if parent
|
||||
|
||||
= form_for '', url: import_gitlab_group_path, namespace: 'import_group', class: 'group-form gl-show-field-errors', multipart: true do |f|
|
||||
= gitlab_ui_form_for '', url: import_gitlab_group_path, namespace: 'import_group', class: 'group-form gl-show-field-errors', multipart: true do |f|
|
||||
.gl-border-l-solid.gl-border-r-solid.gl-border-gray-100.gl-border-1.gl-p-5
|
||||
%h4
|
||||
= _('Import group from file')
|
||||
|
@ -22,4 +22,4 @@
|
|||
.gl-mt-3
|
||||
= render 'shared/file_picker_button', f: f, field: :file, help_text: nil, classes: 'gl-button btn-confirm-secondary gl-mr-2'
|
||||
.gl-border-gray-100.gl-border-solid.gl-border-1.gl-bg-gray-10.gl-p-5
|
||||
= f.submit _('Import'), class: 'btn gl-button btn-confirm'
|
||||
= f.submit _('Import'), pajamas_button: true
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
.row.gl-mt-3
|
||||
.col-lg-12
|
||||
= form_for group, url: group_settings_ci_cd_path(group, anchor: 'js-general-pipeline-settings') do |f|
|
||||
= gitlab_ui_form_for group, url: group_settings_ci_cd_path(group, anchor: 'js-general-pipeline-settings') do |f|
|
||||
%fieldset.builds-feature
|
||||
.form-group
|
||||
= f.label :max_artifacts_size, _('Maximum artifacts size'), class: 'label-bold'
|
||||
|
@ -8,4 +8,4 @@
|
|||
%p.form-text.text-muted
|
||||
= _("The maximum file size in megabytes for individual job artifacts.")
|
||||
= link_to s_('Learn more.'), help_page_path('user/admin_area/settings/continuous_integration', anchor: 'maximum-artifacts-size'), target: '_blank', rel: 'noopener noreferrer'
|
||||
= f.submit _('Save changes'), class: "btn gl-button btn-confirm"
|
||||
= f.submit _('Save changes'), pajamas_button: true
|
||||
|
|
|
@ -92,5 +92,5 @@
|
|||
|
||||
-# this partial is from JiHu, see details in https://jihulab.com/gitlab-cn/gitlab/-/merge_requests/675
|
||||
= render_if_exists 'shared/other_project_options', f: f, visibility_level: visibility_level, track_label: track_label
|
||||
= f.submit _('Create project'), class: "btn gl-button btn-confirm js-create-project-button", data: { qa_selector: 'project_create_button', track_label: "#{track_label}", track_action: "click_button", track_property: "create_project", track_value: "" }
|
||||
= f.submit _('Create project'), class: "js-create-project-button", data: { qa_selector: 'project_create_button', track_label: "#{track_label}", track_action: "click_button", track_property: "create_project", track_value: "" }, pajamas_button: true
|
||||
= link_to _('Cancel'), dashboard_projects_path, class: 'btn gl-button btn-default btn-cancel', data: { track_label: "#{track_label}", track_action: "click_button", track_property: "cancel", track_value: "" }
|
||||
|
|
|
@ -6,5 +6,5 @@
|
|||
= gitlab_ui_form_for [@project, @deploy_key], include_id: false, html: { class: 'js-requires-input' } do |f|
|
||||
= render partial: 'shared/deploy_keys/form', locals: { form: f, deploy_key: @deploy_key }
|
||||
.form-actions
|
||||
= f.submit _('Save changes'), class: 'gl-button btn btn-confirm'
|
||||
= f.submit _('Save changes'), pajamas_button: true
|
||||
= link_to _('Cancel'), project_settings_repository_path(@project), class: 'gl-button btn btn-default btn-cancel'
|
||||
|
|
|
@ -35,7 +35,7 @@
|
|||
= link_to _('Learn more.'), help_page_path('user/project/repository/mirror/index.md', anchor: 'mirror-only-protected-branches'), target: '_blank', rel: 'noopener noreferrer'
|
||||
|
||||
.panel-footer
|
||||
= f.submit _('Mirror repository'), class: 'gl-button btn btn-confirm js-mirror-submit qa-mirror-repository-button', name: :update_remote_mirror
|
||||
= f.submit _('Mirror repository'), class: 'js-mirror-submit qa-mirror-repository-button', name: :update_remote_mirror, pajamas_button: true
|
||||
- else
|
||||
= render Pajamas::AlertComponent.new(dismissible: false) do |c|
|
||||
= c.body do
|
||||
|
|
Loading…
Reference in New Issue