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
de3eabc5
Commit
de3eabc5
authored
Dec 01, 2017
by
Fatih Acet
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix loading branches list on cherry pick modal after merge.
parent
f3a3bd50
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
14 additions
and
0 deletions
+14
-0
app/assets/javascripts/vue_merge_request_widget/mr_widget_options.js
...javascripts/vue_merge_request_widget/mr_widget_options.js
+2
-0
spec/features/merge_requests/widget_spec.rb
spec/features/merge_requests/widget_spec.rb
+12
-0
No files found.
app/assets/javascripts/vue_merge_request_widget/mr_widget_options.js
View file @
de3eabc5
import
Project
from
'
~/project
'
;
import
SmartInterval
from
'
~/smart_interval
'
;
import
SmartInterval
from
'
~/smart_interval
'
;
import
Flash
from
'
../flash
'
;
import
Flash
from
'
../flash
'
;
import
{
import
{
...
@@ -140,6 +141,7 @@ export default {
...
@@ -140,6 +141,7 @@ export default {
const
el
=
document
.
createElement
(
'
div
'
);
const
el
=
document
.
createElement
(
'
div
'
);
el
.
innerHTML
=
res
.
body
;
el
.
innerHTML
=
res
.
body
;
document
.
body
.
appendChild
(
el
);
document
.
body
.
appendChild
(
el
);
Project
.
initRefSwitcher
();
}
}
})
})
.
catch
(()
=>
{
.
catch
(()
=>
{
...
...
spec/features/merge_requests/widget_spec.rb
View file @
de3eabc5
...
@@ -63,6 +63,18 @@ describe 'Merge request', :js do
...
@@ -63,6 +63,18 @@ describe 'Merge request', :js do
expect
(
page
).
to
have_selector
(
'.accept-merge-request'
)
expect
(
page
).
to
have_selector
(
'.accept-merge-request'
)
expect
(
find
(
'.accept-merge-request'
)[
'disabled'
]).
not_to
be
(
true
)
expect
(
find
(
'.accept-merge-request'
)[
'disabled'
]).
not_to
be
(
true
)
end
end
it
'allows me to merge, see cherry-pick modal and load branches list'
do
wait_for_requests
click_button
'Merge'
wait_for_requests
click_link
'Cherry-pick'
page
.
find
(
'.js-project-refs-dropdown'
).
click
wait_for_requests
expect
(
page
.
all
(
'.js-cherry-pick-form .dropdown-content li'
).
size
).
to
be
>
1
end
end
end
context
'view merge request with external CI service'
do
context
'view merge request with external CI service'
do
...
...
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