Skip to content
This repository was archived by the owner on Jan 31, 2018. It is now read-only.

1142093 pipeline#623

Merged
rehandalal merged 2 commits into
mozilla:masterfrom
willkg:1142093-pipeline
Aug 4, 2015
Merged

1142093 pipeline#623
rehandalal merged 2 commits into
mozilla:masterfrom
willkg:1142093-pipeline

Conversation

@willkg
Copy link
Copy Markdown
Member

@willkg willkg commented Jul 29, 2015

Updates @rehandalal's PR for django-pipeline and fixes some minor issues that came up in testing.

r?

rehandalal and others added 2 commits July 29, 2015 12:37
* switch to django-pipeline 1.5.2
* update all the templates
* update docs
* update travis
* introduce lockdown and more npm stuff
We were using some version from the npm-lockdown repository. This
switches to 0.0.8-dev release in npmjs. It's theorized that it's
really the 0.0.8 release and that it's just a goof that it's
labeled as 0.0.8-dev in npmjs.

Anyhow, in doing that, I updated a bunch of other stuff, too.
@willkg
Copy link
Copy Markdown
Member Author

willkg commented Aug 3, 2015

@rehandalal Can you take a look at this? Does it look ok?

@rehandalal
Copy link
Copy Markdown
Contributor

this looks good! r+

rehandalal added a commit that referenced this pull request Aug 4, 2015
@rehandalal rehandalal merged commit c1cd169 into mozilla:master Aug 4, 2015
@willkg willkg deleted the 1142093-pipeline branch August 5, 2015 14:09
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants