Merge branch 'develop' of github.com:ndu2/gitlab-time-tracker into develop

Author: Andreas Müller

src/models/report.js

@@ -79,7 +79,10 @@ class report extends Base {
      */
     getMergeRequests() {
         let promise = this.all(`projects/${this.project.id}/merge_requests${this.params()}`);
-        promise.then(mergeRequests => this.mergeRequests = mergeRequests);
+        let excludes = this.config.get('excludeByLabels');
+        promise.then(mergeRequests => this.mergeRequests = mergeRequests.filter(mr => (
+            excludes.filter(l=>mr.labels.includes(l)).length==0 // keep all merge requests not including a exclude label
+            )));
 
         return promise;
     }
@@ -90,8 +93,11 @@ class report extends Base {
      */
     getIssues() {
         let promise = this.all(`projects/${this.project.id}/issues${this.params()}`);
-        // filter moved issues in any case
-        promise.then(issues => this.issues = issues.filter(issue => (issue.state != 'closed' || issue.moved_to_id == null)));
+        let excludes = this.config.get('excludeByLabels');
+        promise.then(issues => this.issues = issues.filter(issue => (
+            issue.moved_to_id == null && // filter moved issues in any case
+            excludes.filter(l=>issue.labels.includes(l)).length==0 // keep all issues not including a exclude label
+            )));
         return promise;
     }