Skip to content

Conversation

oliverklee
Copy link
Contributor

The unit tests still do not pass completely as they cannot connect to any
DB on Travis yet. This will be part of a separate PR.

(And unit tests should not connect to a real database.)

@oliverklee oliverklee mentioned this pull request Feb 3, 2017
48 tasks
@michield
Copy link
Member

michield commented Feb 3, 2017

Can you redo this one? It doesn't merge cleanly currently.

The unit tests still do not pass completely as they cannot connect to any
DB on Travis yet. This will be part of a separate PR.

(And unit tests should not connect to a real database.)
@oliverklee
Copy link
Contributor Author

I've rebased, resolved the conflicts, and repushed.

@oliverklee
Copy link
Contributor Author

@michield When merging, I propose using the "squash and merge" option instead of "create a merge commit". This will help keep the history clean. Thanks!

@michield michield merged commit c5f20e3 into phpList:master Feb 3, 2017
@michield
Copy link
Member

michield commented Feb 3, 2017

ok, will do

@oliverklee oliverklee deleted the bugfix/unit-tests branch February 3, 2017 22:22
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants