Last modified: 2013-01-25 23:17:01 UTC
We should ensure that we can collaborate with Guiders upstream so both we and they take advantage of progress on the library. I think that should involve: 1. Separating our Guiders code (i.e. the code that is in the library proper) into a separate Gerrit git repository tracking the main Guiders repo. 2. Having a GitHub repo mirror that Gerrit, so we can submit pull requests to https://github.com/jeff-optimizely/Guiders-JS 3. Actively doing those pull requests in manageable chunks so we can minimize the code that's not in upstream but should be. 4. Have GuidedTour include a git submodule of our fork/branch of Guiders. 5. Using CSS overrides of their CSS rather than modifying it (we can still do pull requests if a change should apply to all their library users). 6. Have a ResourceLoader module that includes the required resources from our version of Guiders.
The repo has been created. I'm now taking Terry's pull request (https://gerrit.wikimedia.org/r/gitweb?p=mediawiki/extensions/GuidedTour/guiders.git;a=tree;h=refs/heads/master;hb=refs/heads/master), filtering it (rewriting history) to remove any Wordpress-specific stuff. Then I will force-push that to Gerrit. I don't think we want to review Terry's 14 commits. I will then do a pull request to change GuidedTour to use our guiders as a submodule. This should be the first one merged, since it will significantly change the structure. The others will have to be rebased on top.
Sorry, that is the new repo. Terry's pull request is at https://github.com/jeff-optimizely/Guiders-JS/pull/77
guiders is up. As you can see from the log (https://gerrit.wikimedia.org/r/gitweb?p=mediawiki/extensions/GuidedTour/guiders.git;a=log;h=refs/heads/master), it's a particular point in Guiders' history, plus Terry's relevant changes squashed into one commit. I will submit a gerrit to change GuidedTour to use this submodule next.
The submodule change is https://gerrit.wikimedia.org/r/#/c/39496/ . The GitHub mirror is at https://github.com/wikimedia/mediawiki-extensions-GuidedTour-guiders
Merged. We have also starting submitting pull requests and issues in some cases (https://github.com/jeff-optimizely/Guiders-JS/pulls). This will be ongoing.
