Closed tlxo closed 5 years ago
tlxo
commented
5 years ago I'm not sure why Travis builds failed, the changes I made should not have been that drastic. Also, I noticed we are running a build against PHP version 5.6. Surely that's is not necessary anymore?
ottok
commented
5 years ago Oh yeah, Travis-CI fails. Sorry, but I don't have time to debug this right now:
tlxo
commented
5 years ago Travis fails because of the deprecated rspec tests. Removing the tests seems to open another can of worms so my suggested way ahead is that 1) I merge this PR and 2) somebody else removes the culprit. Sound like a plan, @ottok?
ottok
commented
5 years ago @tlxo As said in person a few days ago, sure, go ahead and remove rspec/ruby stuff.
ottok
commented
5 years ago I have now removed the rspec lines myself on the master branch. Please run git fetch --all; git rebase -i master and rebase on master. Also consider slimming this one-file change to something less than 19 commits.
tlxo
commented
5 years ago @j-falk wanna use your new powers with git rebase -i master and combine those commits?
ottok
commented
5 years ago Please rebase on master. Currently this is way behind master branch:
johan@fix-template-content$ gitk --all & # see what you are doing
johan@fix-template-content$ git fetch --all # sync latest master from Github
johan@fix-template-content$ git rebase -i master
johan@fix-template-content$ git push -f
To avoid a situation where a fresh installation from this template is a mix of several languages, I have modified the template to include content only in English and to work with the English locale by default. I have also changed all the references for "WP-palvelu" to "Seravo" and added links to currently relevant documentation.