Skip to content

[stable13] allow local delivery of schedule message while prohibiting FreeBusy requests #11982

Merged
rullzer merged 1 commit intostable13from
bugfix-stable13/noid/forbid_freebusy_but_allow_local_delivery
Oct 23, 2018
Merged

[stable13] allow local delivery of schedule message while prohibiting FreeBusy requests #11982
rullzer merged 1 commit intostable13from
bugfix-stable13/noid/forbid_freebusy_but_allow_local_delivery

Conversation

@georgehrke
Copy link
Member

@georgehrke georgehrke commented Oct 22, 2018

Backport of #11822

@georgehrke georgehrke added the 3. to review Waiting for reviews label Oct 22, 2018
@georgehrke georgehrke added this to the Nextcloud 13.0.8 milestone Oct 22, 2018
rullzer
rullzer approved these changes Oct 23, 2018
View reviewed changes
Copy link
Member

@rullzer rullzer left a comment

Choose a reason for hiding this comment

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

Seems to do the trick

@georgehrke
Copy link
Member Author

georgehrke commented Oct 23, 2018

Related CI issues, fixing ...

@georgehrke
move disableFreeBusy check from User principal backend to Scheduling …
aa94064 
…Outbox collection. This allows to keep local delivery of scheduling messages while prohibiting FreeBusy requests

Signed-off-by: Georg Ehrke <developer@georgehrke.com>
@georgehrke georgehrke force-pushed the bugfix-stable13/noid/forbid_freebusy_but_allow_local_delivery branch from 0a21e47 to aa94064 Compare October 23, 2018 08:08
@georgehrke
Copy link
Member Author

georgehrke commented Oct 23, 2018

Fixed CI issues as in remove string typehinting for PHP5 compatibility

MorrisJobke
MorrisJobke approved these changes Oct 23, 2018
View reviewed changes
Copy link
Member

@MorrisJobke MorrisJobke left a comment

Choose a reason for hiding this comment

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

🐘

@MorrisJobke
Copy link
Member

MorrisJobke commented Oct 23, 2018 

There was 1 failure:

1) Test\User\DatabaseTest::testSearch
Failed asserting that 3 is identical to 2.

/drone/src/github.com/nextcloud/server/tests/lib/User/Backend.php:112

@georgehrke
Copy link
Member Author

georgehrke commented Oct 23, 2018

@MorrisJobke not sure how that failure is related. I didn’t touch anything even remotely close to the user backends

@rullzer
Copy link
Member

rullzer commented Oct 23, 2018

Most likely isn;t, It is some timing issue somewhere. I restarted CI to double check.

@rullzer
Copy link
Member

rullzer commented Oct 23, 2018

yep: https://drone.nextcloud.com/nextcloud/server/11772

@rullzer rullzer merged commit c5b0efe into stable13 Oct 23, 2018
@rullzer rullzer deleted the bugfix-stable13/noid/forbid_freebusy_but_allow_local_delivery branch October 23, 2018 19:15
@MorrisJobke MorrisJobke mentioned this pull request Nov 13, 2018
Merged
@MorrisJobke MorrisJobke mentioned this pull request Nov 22, 2018
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

@MorrisJobke MorrisJobke MorrisJobke approved these changes

Assignees

No one assigned

Labels

3. to review Waiting for reviews

Projects

None yet

Milestone

Nextcloud 13.0.8

Development

Successfully merging this pull request may close these issues.

3 participants

@georgehrke @MorrisJobke @rullzer