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
Léo-Paul Géneau
gitlab-ce
Commits
7af283c7
Commit
7af283c7
authored
May 18, 2018
by
Jacopo
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Closes MR check out branch modal with escape
parent
2eb8099f
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
30 additions
and
1 deletion
+30
-1
app/views/projects/merge_requests/_how_to_merge.html.haml
app/views/projects/merge_requests/_how_to_merge.html.haml
+1
-1
changelogs/unreleased/45850-close-mr-checkout-modal-on-escape.yml
...gs/unreleased/45850-close-mr-checkout-modal-on-escape.yml
+5
-0
spec/features/merge_request/user_sees_check_out_branch_modal_spec.rb
...es/merge_request/user_sees_check_out_branch_modal_spec.rb
+24
-0
No files found.
app/views/projects/merge_requests/_how_to_merge.html.haml
View file @
7af283c7
#modal_merge_info
.modal
#modal_merge_info
.modal
{
tabindex:
'-1'
}
.modal-dialog
.modal-content
.modal-header
...
...
changelogs/unreleased/45850-close-mr-checkout-modal-on-escape.yml
0 → 100644
View file @
7af283c7
---
title
:
Closes MR check out branch modal with escape
merge_request
:
Jacopo Beschi @jacopo-beschi
author
:
19050
type
:
added
spec/features/merge_request/user_sees_check_out_branch_modal_spec.rb
0 → 100644
View file @
7af283c7
require
'rails_helper'
describe
'Merge request > User sees Check out branch modal'
,
:js
do
let
(
:project
)
{
create
(
:project
,
:public
,
:repository
)
}
let
(
:user
)
{
project
.
creator
}
let
(
:merge_request
)
{
create
(
:merge_request
,
source_project:
project
)
}
before
do
sign_in
(
user
)
visit
project_merge_request_path
(
project
,
merge_request
)
wait_for_requests
click_button
(
'Check out branch'
)
end
it
'shows the check out branch modal'
do
expect
(
page
).
to
have_content
(
'Check out, review, and merge locally'
)
end
it
'closes the check out branch model with Escape keypress'
do
find
(
'#modal_merge_info'
).
send_keys
(
:escape
)
expect
(
page
).
not_to
have_content
(
'Check out, review, and merge locally'
)
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