Milimetric has submitted this change and it was merged.
Change subject: flake fixes
......................................................................
flake fixes
Change-Id: I382f67fb89e271ea1f523ea63bd78cbd012ecce6
---
M wikimetrics/controllers/cohorts.py
1 file changed, 6 insertions(+), 6 deletions(-)
Approvals:
Milimetric: Verified; Looks good to me, approved
diff --git a/wikimetrics/controllers/cohorts.py
b/wikimetrics/controllers/cohorts.py
index c695dc4..f0659f6 100644
--- a/wikimetrics/controllers/cohorts.py
+++ b/wikimetrics/controllers/cohorts.py
@@ -70,11 +70,11 @@
db_session = db.get_session()
return (
db_session.query(Cohort)
- .join(CohortUser)
- .join(User)
- .filter(User.id == current_user.id)
- .filter(CohortUser.role.in_([CohortUserRole.OWNER,
CohortUserRole.VIEWER]))
- .filter(Cohort.enabled),
+ .join(CohortUser)
+ .join(User)
+ .filter(User.id == current_user.id)
+ .filter(CohortUser.role.in_([CohortUserRole.OWNER,
CohortUserRole.VIEWER]))
+ .filter(Cohort.enabled),
db_session
)
@@ -298,7 +298,7 @@
def get_wikiuser_by_id(id, project):
db_session = db.get_mw_session(project)
try:
- wikuser = db_session.query(MediawikiUser)\
+ wikiuser = db_session.query(MediawikiUser)\
.filter(MediawikiUser.user_id == id)\
.one()
db_session.close()
--
To view, visit https://gerrit.wikimedia.org/r/73901
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I382f67fb89e271ea1f523ea63bd78cbd012ecce6
Gerrit-PatchSet: 1
Gerrit-Project: analytics/wikimetrics
Gerrit-Branch: master
Gerrit-Owner: Milimetric <[email protected]>
Gerrit-Reviewer: Milimetric <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
