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

uncomment mysql.login inclusion #229

Merged
merged 1 commit into from
Oct 13, 2017
Merged

uncomment mysql.login inclusion #229

merged 1 commit into from
Oct 13, 2017

Conversation

kaldari
Copy link
Contributor

@kaldari kaldari commented Oct 13, 2017 •
edited
Loading

This is necessary for doibot.php to run properly. It's been manually patched on citations-dev.

@kaldari
uncomment mysql.login inclusion
f769231 
This is necessary for doibot.php to run properly.
@ms609 ms609 changed the base branch from master to release October 13, 2017 09:43
@ms609 ms609 changed the base branch from release to master October 13, 2017 09:45
@ms609 ms609 changed the base branch from master to release October 13, 2017 09:45
@ms609
Copy link
Owner

ms609 commented Oct 13, 2017

I'm merging this into the release branch, rather than master, as uncommenting the line will cause the continuous integration tests to fail. The release branch contains a couple of other relevant modifications (e.g. not including 'dummy' login details) and is intended to be the branch that is 'hosted' on WMFlabs servers. I hope that this does the job, but do let me know if not!

@ms609 ms609 merged commit c6873c3 into ms609:release Oct 13, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@kaldari @ms609