Skip to content
Snippets Groups Projects

Revert "Merge branch '118442-restyle-changes-header-and-file-tree' into 'master'"

Merged Paul Slaughter requested to merge revert-22364 into master
All threads resolved!

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
👍 Nested dropdown not showing is fixed. Screen_Shot_2020-01-21_at_10.59.37_AM
👍 Duplicate changed icons showing is fixed. Screen_Shot_2020-01-21_at_11.03.41_AM
👍 Changed icon in tab alignment is fixed. Screen_Shot_2020-01-21_at_11.02.18_AM
👍 Delete status icon persisting after discard is fixed. Screen_Shot_2020-01-21_at_11.04.37_AM
MR UX enhancements are reverted. Screen_Shot_2020-01-21_at_11.11.36_AM
Edited by Paul Slaughter

Merge request reports

Loading
Loading

Activity

Filter activity
  • Approvals
  • Assignees & reviewers
  • Comments (from bots)
  • Comments (from users)
  • Commits & branches
  • Edits
  • Labels
  • Lock status
  • Mentions
  • Merge request status
  • Tracking
  • Paul Slaughter changed milestone to %12.8

    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 🚫 Danger

    Edited by 🤖 GitLab Bot 🤖
  • Paul Slaughter added 66 commits

    added 66 commits

    • d6bf5fcb...b1772d19 - 65 commits from branch master
    • ce193b40 - Revert "Merge branch '118442-restyle-changes-header-and-file-tree' into 'master'"

    Compare with previous version

  • Paul Slaughter added 1 commit

    added 1 commit

    • 72b9a791 - Revert "Merge branch '118442-restyle-changes-header-and-file-tree' into 'master'"

    Compare with previous version

  • Paul Slaughter changed the description

    changed the description

    • Author Maintainer
      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
  • Author Maintainer

    Just going to run some QA on this to make sure no regressions are introduced in MR diffs + it fixes the Web IDE issues.

    /cc @rkuba @andr3 @phikai

  • Paul Slaughter added 1 commit

    added 1 commit

    • f0bb99d0 - Revert "Merge branch '118442-restyle-changes-header-and-file-tree' into 'master'"

    Compare with previous version

  • Paul Slaughter changed the description

    changed the description

  • Paul Slaughter
  • Paul Slaughter added 1 commit

    added 1 commit

    Compare with previous version

  • Paul Slaughter
  • Paul Slaughter added 1 deleted label

    added 1 deleted label

  • Author Maintainer

    @markrian could you please review and MWPS this ~P1 revert MR? Thanks! 🙇

  • Paul Slaughter assigned to @markrian and unassigned @pslaughter

    assigned to @markrian and unassigned @pslaughter

  • Paul Slaughter mentioned in merge request !23435 (closed)

    mentioned in merge request !23435 (closed)

  • Mark Florian approved this merge request

    approved this merge request

  • 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.

  • Mark Florian resolved all threads

    resolved all threads

  • Mark Florian enabled an automatic merge when the pipeline for 1dac75fe succeeds

    enabled an automatic merge when the pipeline for 1dac75fe succeeds

  • Author Maintainer

    Thanks a million @markrian! 🙇

  • mentioned in issue #197493 (closed)

  • merged

  • Mark Florian mentioned in commit 7786b3c6

    mentioned in commit 7786b3c6

  • @@pslaughter This merge request could not automatically be picked into 12-8-auto-deploy-20200119 for 12.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.
  • Paul Slaughter mentioned in merge request !23463 (merged)

    mentioned in merge request !23463 (merged)

  • Author Maintainer

    Create a new MR targeting the source branch of 12-8-auto-deploy-20200119, and assign to release managers, or

    Created 12-8-auto-deploy version of the MR !23463 (merged)

    Looks like the only conflicts were with gitlab.pot 😞

  • mentioned in issue #118442 (closed)

  • GitLab Release Tools Bot removed 1 deleted label

    removed 1 deleted label

  • mentioned in merge request !23551 (merged)

  • Paul Slaughter mentioned in merge request !23561 (merged)

    mentioned in merge request !23561 (merged)

  • Paul Slaughter resolved all threads

    resolved all threads

  • mentioned in issue #198486 (closed)

  • Please register or sign in to reply
    Loading