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
f9a212e8
Commit
f9a212e8
authored
Sep 22, 2017
by
Phil Hughes
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Stop breadcrumbs changing container when in side-by-side diff
Closes #37641
parent
17251d04
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
29 additions
and
1 deletion
+29
-1
app/assets/javascripts/merge_request_tabs.js
app/assets/javascripts/merge_request_tabs.js
+1
-1
changelogs/unreleased/mr-side-by-side-breadcrumbs-container.yml
...logs/unreleased/mr-side-by-side-breadcrumbs-container.yml
+5
-0
spec/javascripts/merge_request_tabs_spec.js
spec/javascripts/merge_request_tabs_spec.js
+23
-0
No files found.
app/assets/javascripts/merge_request_tabs.js
View file @
f9a212e8
...
@@ -352,7 +352,7 @@ import {
...
@@ -352,7 +352,7 @@ import {
}
}
expandViewContainer
()
{
expandViewContainer
()
{
const
$wrapper
=
$
(
'
.content-wrapper .container-fluid
'
);
const
$wrapper
=
$
(
'
.content-wrapper .container-fluid
'
)
.
not
(
'
.breadcrumbs
'
)
;
if
(
this
.
fixedLayoutPref
===
null
)
{
if
(
this
.
fixedLayoutPref
===
null
)
{
this
.
fixedLayoutPref
=
$wrapper
.
hasClass
(
'
container-limited
'
);
this
.
fixedLayoutPref
=
$wrapper
.
hasClass
(
'
container-limited
'
);
}
}
...
...
changelogs/unreleased/mr-side-by-side-breadcrumbs-container.yml
0 → 100644
View file @
f9a212e8
---
title
:
Fixed breadcrumbs container expanding in side-by-side diff view
merge_request
:
author
:
type
:
fixed
spec/javascripts/merge_request_tabs_spec.js
View file @
f9a212e8
...
@@ -416,5 +416,28 @@ import 'vendor/jquery.scrollTo';
...
@@ -416,5 +416,28 @@ import 'vendor/jquery.scrollTo';
});
});
});
});
});
});
describe
(
'
expandViewContainer
'
,
function
()
{
beforeEach
(()
=>
{
$
(
'
body
'
).
append
(
'
<div class="content-wrapper"><div class="container-fluid container-limited"></div></div>
'
);
});
afterEach
(()
=>
{
$
(
'
.content-wrapper
'
).
remove
();
});
it
(
'
removes container-limited from containers
'
,
function
()
{
this
.
class
.
expandViewContainer
();
expect
(
$
(
'
.content-wrapper
'
)).
not
.
toContainElement
(
'
.container-limited
'
);
});
it
(
'
does remove container-limited from breadcrumbs
'
,
function
()
{
$
(
'
.container-limited
'
).
addClass
(
'
breadcrumbs
'
);
this
.
class
.
expandViewContainer
();
expect
(
$
(
'
.content-wrapper
'
)).
toContainElement
(
'
.container-limited
'
);
});
});
});
});
}).
call
(
window
);
}).
call
(
window
);
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