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
502bd6c0
Commit
502bd6c0
authored
Jun 27, 2017
by
Jose Ivan Vargas
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed sidebar not collapsing on merge request in mobile screens
parent
6ab58866
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
9 additions
and
3 deletions
+9
-3
app/assets/javascripts/merge_request_tabs.js
app/assets/javascripts/merge_request_tabs.js
+0
-1
changelogs/unreleased/fix-sidebar-showing-mobile-merge-requests.yml
.../unreleased/fix-sidebar-showing-mobile-merge-requests.yml
+4
-0
spec/features/issues/issue_sidebar_spec.rb
spec/features/issues/issue_sidebar_spec.rb
+5
-2
No files found.
app/assets/javascripts/merge_request_tabs.js
View file @
502bd6c0
...
@@ -144,7 +144,6 @@ import BlobForkSuggestion from './blob/blob_fork_suggestion';
...
@@ -144,7 +144,6 @@ import BlobForkSuggestion from './blob/blob_fork_suggestion';
this
.
resetViewContainer
();
this
.
resetViewContainer
();
this
.
mountPipelinesView
();
this
.
mountPipelinesView
();
}
else
{
}
else
{
this
.
expandView
();
this
.
resetViewContainer
();
this
.
resetViewContainer
();
this
.
destroyPipelinesView
();
this
.
destroyPipelinesView
();
}
}
...
...
changelogs/unreleased/fix-sidebar-showing-mobile-merge-requests.yml
0 → 100644
View file @
502bd6c0
---
title
:
Fixed sidebar not collapsing on merge requests in mobile screens
merge_request
:
author
:
spec/features/issues/issue_sidebar_spec.rb
View file @
502bd6c0
...
@@ -6,6 +6,7 @@ feature 'Issue Sidebar', feature: true do
...
@@ -6,6 +6,7 @@ feature 'Issue Sidebar', feature: true do
let
(
:group
)
{
create
(
:group
,
:nested
)
}
let
(
:group
)
{
create
(
:group
,
:nested
)
}
let
(
:project
)
{
create
(
:project
,
:public
,
namespace:
group
)
}
let
(
:project
)
{
create
(
:project
,
:public
,
namespace:
group
)
}
let
(
:issue
)
{
create
(
:issue
,
project:
project
)
}
let
(
:issue
)
{
create
(
:issue
,
project:
project
)
}
let
(
:merge_request
)
{
create
(
:merge_request
,
source_project:
project
)
}
let!
(
:user
)
{
create
(
:user
)}
let!
(
:user
)
{
create
(
:user
)}
let!
(
:label
)
{
create
(
:label
,
project:
project
,
title:
'bug'
)
}
let!
(
:label
)
{
create
(
:label
,
project:
project
,
title:
'bug'
)
}
...
@@ -158,11 +159,13 @@ feature 'Issue Sidebar', feature: true do
...
@@ -158,11 +159,13 @@ feature 'Issue Sidebar', feature: true do
before
do
before
do
project
.
team
<<
[
user
,
:developer
]
project
.
team
<<
[
user
,
:developer
]
resize_screen_xs
resize_screen_xs
visit_issue
(
project
,
issue
)
end
end
context
'mobile sidebar'
do
context
'mobile sidebar'
do
it
'collapses the sidebar for small screens'
do
it
'collapses the sidebar for small screens on an issue/merge_request'
do
visit_issue
(
project
,
issue
)
expect
(
page
).
not_to
have_css
(
'aside.right-sidebar.right-sidebar-collapsed'
)
visit
namespace_project_merge_request_path
(
merge_request
.
project
.
namespace
,
merge_request
.
project
,
merge_request
)
expect
(
page
).
not_to
have_css
(
'aside.right-sidebar.right-sidebar-collapsed'
)
expect
(
page
).
not_to
have_css
(
'aside.right-sidebar.right-sidebar-collapsed'
)
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