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
959385be
Commit
959385be
authored
Sep 01, 2020
by
Thomas Randolph
Committed by
Phil Hughes
Sep 01, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove `autoExpandCollapsedDiffs` feature flag
parent
1e0ff62a
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
7 additions
and
27 deletions
+7
-27
app/assets/javascripts/diffs/components/diff_file.vue
app/assets/javascripts/diffs/components/diff_file.vue
+2
-6
app/controllers/projects/merge_requests_controller.rb
app/controllers/projects/merge_requests_controller.rb
+0
-1
changelogs/unreleased/defect-expand-all-files-does-nothing.yml
...elogs/unreleased/defect-expand-all-files-does-nothing.yml
+5
-0
spec/frontend/diffs/components/diff_file_spec.js
spec/frontend/diffs/components/diff_file_spec.js
+0
-20
No files found.
app/assets/javascripts/diffs/components/diff_file.vue
View file @
959385be
...
...
@@ -94,11 +94,7 @@ export default {
},
'
file.file_hash
'
:
{
handler
:
function
watchFileHash
()
{
if
(
this
.
glFeatures
.
autoExpandCollapsedDiffs
&&
this
.
viewDiffsFileByFile
&&
this
.
file
.
viewer
.
collapsed
)
{
if
(
this
.
viewDiffsFileByFile
&&
this
.
file
.
viewer
.
collapsed
)
{
this
.
isCollapsed
=
false
;
this
.
handleLoadCollapsedDiff
();
}
else
{
...
...
@@ -108,7 +104,7 @@ export default {
immediate
:
true
,
},
'
file.viewer.collapsed
'
:
function
setIsCollapsed
(
newVal
)
{
if
(
!
this
.
viewDiffsFileByFile
&&
!
this
.
glFeatures
.
autoExpandCollapsedDiffs
)
{
if
(
!
this
.
viewDiffsFileByFile
)
{
this
.
isCollapsed
=
newVal
;
}
},
...
...
app/controllers/projects/merge_requests_controller.rb
View file @
959385be
...
...
@@ -34,7 +34,6 @@ class Projects::MergeRequestsController < Projects::MergeRequests::ApplicationCo
push_frontend_feature_flag
(
:multiline_comments
,
@project
,
default_enabled:
true
)
push_frontend_feature_flag
(
:file_identifier_hash
)
push_frontend_feature_flag
(
:batch_suggestions
,
@project
,
default_enabled:
true
)
push_frontend_feature_flag
(
:auto_expand_collapsed_diffs
,
@project
,
default_enabled:
true
)
push_frontend_feature_flag
(
:approvals_commented_by
,
@project
,
default_enabled:
true
)
push_frontend_feature_flag
(
:hide_jump_to_next_unresolved_in_threads
,
default_enabled:
true
)
push_frontend_feature_flag
(
:merge_request_widget_graphql
,
@project
)
...
...
changelogs/unreleased/defect-expand-all-files-does-nothing.yml
0 → 100644
View file @
959385be
---
title
:
Fix issue causing 'Expand All' button to not work in MR diffs view (Remove `autoExpandCollapsedDiffs` feature flag)
merge_request
:
40960
author
:
type
:
fixed
spec/frontend/diffs/components/diff_file_spec.js
View file @
959385be
...
...
@@ -128,26 +128,6 @@ describe('DiffFile', () => {
});
});
it
(
'
should auto-expand collapsed files when viewDiffsFileByFile is true
'
,
done
=>
{
vm
.
$destroy
();
window
.
gon
=
{
features
:
{
autoExpandCollapsedDiffs
:
true
},
};
vm
=
createComponentWithStore
(
Vue
.
extend
(
DiffFileComponent
),
createStore
(),
{
file
:
JSON
.
parse
(
JSON
.
stringify
(
diffFileMockDataUnreadable
)),
canCurrentUserFork
:
false
,
viewDiffsFileByFile
:
true
,
}).
$mount
();
vm
.
$nextTick
(()
=>
{
expect
(
vm
.
$el
.
innerText
).
not
.
toContain
(
'
This diff is collapsed
'
);
window
.
gon
=
{};
done
();
});
});
it
(
'
should be collapsed for renamed files
'
,
done
=>
{
vm
.
renderIt
=
true
;
vm
.
isCollapsed
=
false
;
...
...
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