Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
66fba1ef
Commit
66fba1ef
authored
Jun 22, 2021
by
Tom Quirk
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[skip ci] WIP Address ux feedback
parent
361633ca
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
5 deletions
+9
-5
ee/app/assets/javascripts/pages/admin/application_settings/ci_cd/ci_template_dropdown.vue
...admin/application_settings/ci_cd/ci_template_dropdown.vue
+6
-1
ee/app/views/admin/application_settings/_required_instance_ci_setting.html.haml
...lication_settings/_required_instance_ci_setting.html.haml
+3
-4
No files found.
ee/app/assets/javascripts/pages/admin/application_settings/ci_cd/ci_template_dropdown.vue
View file @
66fba1ef
...
@@ -89,7 +89,12 @@ export default {
...
@@ -89,7 +89,12 @@ export default {
name=
"application_setting[required_instance_ci_template]"
name=
"application_setting[required_instance_ci_template]"
:value=
"selectedGitlabCiYmlValue"
:value=
"selectedGitlabCiYmlValue"
/>
/>
<gl-dropdown
:text=
"dropdownText"
:header-text=
"$options.i18n.defaultDropdownHeaderText"
block
>
<gl-dropdown
:text=
"dropdownText"
:header-text=
"$options.i18n.defaultDropdownHeaderText"
no-flip
class=
"gl-display-block gl-m-0"
>
<template
#header
>
<template
#header
>
<gl-search-box-by-type
v-model.trim=
"searchTerm"
:debounce=
"$options.TYPING_DELAY"
/>
<gl-search-box-by-type
v-model.trim=
"searchTerm"
:debounce=
"$options.TYPING_DELAY"
/>
</
template
>
</
template
>
...
...
ee/app/views/admin/application_settings/_required_instance_ci_setting.html.haml
View file @
66fba1ef
...
@@ -16,8 +16,7 @@
...
@@ -16,8 +16,7 @@
=
form_for
@application_setting
,
url:
ci_cd_admin_application_settings_path
(
anchor:
'js-required-pipeline-settings'
),
html:
{
class:
'fieldset-form'
}
do
|
f
|
=
form_for
@application_setting
,
url:
ci_cd_admin_application_settings_path
(
anchor:
'js-required-pipeline-settings'
),
html:
{
class:
'fieldset-form'
}
do
|
f
|
=
form_errors
(
@application_setting
)
=
form_errors
(
@application_setting
)
%fieldset
.form-group.col-md-9.gl-p-0
.form-group
=
f
.
label
:required_instance_ci_template
,
s_
(
'AdminSettings|Select a CI/CD template'
)
=
f
.
label
:required_instance_ci_template
,
s_
(
'AdminSettings|Select a CI/CD template'
)
.js-ci-template-dropdown
{
data:
{
gitlab_ci_ymls:
gitlab_ci_ymls
(
@project
).
to_json
,
value:
@application_setting
.
required_instance_ci_template
}
}
.js-ci-template-dropdown
{
data:
{
gitlab_ci_ymls:
gitlab_ci_ymls
(
@project
).
to_json
,
value:
@application_setting
.
required_instance_ci_template
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment