Terrrydactyl has uploaded a new change for review.
https://gerrit.wikimedia.org/r/104732
Change subject: Merged with origin.
......................................................................
Merged with origin.
Change-Id: Ie1a3b31edc6f91fca664c4fecaaed2b4fe4ba575
---
M wikimetrics/controllers/cohorts.py
1 file changed, 1 insertion(+), 5 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/analytics/wikimetrics
refs/changes/32/104732/1
diff --git a/wikimetrics/controllers/cohorts.py
b/wikimetrics/controllers/cohorts.py
index 7245fff..4addb40 100644
--- a/wikimetrics/controllers/cohorts.py
+++ b/wikimetrics/controllers/cohorts.py
@@ -169,14 +169,10 @@
url_for('cohorts_index'),
vc.cohort_id
))
-<<<<<<< HEAD (a57a67 Added user_name information for CSV output)
-
-=======
->>>>>>> BRANCH (0f12ab oops that broke it)
except Exception, e:
app.logger.exception(str(e))
flash('Server error while processing your upload', 'error')
-
+
return render_template(
'csv_upload.html',
projects=json.dumps(sorted(db.project_host_map.keys())),
--
To view, visit https://gerrit.wikimedia.org/r/104732
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie1a3b31edc6f91fca664c4fecaaed2b4fe4ba575
Gerrit-PatchSet: 1
Gerrit-Project: analytics/wikimetrics
Gerrit-Branch: master
Gerrit-Owner: Terrrydactyl <tcho...@gmail.com>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
