Skip to content

Restore innocent code from IE purge - #30452

Merged
artonge merged 1 commit into
masterfrom
fix/missing_showGridView
Jan 3, 2022
Merged

artonge merged 1 commit into
masterfrom
fix/missing_showGridView

Conversation

@artonge

@artonge artonge commented Dec 30, 2021 •

Copy link
Copy Markdown
Collaborator

Some code was wrongly removed during IE purge, this PR restores it.

PR where the code was removed: code https://github.com/nextcloud/server/pull/29966/files#diff-792c35877ef47f0038761f64e662a3e778e0a6ace6ca8a8dd048e510520cd826L315

Usage of$showGridView in the same file: https://github.com/nextcloud/server/blob/master/core/src/OC/dialogs.js#L1032

@artonge artonge self-assigned this Dec 30, 2021
@artonge
artonge requested a review from skjnldsv December 30, 2021 16:20
@artonge artonge added 3. to review Waiting for reviews bug labels Dec 30, 2021
@artonge
artonge requested review from a team, PVince81 and szaimen and removed request for a team December 30, 2021 16:20
@artonge artonge changed the title Restore inocent code from IE purge Restore innocent code from IE purge Dec 30, 2021
@artonge
artonge force-pushed the fix/missing_showGridView branch from 004fd5d to 33692c1 Compare December 30, 2021 16:22

@szaimen szaimen left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lgtm

@szaimen

szaimen commented Jan 2, 2022

Copy link
Copy Markdown
Contributor

/compile amend /

@nextcloud-command
nextcloud-command force-pushed the fix/missing_showGridView branch from 33692c1 to d6337d8 Compare January 2, 2022 11:40
@szaimen

szaimen commented Jan 2, 2022

Copy link
Copy Markdown
Contributor

@artonge please rebase :)

@artonge

artonge commented Jan 3, 2022

Copy link
Copy Markdown
Collaborator Author

/rebase

@artonge
artonge force-pushed the fix/missing_showGridView branch from d6337d8 to 2a0b464 Compare January 3, 2022 09:47
@artonge
artonge force-pushed the fix/missing_showGridView branch from 2a0b464 to e7026c0 Compare January 3, 2022 09:50
@szaimen szaimen added 4. to release Ready to be released and/or waiting for tests to finish and removed 3. to review Waiting for reviews labels Jan 3, 2022
@artonge

artonge commented Jan 3, 2022

Copy link
Copy Markdown
Collaborator Author

CI failure is unrelated

@artonge
artonge merged commit 5ae544b into master Jan 3, 2022
@artonge
artonge deleted the fix/missing_showGridView branch January 3, 2022 10:58

@skjnldsv skjnldsv left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

My bad, nice catch @artonge !!

Pytal added a commit that referenced this pull request May 27, 2022
Removed in #29966 and partially restored in #30452

Signed-off-by: Christopher Ng <[email protected]>
@Pytal Pytal mentioned this pull request May 27, 2022
14 tasks done
Pytal added a commit that referenced this pull request Jun 9, 2022
Removed in #29966 and partially restored in #30452

Signed-off-by: Christopher Ng <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

4. to release Ready to be released and/or waiting for tests to finish bug

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants