Revert "Merge branch '118442-restyle-changes-header-and-file-tree' into 'master'"
What does this MR do?
This MR reverts !22364 (merged) which introduced a number of regressions in the Web IDE:
Screenshots
Description | Screenshot on f0bb99d0 |
---|---|
|
![]() |
|
![]() |
|
![]() |
|
![]() |
MR UX enhancements are reverted. | ![]() |
Merge request reports
Activity
changed milestone to %12.8
3 Warnings ⚠ This merge request changed files with disabled eslint rules. Please consider fixing them. ⚠ Please add a throughput label to this merge request. ⚠ The title of this merge request is longer than 72 characters and would violate our commit message rules when using the Squash on Merge feature. Please consider adjusting the title, or rebase the commits manually and don’t use Squash on Merge. Disabled eslint rules
The following files have disabled
eslint
rules. Please consider fixing them:app/assets/javascripts/diffs/components/compare_versions.vue
Run the following command for more details
node_modules/.bin/eslint --report-unused-disable-directives --no-inline-config \ 'app/assets/javascripts/diffs/components/compare_versions.vue'
Reviewer roulette
Changes that require review have been detected! A merge request is normally reviewed by both a reviewer and a maintainer in its primary category (e.g. frontend or backend), and by a maintainer in all other categories.
To spread load more evenly across eligible reviewers, Danger has randomly picked a candidate for each review slot. Feel free to override this selection if you think someone else would be better-suited, or the chosen person is unavailable.
Once you've decided who will review this merge request, mention them as you normally would! Danger does not (yet?) automatically notify them for you.
Category Reviewer Maintainer frontend Denys Mishunov ( @mishunov
)Phil Hughes ( @iamphill
)test Quality for spec/features/*
Tomislav Nikić ( @tmslvnkc
)No maintainer available Generated by
🚫 DangerEdited by 🤖 GitLab Bot 🤖added 66 commits
-
d6bf5fcb...b1772d19 - 65 commits from branch
master
- ce193b40 - Revert "Merge branch '118442-restyle-changes-header-and-file-tree' into 'master'"
-
d6bf5fcb...b1772d19 - 65 commits from branch
added 1 commit
- 72b9a791 - Revert "Merge branch '118442-restyle-changes-header-and-file-tree' into 'master'"
- Resolved by Paul Slaughter
note: The only difference between this revert MR and the original one are some minor
gitlab.pot
git diff $(git merge-base 5b9bdbb0392fff066456c423e25d4596ebd8b13a 5b9bdbb0392fff066456c423e25d4596ebd8b13a~1)..5b9bdbb0392fff066456c423e25d4596ebd8b13a --stat app/assets/javascripts/diffs/components/app.vue | 2 +- app/assets/javascripts/diffs/components/compare_versions.vue | 12 ++++-------- app/assets/javascripts/diffs/components/diff_file_header.vue | 16 +++++++++++++++- app/assets/javascripts/diffs/components/diff_stats.vue | 23 ++++++++++++++--------- app/assets/javascripts/diffs/components/tree_list.vue | 9 ++------- app/assets/javascripts/vue_shared/components/changed_file_icon.vue | 11 ++++++++--- app/assets/javascripts/vue_shared/components/file_row.vue | 11 +++++------ app/assets/stylesheets/pages/diff.scss | 15 ++++++--------- app/assets/stylesheets/pages/merge_requests.scss | 4 ++-- changelogs/unreleased/118442-restyle-changes-header-and-file-tree.yml | 5 +++++ locale/gitlab.pot | 17 ++++++++++------- spec/features/merge_request/user_sees_versions_spec.rb | 26 +++++++++++--------------- spec/frontend/diffs/components/compare_versions_spec.js | 3 +-- spec/frontend/diffs/components/diff_stats_spec.js | 18 +++++------------- spec/frontend/vue_shared/components/changed_file_icon_spec.js | 6 +++--- spec/javascripts/ide/components/repo_tab_spec.js | 4 ++-- 16 files changed, 94 insertions(+), 88 deletions(-) git diff $(git merge-base revert-22364 origin/master)..revert-22364 --stat app/assets/javascripts/diffs/components/app.vue | 2 +- app/assets/javascripts/diffs/components/compare_versions.vue | 12 ++++++++---- app/assets/javascripts/diffs/components/diff_file_header.vue | 16 +--------------- app/assets/javascripts/diffs/components/diff_stats.vue | 23 +++++++++-------------- app/assets/javascripts/diffs/components/tree_list.vue | 9 +++++++-- app/assets/javascripts/vue_shared/components/changed_file_icon.vue | 11 +++-------- app/assets/javascripts/vue_shared/components/file_row.vue | 11 ++++++----- app/assets/stylesheets/pages/diff.scss | 15 +++++++++------ app/assets/stylesheets/pages/merge_requests.scss | 4 ++-- changelogs/unreleased/118442-restyle-changes-header-and-file-tree.yml | 5 ----- locale/gitlab.pot | 9 ++------- spec/features/merge_request/user_sees_versions_spec.rb | 26 +++++++++++++++----------- spec/frontend/diffs/components/compare_versions_spec.js | 3 ++- spec/frontend/diffs/components/diff_stats_spec.js | 18 +++++++++++++----- spec/frontend/vue_shared/components/changed_file_icon_spec.js | 6 +++--- spec/javascripts/ide/components/repo_tab_spec.js | 4 ++-- 16 files changed, 83 insertions(+), 91 deletions(-)ggVG
Edited by Paul Slaughter
added 1 commit
- f0bb99d0 - Revert "Merge branch '118442-restyle-changes-header-and-file-tree' into 'master'"
- Resolved by Mark Florian
- Resolved by Mark Florian
added Pick into auto-deploy label
@markrian could you please review and MWPS this ~P1 revert MR? Thanks!
🙇 assigned to @markrian and unassigned @pslaughter
mentioned in merge request !23435 (closed)
Thanks, @pslaughter! I really appreciated the table of changes/fixes/screenshots
😄 I've done some QA on this locally as well, and all seems good. MWPSing.
enabled an automatic merge when the pipeline for 1dac75fe succeeds
Thanks a million @markrian!
🙇 mentioned in issue #197493 (closed)
mentioned in commit 7786b3c6
@@pslaughter This merge request could not automatically be picked into
12-8-auto-deploy-20200119
for12.8.0-ee
and will need manual intervention. You can either:- Create a new MR targeting the source branch of
12-8-auto-deploy-20200119
, and assign to release managers, or - Solve the conflicts against
12-8-auto-deploy-20200119
, and reassign the Pick into auto-deploy label to this merge request.
- Create a new MR targeting the source branch of
removed Pick into auto-deploy label
mentioned in merge request !23463 (merged)
Create a new MR targeting the source branch of
12-8-auto-deploy-20200119
, and assign to release managers, orCreated 12-8-auto-deploy version of the MR !23463 (merged)
Looks like the only conflicts were with
gitlab.pot
😞 mentioned in issue #118442 (closed)
- Resolved by Paul Slaughter
@@pslaughter This merge request could not automatically be picked into
12-7-stable-ee
for12.7.1-ee
and will need manual intervention. You can either:- Create a new MR targeting the source branch of !23551 (merged), and assign to release managers, or
- Solve the conflicts against !23551 (merged), and reassign the ~"Pick into 12.7" label to this merge request.
mentioned in merge request !23551 (merged)
mentioned in issue gitlab-org/release/tasks#1179 (closed)
mentioned in merge request !23561 (merged)
mentioned in issue #198486 (closed)