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
Boxiang Sun
gitlab-ce
Commits
d93d1f9e
Commit
d93d1f9e
authored
Sep 11, 2017
by
Annabel Dunstone Gray
Committed by
Phil Hughes
Sep 11, 2017
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Check for sidebar cookie instead of class when resizing window
parent
ce14fae5
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
5 additions
and
5 deletions
+5
-5
app/assets/javascripts/new_sidebar.js
app/assets/javascripts/new_sidebar.js
+1
-1
spec/features/boards/boards_spec.rb
spec/features/boards/boards_spec.rb
+1
-1
spec/features/issues/filtered_search/visual_tokens_spec.rb
spec/features/issues/filtered_search/visual_tokens_spec.rb
+1
-1
spec/features/merge_requests/diff_notes_avatars_spec.rb
spec/features/merge_requests/diff_notes_avatars_spec.rb
+1
-1
spec/features/merge_requests/user_posts_diff_notes_spec.rb
spec/features/merge_requests/user_posts_diff_notes_spec.rb
+1
-1
No files found.
app/assets/javascripts/new_sidebar.js
View file @
d93d1f9e
...
@@ -68,7 +68,7 @@ export default class NewNavSidebar {
...
@@ -68,7 +68,7 @@ export default class NewNavSidebar {
if
(
breakpoint
===
'
sm
'
||
breakpoint
===
'
md
'
)
{
if
(
breakpoint
===
'
sm
'
||
breakpoint
===
'
md
'
)
{
this
.
toggleCollapsedSidebar
(
true
);
this
.
toggleCollapsedSidebar
(
true
);
}
else
if
(
breakpoint
===
'
lg
'
)
{
}
else
if
(
breakpoint
===
'
lg
'
)
{
const
collapse
=
this
.
$sidebar
.
hasClass
(
'
sidebar-icons-only
'
)
;
const
collapse
=
Cookies
.
get
(
'
sidebar_collapsed
'
)
===
'
true
'
;
this
.
toggleCollapsedSidebar
(
collapse
);
this
.
toggleCollapsedSidebar
(
collapse
);
}
}
}
}
...
...
spec/features/boards/boards_spec.rb
View file @
d93d1f9e
...
@@ -13,7 +13,7 @@ describe 'Issue Boards', js: true do
...
@@ -13,7 +13,7 @@ describe 'Issue Boards', js: true do
project
.
team
<<
[
user
,
:master
]
project
.
team
<<
[
user
,
:master
]
project
.
team
<<
[
user2
,
:master
]
project
.
team
<<
[
user2
,
:master
]
allow_any_instance_of
(
ApplicationHelper
).
to
receive
(
:collapsed_sidebar?
).
and_return
(
true
)
page
.
driver
.
set_cookie
(
'sidebar_collapsed'
,
'true'
)
sign_in
(
user
)
sign_in
(
user
)
end
end
...
...
spec/features/issues/filtered_search/visual_tokens_spec.rb
View file @
d93d1f9e
...
@@ -28,7 +28,7 @@ describe 'Visual tokens', js: true do
...
@@ -28,7 +28,7 @@ describe 'Visual tokens', js: true do
sign_in
(
user
)
sign_in
(
user
)
create
(
:issue
,
project:
project
)
create
(
:issue
,
project:
project
)
allow_any_instance_of
(
ApplicationHelper
).
to
receive
(
:collapsed_sidebar?
).
and_return
(
true
)
page
.
driver
.
set_cookie
(
'sidebar_collapsed'
,
'true'
)
visit
project_issues_path
(
project
)
visit
project_issues_path
(
project
)
end
end
...
...
spec/features/merge_requests/diff_notes_avatars_spec.rb
View file @
d93d1f9e
...
@@ -22,7 +22,7 @@ feature 'Diff note avatars', js: true do
...
@@ -22,7 +22,7 @@ feature 'Diff note avatars', js: true do
project
.
team
<<
[
user
,
:master
]
project
.
team
<<
[
user
,
:master
]
sign_in
user
sign_in
user
allow_any_instance_of
(
ApplicationHelper
).
to
receive
(
:collapsed_sidebar?
).
and_return
(
true
)
page
.
driver
.
set_cookie
(
'sidebar_collapsed'
,
'true'
)
end
end
context
'discussion tab'
do
context
'discussion tab'
do
...
...
spec/features/merge_requests/user_posts_diff_notes_spec.rb
View file @
d93d1f9e
...
@@ -6,7 +6,7 @@ feature 'Merge requests > User posts diff notes', :js do
...
@@ -6,7 +6,7 @@ feature 'Merge requests > User posts diff notes', :js do
let
(
:project
)
{
merge_request
.
source_project
}
let
(
:project
)
{
merge_request
.
source_project
}
before
do
before
do
allow_any_instance_of
(
ApplicationHelper
).
to
receive
(
:collapsed_sidebar?
).
and_return
(
true
)
page
.
driver
.
set_cookie
(
'sidebar_collapsed'
,
'true'
)
project
.
add_developer
(
user
)
project
.
add_developer
(
user
)
sign_in
(
user
)
sign_in
(
user
)
...
...
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