Dominic.sauer has uploaded a new change for review.
https://gerrit.wikimedia.org/r/204248
Change subject: Merge branch 'master' of
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikidataQuality
......................................................................
Merge branch 'master' of
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikidataQuality
Conflicts:
constraint-report/specials/SpecialConstraintReport.php
Change-Id: I095a1dfcbda7a735d0c803a314617aa1203033b0
---
M constraint-report/specials/SpecialConstraintReport.php
1 file changed, 2 insertions(+), 5 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikidataQuality
refs/changes/48/204248/1
diff --git a/constraint-report/specials/SpecialConstraintReport.php
b/constraint-report/specials/SpecialConstraintReport.php
old mode 100644
new mode 100755
index 0be5202..997cbea
--- a/constraint-report/specials/SpecialConstraintReport.php
+++ b/constraint-report/specials/SpecialConstraintReport.php
@@ -100,11 +100,8 @@
$constraintChecker = new ConstraintChecker( $this->entityLookup
);
$results = $constraintChecker->execute( $entity );
-<<<<<<< HEAD (ffb01e add qqx as language and add some matchers)
- #$this->saveResultsInViolationsTable( $results );
-=======
+
$this->saveResultsInViolationsTable( $entity, $results );
->>>>>>> BRANCH (9a0d1d modify CheckResultTranslator and save results in
violationTa)
return $results;
}
@@ -301,4 +298,4 @@
$violationStore = new ViolationStore();
$violationStore->insertViolation( $violations );
}
-}
+}
\ No newline at end of file
--
To view, visit https://gerrit.wikimedia.org/r/204248
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I095a1dfcbda7a735d0c803a314617aa1203033b0
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikidataQuality
Gerrit-Branch: master
Gerrit-Owner: Dominic.sauer <dominic.sa...@yahoo.de>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
