Skip to content

Avoid replacement by user object - #14058

Merged
MorrisJobke merged 1 commit into
nextcloud:masterfrom
vpecinka:master
Mar 21, 2019
Merged

Avoid replacement by user object#14058
MorrisJobke merged 1 commit into
nextcloud:masterfrom
vpecinka:master

Conversation

@vpecinka

@vpecinkavpecinka commented Feb 6, 2019

Copy link
Copy Markdown
Contributor

Closes#13433
Signed-off-by: Vlastimil Pecinka pecinka@email.cz

@vpecinka

vpecinka commented Feb 6, 2019

Copy link
Copy Markdown
ContributorAuthor

@juliushaertl

@ChristophWurstChristophWurst added this to the Nextcloud 16 milestone Mar 1, 2019
ChristophWurst
ChristophWurst reviewed Mar 1, 2019
View reviewed changes
Comment threadconfig/config.sample.php Outdated
This was referenced Mar 4, 2019
Merged
Merged
@MorrisJobke

MorrisJobke commented Mar 20, 2019

Copy link
Copy Markdown
Member

@vpecinka Mind to check what conflicts are there?

@vpecinka

vpecinka commented Mar 21, 2019

Copy link
Copy Markdown
ContributorAuthor

@vpecinka Mind to check what conflicts are there?

Well, no problem. It seems I commited to the master branch new feature not related to the fix.. :/

rullzer
rullzer approved these changes Mar 21, 2019
View reviewed changes

@rullzerrullzer 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.

Aaah now I finally get it.

So there actually already is a user argument in the arguments for swift (yay for confusion).
But the swift object is already instantiated. So all is good.

Yeah makes sense in that case.

@vpecinka@MorrisJobke
Store user object later in the code
1c3abda
Signed-off-by: Vlastimil Pecinka <pecinka@email.cz>
@MorrisJobke

MorrisJobke commented Mar 21, 2019

Copy link
Copy Markdown
Member

I just squashed the commits into one. This is then good to go in.

MorrisJobke
MorrisJobke approved these changes Mar 21, 2019
View reviewed changes

@MorrisJobkeMorrisJobke 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.

Code makes sense 👍

@MorrisJobkeMorrisJobke added 4. to release Ready to be released and/or waiting for tests to finish and removed 3. to review Waiting for reviews labels Mar 21, 2019
@MorrisJobke

MorrisJobke commented Mar 21, 2019

Copy link
Copy Markdown
Member

/backport to stable15

@MorrisJobke

MorrisJobke commented Mar 21, 2019

Copy link
Copy Markdown
Member

/backport to stable14

@MorrisJobke
MorrisJobke merged commit 243cef1 into nextcloud:masterMar 21, 2019
@welcome

welcomeBot commented Mar 21, 2019

Copy link
Copy Markdown

Thanks for your first pull request and welcome to the community! Feel free to keep them coming! If you are looking for issues to tackle then have a look at this selection: https://github.com/nextcloud/server/issues?q=is%3Aopen+is%3Aissue+label%3A%22good+first+issue%22
Most developers hang out on IRC. So join #nextcloud-dev on Freenode for a chat!

@backportbot-nextcloudbackportbot-nextcloudBot mentioned this pull request Mar 21, 2019
Merged
@backportbot-nextcloud

backportbot-nextcloudBot commented Mar 21, 2019

Copy link
Copy Markdown

backport to stable15 in #14795

@MorrisJobkeMorrisJobke mentioned this pull request Mar 26, 2019
Merged
@MorrisJobke

MorrisJobke commented Mar 26, 2019

Copy link
Copy Markdown
Member

Backport in #14868

Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@ChristophWurstChristophWurstChristophWurst left review comments
@rullzerrullzerrullzer approved these changes
@MorrisJobkeMorrisJobkeMorrisJobke approved these changes
@icewind1991icewind1991Awaiting requested review from icewind1991

Assignees

No one assigned

Labels

4. to releaseReady to be released and/or waiting for tests to finishbugfeature: filesystem

Projects

None yet

Milestone

Nextcloud 16

Development

Successfully merging this pull request may close these issues.

5 participants

@vpecinka@MorrisJobke@rullzer@ChristophWurst@juliusknorr