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
0
Merge Requests
0
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
Jérome Perrin
gitlab-ce
Commits
52dd35af
Commit
52dd35af
authored
Jun 12, 2017
by
Bryce Johnson
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Make small pipeline schedules UI enhancements.
parent
f79caeaa
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
3 additions
and
3 deletions
+3
-3
app/assets/stylesheets/pages/pipeline_schedules.scss
app/assets/stylesheets/pages/pipeline_schedules.scss
+1
-1
app/views/projects/pipeline_schedules/_form.html.haml
app/views/projects/pipeline_schedules/_form.html.haml
+1
-1
spec/features/projects/pipeline_schedules_spec.rb
spec/features/projects/pipeline_schedules_spec.rb
+1
-1
No files found.
app/assets/stylesheets/pages/pipeline_schedules.scss
View file @
52dd35af
...
@@ -12,7 +12,7 @@
...
@@ -12,7 +12,7 @@
.interval-pattern-form-group
{
.interval-pattern-form-group
{
label
{
label
{
margin-right
:
10px
;
margin-right
:
10px
;
font-
size
:
12px
;
font-
weight
:
normal
;
&
[
for
=
'custom'
]
{
&
[
for
=
'custom'
]
{
margin-right
:
0
;
margin-right
:
0
;
...
...
app/views/projects/pipeline_schedules/_form.html.haml
View file @
52dd35af
...
@@ -20,7 +20,7 @@
...
@@ -20,7 +20,7 @@
.form-group
.form-group
.col-md-9
.col-md-9
=
f
.
label
:ref
,
_
(
'Target Branch'
),
class:
'label-light'
=
f
.
label
:ref
,
_
(
'Target Branch'
),
class:
'label-light'
=
dropdown_tag
(
_
(
"Select target branch"
),
options:
{
toggle_class:
'btn js-target-branch-dropdown
git-revision-dropdown-toggle
'
,
dropdown_class:
'git-revision-dropdown'
,
title:
_
(
"Select target branch"
),
filter:
true
,
placeholder:
_
(
"Filter"
),
data:
{
data:
@project
.
repository
.
branch_names
,
default_branch:
@project
.
default_branch
}
}
)
=
dropdown_tag
(
_
(
"Select target branch"
),
options:
{
toggle_class:
'btn js-target-branch-dropdown'
,
dropdown_class:
'git-revision-dropdown'
,
title:
_
(
"Select target branch"
),
filter:
true
,
placeholder:
_
(
"Filter"
),
data:
{
data:
@project
.
repository
.
branch_names
,
default_branch:
@project
.
default_branch
}
}
)
=
f
.
text_field
:ref
,
value:
@schedule
.
ref
,
id:
'schedule_ref'
,
class:
'hidden'
,
name:
'schedule[ref]'
,
required:
true
=
f
.
text_field
:ref
,
value:
@schedule
.
ref
,
id:
'schedule_ref'
,
class:
'hidden'
,
name:
'schedule[ref]'
,
required:
true
.form-group
.form-group
.col-md-9
.col-md-9
...
...
spec/features/projects/pipeline_schedules_spec.rb
View file @
52dd35af
...
@@ -127,7 +127,7 @@ feature 'Pipeline Schedules', :feature do
...
@@ -127,7 +127,7 @@ feature 'Pipeline Schedules', :feature do
end
end
it
'shows the pipeline schedule with default ref'
do
it
'shows the pipeline schedule with default ref'
do
page
.
within
(
'.
git-revision-dropdown-toggle
'
)
do
page
.
within
(
'.
js-target-branch-dropdown
'
)
do
expect
(
first
(
'.dropdown-toggle-text'
).
text
).
to
eq
(
'master'
)
expect
(
first
(
'.dropdown-toggle-text'
).
text
).
to
eq
(
'master'
)
end
end
end
end
...
...
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