Skip to content

[stable21] Fix position of search bar #28673

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
merged 1 commit into from
Sep 3, 2021
Merged

[stable21] Fix position of search bar #28673

merged 1 commit into from
Sep 3, 2021

Conversation

@backportbot-nextcloud
Copy link

@backportbot-nextcloud backportbot-nextcloud bot commented Aug 31, 2021 •
edited by szaimen
Loading

⚠️ This backport had conflicts and is incomplete ⚠️

backport of #28660

@backportbot-nextcloud backportbot-nextcloud bot added this to the Nextcloud 21.0.5 milestone Aug 31, 2021
@szaimen
Copy link
Contributor

szaimen commented Aug 31, 2021

/compile amend /

JayceeCorson1023
JayceeCorson1023 reviewed Aug 31, 2021
View reviewed changes
Copy link

@JayceeCorson1023 JayceeCorson1023 left a comment

Choose a reason for hiding this comment

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

I can't spot it but I got it

@MichaIng
Copy link
Member

MichaIng commented Sep 3, 2021

/rebase

@MichaIng
Copy link
Member

MichaIng commented Sep 3, 2021

Hmm,

GitHub doesn't think that the PR is rebaseable!

So compiled unified-search.js conflict with base but rebase is denied as long as those exist. Needs to be resolved manually it seems, removing the two files, rebasing, then compiling.

@szaimen
Copy link
Contributor

szaimen commented Sep 3, 2021

@CarlSchwan please rebase :)

@MichaIng MichaIng force-pushed the backport/28660/stable21 branch from 6ede5a1 to d55bbf1 Compare September 3, 2021 14:48
@MichaIng
Copy link
Member

MichaIng commented Sep 3, 2021

/compile amend /

@CarlSchwan @nextcloud-command
Fix position of search bar
35eca15 
Signed-off-by: Carl Schwan <carl@carlschwan.eu>
Signed-off-by: nextcloud-command <nextcloud-command@users.noreply.github.com>
@MichaIng
Copy link
Member

MichaIng commented Sep 3, 2021

Psalm failure related to #28700, which requires hence backport first.

@szaimen
Copy link
Contributor

szaimen commented Sep 3, 2021

Psalm failure unrelated

@szaimen szaimen merged commit 5df3878 into stable21 Sep 3, 2021
@szaimen szaimen deleted the backport/28660/stable21 branch September 3, 2021 16:14
@blizzz blizzz mentioned this pull request Sep 23, 2021
Merged
8 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@MichaIng MichaIng MichaIng approved these changes

@szaimen szaimen szaimen approved these changes

+1 more reviewer

@JayceeCorson1023 JayceeCorson1023 JayceeCorson1023 left review comments

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

Nextcloud 21.0.5

Development

Successfully merging this pull request may close these issues.

5 participants

@szaimen @MichaIng @JayceeCorson1023 @CarlSchwan