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

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

Merged
merged 3 commits into from
Nov 19, 2018
Merged

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

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 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 commented Nov 11, 2018 •
edited
Loading

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 commented Nov 14, 2018 •
edited
Loading

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 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:

@kyrofa
Verify that isPhpMailerUsed uses config as expected
9561a7a 
Signed-off-by: Kyle Fazzari <kyrofa@ubuntu.com>
@skjnldsv skjnldsv added bug 3. to review Waiting for reviews labels Nov 16, 2018
@skjnldsv skjnldsv added this to the Nextcloud 15 milestone Nov 16, 2018
@fishscene
Copy link

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

@MorrisJobke
Use the proper default values
8e4f0f9 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
MorrisJobke
MorrisJobke approved these changes Nov 19, 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.

Tested and works 👍

kesselb
kesselb approved these changes Nov 19, 2018
View reviewed changes
Copy link
Contributor

@kesselb kesselb left a comment

Choose a reason for hiding this comment

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

👍

@skjnldsv skjnldsv added 4. to release Ready to be released and/or waiting for tests to finish and removed 3. to review Waiting for reviews labels Nov 19, 2018
@MorrisJobke MorrisJobke merged commit 5af6289 into nextcloud:master Nov 19, 2018
@welcome
Copy link

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

This was introduced to 14.0.2: 0dd4a3e

Let's back port this one here.

@MorrisJobke MorrisJobke mentioned this pull request Nov 19, 2018
Merged
@MorrisJobke
Copy link
Member

Backport is in #12529

@pachulo pachulo deleted the fix/11107/fix-php-mail-warning branch November 21, 2018 21:15
@MorrisJobke MorrisJobke mentioned this pull request Nov 22, 2018
Merged
7 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@MorrisJobke MorrisJobke MorrisJobke approved these changes

@kesselb kesselb kesselb approved these changes

@rullzer rullzer Awaiting requested review from rullzer

@nickvergessen nickvergessen Awaiting requested review from nickvergessen

@tobiasKaminsky tobiasKaminsky Awaiting requested review from tobiasKaminsky

@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
Projects
None yet
Milestone
Nextcloud 15
Development

Successfully merging this pull request may close these issues.
6 participants
@pachulo @kyrofa @fishscene @kesselb @MorrisJobke @skjnldsv