Skip to content

[stable17] Add text restore after restore icon#20408

Merged
rullzer merged 1 commit intostable17from
backport/19435/stable17
Apr 15, 2020
Merged

[stable17] Add text restore after restore icon#20408
rullzer merged 1 commit intostable17from
backport/19435/stable17

Conversation

@backportbot-nextcloud
Copy link

@backportbot-nextcloud backportbot-nextcloud bot commented Apr 10, 2020

⚠️ This backport had conflicts and is incomplete ⚠️

backport of #19435

@backportbot-nextcloud backportbot-nextcloud bot added this to the Nextcloud 17.0.6 milestone Apr 10, 2020
@backportbot-nextcloud backportbot-nextcloud bot mentioned this pull request Apr 10, 2020
Merged
@skjnldsv
Copy link
Member

skjnldsv commented Apr 10, 2020

/compile amend /

@skjnldsv skjnldsv requested a review from ChristophWurst April 10, 2020 09:37
@skjnldsv skjnldsv added the 3. to review Waiting for reviews label Apr 10, 2020
@GretaD @npmbuildbot
Add text restore after restore icon
fb53eb3 
Signed-off-by: GretaD <gretadoci@gmail.com>
Signed-off-by: npmbuildbot[bot] <npmbuildbot[bot]@users.noreply.github.com>
@npmbuildbot-nextcloud npmbuildbot-nextcloud bot force-pushed the backport/19435/stable17 branch from 0f1c5ce to fb53eb3 Compare April 10, 2020 09:49
@rullzer
Copy link
Member

rullzer commented Apr 12, 2020

Compile bot seems to always do boom on stable17...

@skjnldsv
Copy link
Member

skjnldsv commented Apr 12, 2020

Compile bot seems to always do boom on stable17...

seemed to work here, no?

@rullzer
Copy link
Member

rullzer commented Apr 13, 2020

Compile bot seems to always do boom on stable17...

seemed to work here, no?

CI says otherwise: https://drone.nextcloud.com/nextcloud/server/27822/2/1

@rullzer rullzer mentioned this pull request Apr 13, 2020
Merged
5 tasks
@skjnldsv
Copy link
Member

skjnldsv commented Apr 13, 2020

CI says otherwise: drone.nextcloud.com/nextcloud/server/27822/2/1

Probably needs a fix on the lock file or something

@rullzer
Copy link
Member

rullzer commented Apr 14, 2020

CI says otherwise: drone.nextcloud.com/nextcloud/server/27822/2/1

Probably needs a fix on the lock file or something

My guess is that the node used on ci here is different from the one the compilebot is using...

@skjnldsv
Copy link
Member

skjnldsv commented Apr 14, 2020

My guess is that the node used on ci here is different from the one the compilebot is using...

Oh, that might be 🤔

@MorrisJobke
Copy link
Member

MorrisJobke commented Apr 14, 2020

@skjnldsv How to test this? Is there a button in the "deleted shares" section?

@rullzer rullzer merged commit 49f8fa0 into stable17 Apr 15, 2020
@rullzer rullzer deleted the backport/19435/stable17 branch April 15, 2020 18:23
@danxuliu danxuliu mentioned this pull request Apr 27, 2020
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@rullzer rullzer rullzer approved these changes

@skjnldsv skjnldsv skjnldsv approved these changes

@GretaD GretaD Awaiting requested review from GretaD

@juliusknorr juliusknorr Awaiting requested review from juliusknorr

@ChristophWurst ChristophWurst Awaiting requested review from ChristophWurst

Assignees

No one assigned

Labels

3. to review Waiting for reviews bug

Projects

None yet

Milestone

Nextcloud 17.0.6

Development

Successfully merging this pull request may close these issues.

4 participants

@skjnldsv @rullzer @MorrisJobke @GretaD