Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-07-12

ee780c71 · GitLab Bot · 6cfbb8c7 · d2c5ac61 · ee780c71 · ee780c71
Commit ee780c71 authored Jul 12, 2018 by GitLab Bot
Showing with 244 additions and 1 deletion

danger/changelog/Dangerfile danger/changelog/Dangerfile +1 -1

spec/javascripts/sidebar/components/time_tracking/time_tracker_spec.js ...pts/sidebar/components/time_tracking/time_tracker_spec.js +243 -0

No files found.
--- a/danger/changelog/Dangerfile
+++ b/danger/changelog/Dangerfile
@@ -59,7 +59,7 @@ end

 if changelog_needed
  if changelog_found
-    check_changelog(path)
+    check_changelog(changelog_found)
  else
    warn format(MISSING_CHANGELOG_MESSAGE, mr_iid: gitlab.mr_json["iid"], labels: presented_no_changelog_labels)
  end

--- a/spec/javascripts/issuable_time_tracker_spec.js
+++ b/spec/javascripts/issuable_time_tracker_spec.js