Merge branch 'ce-to-ee-2018-07-12' into 'master'

CE upstream - 2018-07-12 09:24 UTC

See merge request gitlab-org/gitlab-ee!6476

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