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
f4a98ea9
Commit
f4a98ea9
authored
Apr 19, 2018
by
Clement Ho
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix issue create new branch
parent
006b477f
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
11 additions
and
11 deletions
+11
-11
app/assets/javascripts/create_merge_request_dropdown.js
app/assets/javascripts/create_merge_request_dropdown.js
+5
-5
app/assets/stylesheets/pages/issues.scss
app/assets/stylesheets/pages/issues.scss
+3
-3
app/views/projects/issues/_new_branch.html.haml
app/views/projects/issues/_new_branch.html.haml
+1
-1
spec/features/issues/user_creates_branch_and_merge_request_spec.rb
...ures/issues/user_creates_branch_and_merge_request_spec.rb
+2
-2
No files found.
app/assets/javascripts/create_merge_request_dropdown.js
View file @
f4a98ea9
...
@@ -61,8 +61,8 @@ export default class CreateMergeRequestDropdown {
...
@@ -61,8 +61,8 @@ export default class CreateMergeRequestDropdown {
}
}
available
()
{
available
()
{
this
.
availableButton
.
classList
.
remove
(
'
hid
e
'
);
this
.
availableButton
.
classList
.
remove
(
'
hid
den
'
);
this
.
unavailableButton
.
classList
.
add
(
'
hid
e
'
);
this
.
unavailableButton
.
classList
.
add
(
'
hid
den
'
);
}
}
bindEvents
()
{
bindEvents
()
{
...
@@ -231,7 +231,7 @@ export default class CreateMergeRequestDropdown {
...
@@ -231,7 +231,7 @@ export default class CreateMergeRequestDropdown {
}
}
hide
()
{
hide
()
{
this
.
wrapperEl
.
classList
.
add
(
'
hid
e
'
);
this
.
wrapperEl
.
classList
.
add
(
'
hid
den
'
);
}
}
init
()
{
init
()
{
...
@@ -405,8 +405,8 @@ export default class CreateMergeRequestDropdown {
...
@@ -405,8 +405,8 @@ export default class CreateMergeRequestDropdown {
}
}
unavailable
()
{
unavailable
()
{
this
.
availableButton
.
classList
.
add
(
'
hid
e
'
);
this
.
availableButton
.
classList
.
add
(
'
hid
den
'
);
this
.
unavailableButton
.
classList
.
remove
(
'
hid
e
'
);
this
.
unavailableButton
.
classList
.
remove
(
'
hid
den
'
);
}
}
updateInputState
(
target
,
ref
,
result
)
{
updateInputState
(
target
,
ref
,
result
)
{
...
...
app/assets/stylesheets/pages/issues.scss
View file @
f4a98ea9
...
@@ -205,7 +205,7 @@ ul.related-merge-requests > li {
...
@@ -205,7 +205,7 @@ ul.related-merge-requests > li {
}
}
}
}
.btn-group
:not
(
.hid
e
)
{
.btn-group
:not
(
.hid
den
)
{
display
:
flex
;
display
:
flex
;
}
}
...
@@ -258,8 +258,8 @@ ul.related-merge-requests > li {
...
@@ -258,8 +258,8 @@ ul.related-merge-requests > li {
}
}
.create-mr-dropdown-wrap
{
.create-mr-dropdown-wrap
{
.btn-group
:not
(
.hid
e
)
{
.btn-group
:not
(
.hid
den
)
{
display
:
inline-
block
;
display
:
inline-
flex
;
}
}
}
}
}
}
...
...
app/views/projects/issues/_new_branch.html.haml
View file @
f4a98ea9
...
@@ -14,7 +14,7 @@
...
@@ -14,7 +14,7 @@
=
icon
(
'spinner'
,
class:
'fa-spin'
)
=
icon
(
'spinner'
,
class:
'fa-spin'
)
%span
.text
%span
.text
Checking branch availability…
Checking branch availability…
.btn-group.available.
d-none
.btn-group.available.
hidden
%button
.btn.js-create-merge-request.btn-success.btn-inverted
{
type:
'button'
,
data:
{
action:
data_action
}
}
%button
.btn.js-create-merge-request.btn-success.btn-inverted
{
type:
'button'
,
data:
{
action:
data_action
}
}
=
value
=
value
...
...
spec/features/issues/user_creates_branch_and_merge_request_spec.rb
View file @
f4a98ea9
...
@@ -139,8 +139,8 @@ describe 'User creates branch and merge request on issue page', :js do
...
@@ -139,8 +139,8 @@ describe 'User creates branch and merge request on issue page', :js do
end
end
it
'disables the create branch button'
do
it
'disables the create branch button'
do
expect
(
page
).
to
have_css
(
'.create-mr-dropdown-wrap .unavailable:not(.hid
e
)'
)
expect
(
page
).
to
have_css
(
'.create-mr-dropdown-wrap .unavailable:not(.hid
den
)'
)
expect
(
page
).
to
have_css
(
'.create-mr-dropdown-wrap .available.hid
e
'
,
visible:
false
)
expect
(
page
).
to
have_css
(
'.create-mr-dropdown-wrap .available.hid
den
'
,
visible:
false
)
expect
(
page
).
to
have_content
/1 Related Merge Request/
expect
(
page
).
to
have_content
/1 Related Merge Request/
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