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.

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

Fix the warning appearing in the admin section when mail_smtpmode is not configured #12401

Merged
merged 3 commits into from Nov 19, 2018

Conversation

@pachulo
Copy link
Contributor

@pachulo pachulo commented Nov 11, 2018

Closes #11107

The bug is preventing the snap stable channel to jump to 14:

So if this is OK it should be backported to 14.

@kyrofa
Copy link
Member

@kyrofa kyrofa commented Nov 11, 2018

Thanks for doing this, @pachulo. Would you mind also adding a test for this to tests/Settings/Controller/CheckSetupControllerTest.php?

@pachulo
Copy link
Contributor Author

@pachulo pachulo commented Nov 11, 2018

Honestly, I'm not really sure how to that...any tips or examples?
By the way, shouldn't be sufficient with what was implemented here? 6a0c54d#diff-685bc48aa08f64600f193f0584663365

@kyrofa
Copy link
Member

@kyrofa kyrofa commented Nov 14, 2018

Honestly, I'm not really sure how to that...any tips or examples?
By the way, shouldn't be sufficient with what was implemented here? [...]

No, that's just mocking stuff out, it'll pass regardless of the change done here. Sadly, the heavy mocks and private implementation make this hard to test; I suspect the best we can achieve is what I just pushed (hope you don't mind).

@kyrofa
Copy link
Member

@kyrofa kyrofa commented Nov 14, 2018

By the way, looks like CI wants you to sign off on your commits:

Some commits were not signed off!
Missing signatures on:

Signed-off-by: Kyle Fazzari <kyrofa@ubuntu.com>
@fishscene
Copy link

@fishscene fishscene commented Nov 17, 2018

I'm a bit new to Github terminology, but does adding this to the Nextcloud 15 milestone mean we won't be seeing this for Nextcloud 14.x?

@kesselb
Copy link
Contributor

@kesselb kesselb commented Nov 17, 2018

Depends. Every new feature/bugfix is developed for the next release (15 right now). Sometimes bugfixes are "backported" for older version.

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
Copy link
Member

@MorrisJobke MorrisJobke left a comment

Tested and works 👍

Copy link
Contributor

@kesselb kesselb left a comment

👍

@MorrisJobke MorrisJobke merged commit 5af6289 into nextcloud:master Nov 19, 2018
2 of 3 checks passed
2 of 3 checks passed
continuous-integration/drone/pr the build failed
Details
@dco
DCO DCO
Details
@fixupbot
fixupbot No fixup commits found. The commit history is clean
Details
@welcome
Copy link

@welcome welcome bot commented Nov 19, 2018

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!

@MorrisJobke
Copy link
Member

@MorrisJobke MorrisJobke commented Nov 19, 2018

This was introduced to 14.0.2: 0dd4a3e

Let's back port this one here.

@MorrisJobke
Copy link
Member

@MorrisJobke MorrisJobke commented Nov 19, 2018

Backport is in #12529

@pachulo pachulo deleted the pachulo:fix/11107/fix-php-mail-warning branch Nov 21, 2018
@MorrisJobke MorrisJobke mentioned this pull request Nov 22, 2018
7 of 7 tasks complete
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

6 participants