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.

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

[stable18] Fix languages empty array #20877

Merged
merged 1 commit into from
May 12, 2020
Merged

[stable18] Fix languages empty array #20877

merged 1 commit into from
May 12, 2020

Conversation

backportbot-nextcloud[bot]
Copy link

@backportbot-nextcloud backportbot-nextcloud bot commented May 8, 2020 •
edited
Loading

⚠️ This backport had conflicts and is incomplete ⚠️

backport of #20719

@backportbot-nextcloud backportbot-nextcloud bot added this to the Nextcloud 18.0.5 milestone May 8, 2020
@skjnldsv
Copy link
Member

skjnldsv commented May 8, 2020

@GretaD please check what is missing from the original pr.
There was some conflicts

@skjnldsv skjnldsv added the 2. developing Work in progress label May 9, 2020
@GretaD GretaD force-pushed the backport/20719/stable18 branch from e02b53f to a661f65 Compare May 11, 2020 10:44
@GretaD GretaD added 3. to review Waiting for reviews and removed 2. developing Work in progress labels May 11, 2020
@skjnldsv
Copy link
Member 

1) OCA\Provisioning_API\Tests\Controller\UsersControllerTest::testGetUserDataAsAdmin
136 | Error: Call to undefined method PHPUnit\Framework\MockObject\Builder\InvocationMocker::willRreturn()
137 |  
138 | /drone/src/apps/provisioning_api/tests/Controller/UsersControllerTest.php:963
139

ChristophWurst
ChristophWurst reviewed May 11, 2020
View reviewed changes
apps/provisioning_api/tests/Controller/UsersControllerTest.php Outdated
->expects($this->once())
->method('getSystemValue')
->with('force_language', 'de')
->willRreturn('de');
Copy link
Member

Choose a reason for hiding this comment

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

rrrrrrrrrrrrrrrr

Copy link
Contributor

Choose a reason for hiding this comment

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

wrong, its rr not rrrrrrrrrrrrrrrr, thats because i like Russian accent

@GretaD
Fix languages empty array
d833827 
Signed-off-by: GretaD <gretadoci@gmail.com>
@GretaD GretaD force-pushed the backport/20719/stable18 branch from a661f65 to d833827 Compare May 11, 2020 13:04
@MorrisJobke MorrisJobke added 4. to release Ready to be released and/or waiting for tests to finish and removed 3. to review Waiting for reviews labels May 11, 2020
@rullzer rullzer merged commit 3142054 into stable18 May 12, 2020
@rullzer rullzer deleted the backport/20719/stable18 branch May 12, 2020 11:41
@rullzer rullzer mentioned this pull request May 21, 2020
Merged
5 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ChristophWurst ChristophWurst ChristophWurst approved these changes

@MorrisJobke MorrisJobke MorrisJobke approved these changes

@georgehrke georgehrke georgehrke approved these changes

@blizzz blizzz Awaiting requested review from blizzz

@GretaD GretaD Awaiting requested review from GretaD

@rullzer rullzer Awaiting requested review from rullzer

@skjnldsv skjnldsv Awaiting requested review from skjnldsv

Assignees
No one assigned
Labels
4. to release Ready to be released and/or waiting for tests to finish bug feature: language l10n and translations feature: users and groups
Projects
None yet
Milestone
Nextcloud 18.0.5
Development

Successfully merging this pull request may close these issues.
6 participants
@skjnldsv @MorrisJobke @georgehrke @ChristophWurst @GretaD @rullzer