Skip to content

[stable17] Add text restore after restore icon - #20408

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

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

Conversation

@backportbot-nextcloud

@backportbot-nextcloudbackportbot-nextcloudBot commented Apr 10, 2020

Copy link
Copy Markdown

⚠️ This backport had conflicts and is incomplete ⚠️

backport of #19435

@backportbot-nextcloudbackportbot-nextcloudBot added this to the Nextcloud 17.0.6 milestone Apr 10, 2020
@backportbot-nextcloudbackportbot-nextcloudBot mentioned this pull request Apr 10, 2020
Merged
@skjnldsv

skjnldsv commented Apr 10, 2020

Copy link
Copy Markdown
Member

/compile amend /

@skjnldsvskjnldsv 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>
@rullzer

rullzer commented Apr 12, 2020

Copy link
Copy Markdown
Member

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

@skjnldsv

skjnldsv commented Apr 12, 2020

Copy link
Copy Markdown
Member

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

seemed to work here, no?

@rullzer

rullzer commented Apr 13, 2020

Copy link
Copy Markdown
Member

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

@rullzerrullzer mentioned this pull request Apr 13, 2020
Merged
5 tasks
@skjnldsv

skjnldsv commented Apr 13, 2020

Copy link
Copy Markdown
Member

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

Probably needs a fix on the lock file or something

@rullzer

rullzer commented Apr 14, 2020

Copy link
Copy Markdown
Member

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

skjnldsv commented Apr 14, 2020

Copy link
Copy Markdown
Member

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

Oh, that might be 🤔

@MorrisJobke

MorrisJobke commented Apr 14, 2020

Copy link
Copy Markdown
Member

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

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

Reviewers

@rullzerrullzerrullzer approved these changes
@skjnldsvskjnldsvskjnldsv approved these changes
@GretaDGretaDAwaiting requested review from GretaD
@juliusknorrjuliusknorrAwaiting requested review from juliusknorr
@ChristophWurstChristophWurstAwaiting requested review from ChristophWurst

Assignees

No one assigned

Labels

3. to reviewWaiting for reviewsbug

Projects

None yet

Milestone

Nextcloud 17.0.6

Development

Successfully merging this pull request may close these issues.

4 participants

@skjnldsv@rullzer@MorrisJobke@GretaD