X Tutup
The Wayback Machine - https://web.archive.org/web/20220506113652/https://github.com/nextcloud/server/pull/28670
Skip to content
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.

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

[stable22] Fix position of search bar #28670

Merged
merged 1 commit into from Sep 3, 2021
Merged

[stable22] Fix position of search bar #28670

merged 1 commit into from Sep 3, 2021

Conversation

Copy link

@backportbot-nextcloud backportbot-nextcloud bot commented Aug 31, 2021

⚠️ This backport had conflicts and is incomplete ⚠️

backport of #28660

@backportbot-nextcloud backportbot-nextcloud bot added this to the Nextcloud 22.1.2 milestone Aug 31, 2021
@CarlSchwan
Copy link

@CarlSchwan CarlSchwan commented Aug 31, 2021

/compile amend /

@nextcloud nextcloud deleted a comment Aug 31, 2021
@nextcloud nextcloud deleted a comment Aug 31, 2021
@nextcloud nextcloud deleted a comment Aug 31, 2021
@nextcloud nextcloud deleted a comment Aug 31, 2021
@nextcloud nextcloud deleted a comment Aug 31, 2021
Copy link
Contributor

@szaimen szaimen left a comment

Failure unrelated

@MichaIng
Copy link

@MichaIng MichaIng commented Sep 3, 2021

/rebase

@MichaIng
Copy link

@MichaIng 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

@szaimen szaimen commented Sep 3, 2021

@CarlSchwan please rebase :)

@MichaIng
Copy link

@MichaIng MichaIng commented Sep 3, 2021

/compile amend /

Signed-off-by: Carl Schwan <carl@carlschwan.eu>
Signed-off-by: nextcloud-command <nextcloud-command@users.noreply.github.com>
@MichaIng
Copy link

@MichaIng MichaIng commented Sep 3, 2021

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

@szaimen
Copy link

@szaimen szaimen commented Sep 3, 2021

Psalm failure unrelated

@szaimen szaimen merged commit 6880498 into stable22 Sep 3, 2021
17 of 19 checks passed
@szaimen szaimen deleted the backport/28660/stable22 branch Sep 3, 2021
@blizzz blizzz mentioned this pull request Sep 23, 2021
4 tasks
@MichaIng MichaIng removed this from the Nextcloud 22.1.2 milestone Sep 24, 2021
@MichaIng MichaIng added this to the Nextcloud 22.2.0 milestone Sep 24, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants
X Tutup