Skip to content

[stable15] Fix ocm end-point discovery discovery - #14312

Merged
MorrisJobke merged 5 commits into
stable15from
backport/14255/stable15
Feb 20, 2019
Merged

[stable15] Fix ocm end-point discovery discovery#14312
MorrisJobke merged 5 commits into
stable15from
backport/14255/stable15

Conversation

@MorrisJobke

@MorrisJobkeMorrisJobke commented Feb 20, 2019

Copy link
Copy Markdown
Member

Backport of #14255

schiessleand others added 5 commits February 20, 2019 15:41
@schiessle@MorrisJobke
adjust json to match the definition
f3f8ab1
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
@schiessle@MorrisJobke
make sure that the ocm end-point discovery /ocm-provider is not redir…
2bf2633
…ected to the index.php
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
@schiessle@MorrisJobke
add setup check for ocm-provider route
6360f1a
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
@schiessle@MorrisJobke
check ocs-provider route
319a0f2
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
@MorrisJobke
Add unit tests and provide better message
2e76bc3
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
@MorrisJobkeMorrisJobke added the 3. to review Waiting for reviews label Feb 20, 2019
@MorrisJobkeMorrisJobke added this to the Nextcloud 15.0.5 milestone Feb 20, 2019
@MorrisJobke

MorrisJobke commented Feb 20, 2019

Copy link
Copy Markdown
MemberAuthor

I tested it and it works 👍

This was referenced Feb 20, 2019
Merged
Merged
@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 Feb 20, 2019
rullzer
rullzer approved these changes Feb 20, 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.

Lets do it

@MorrisJobke
MorrisJobke merged commit 37cb480 into stable15Feb 20, 2019
@MorrisJobke
MorrisJobke deleted the backport/14255/stable15 branch February 20, 2019 15:46
@jernst

jernst commented Mar 1, 2019

Copy link
Copy Markdown
Contributor

This is labeled for 15.0.5, but still open, and it appears I'm running into it with 15.0.5: uboslinux/ubos-app-nextcloud#41

@jernstjernst mentioned this pull request Mar 1, 2019
Closed
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@rullzerrullzerrullzer approved these changes
@schiessleschiessleschiessle approved these changes
@nickvergessennickvergessenAwaiting requested review from nickvergessen
@juliusknorrjuliusknorrAwaiting requested review from juliusknorr
@kesselbkesselbAwaiting requested review from kesselb
@skjnldsvskjnldsvAwaiting requested review from skjnldsv

Assignees

No one assigned

Labels

4. to releaseReady to be released and/or waiting for tests to finish

Projects

None yet

Milestone

Nextcloud 15.0.5

Development

Successfully merging this pull request may close these issues.

4 participants

@MorrisJobke@jernst@rullzer@schiessle