From 80f61b4035607d7cd87de993b8f5e996bde3481f Mon Sep 17 00:00:00 2001
From: GitLab Bot <gitlab-bot@gitlab.com>
Date: Wed, 18 Sep 2019 14:02:45 +0000
Subject: Add latest changes from gitlab-org/gitlab@master

---
 danger/changes_size/Dangerfile  | 2 +-
 danger/database/Dangerfile      | 2 +-
 danger/frozen_string/Dangerfile | 2 +-
 danger/roulette/Dangerfile      | 4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'danger')

diff --git a/danger/changes_size/Dangerfile b/danger/changes_size/Dangerfile
index 8251d0d5cbf..941afeeba64 100644
--- a/danger/changes_size/Dangerfile
+++ b/danger/changes_size/Dangerfile
@@ -1,7 +1,7 @@
 # FIXME: git.info_for_file raises the following error
 # /usr/local/bundle/gems/git-1.4.0/lib/git/lib.rb:956:in `command':  (Danger::DSLError)
 # [!] Invalid `Dangerfile` file:
-# [!] Invalid `Dangerfile` file: git '--git-dir=/builds/gitlab-org/gitlab-ce/.git' '--work-tree=/builds/gitlab-org/gitlab-ce' cat-file '-t' ''  2>&1:fatal: Not a valid object name
+# [!] Invalid `Dangerfile` file: git '--git-dir=/builds/gitlab-org/gitlab-foss/.git' '--work-tree=/builds/gitlab-org/gitlab-foss' cat-file '-t' ''  2>&1:fatal: Not a valid object name
 # This seems to be the same as https://github.com/danger/danger/issues/535.
 
 # locale_files_updated = git.modified_files.select { |path| path.start_with?('locale') }
diff --git a/danger/database/Dangerfile b/danger/database/Dangerfile
index 5cdad09db6e..fc6c5130fdc 100644
--- a/danger/database/Dangerfile
+++ b/danger/database/Dangerfile
@@ -20,7 +20,7 @@ changes are reviewed, take the following steps:
 
 1. Ensure the merge request has ~database and ~"database::review pending" labels.
    If the merge request modifies database files, Danger will do this for you.
-1. Use the [Database changes checklist](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/.gitlab/merge_request_templates/Database%20changes.md)
+1. Use the [Database changes checklist](https://gitlab.com/gitlab-org/gitlab-foss/blob/master/.gitlab/merge_request_templates/Database%20changes.md)
    template or add the appropriate items to the MR description.
 1. Assign and mention the database reviewer suggested by Reviewer Roulette.
 MSG
diff --git a/danger/frozen_string/Dangerfile b/danger/frozen_string/Dangerfile
index 8d3ac3dee68..7c4c4f2b17c 100644
--- a/danger/frozen_string/Dangerfile
+++ b/danger/frozen_string/Dangerfile
@@ -14,7 +14,7 @@ files_to_fix = get_files_with_no_magic_comment(git.added_files)
 
 if files_to_fix.any?
   warn 'This merge request adds files that do not enforce frozen string literal. ' \
-    'See https://gitlab.com/gitlab-org/gitlab-ce/issues/47424 for more information.'
+    'See https://gitlab.com/gitlab-org/gitlab-foss/issues/47424 for more information.'
 
   if GitlabDanger.new(helper.gitlab_helper).ci?
     markdown(<<~MARKDOWN)
diff --git a/danger/roulette/Dangerfile b/danger/roulette/Dangerfile
index 19a5076778c..42fc3831c14 100644
--- a/danger/roulette/Dangerfile
+++ b/danger/roulette/Dangerfile
@@ -27,7 +27,7 @@ UNKNOWN_FILES_MESSAGE = <<MARKDOWN
 
 These files couldn't be categorised, so Danger was unable to suggest a reviewer.
 Please consider creating a merge request to
-[add support](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/lib/gitlab/danger/helper.rb)
+[add support](https://gitlab.com/gitlab-org/gitlab-foss/blob/master/lib/gitlab/danger/helper.rb)
 for them.
 MARKDOWN
 
@@ -46,7 +46,7 @@ def spin_for_category(team, project, category, branch_name)
     end
 
   # TODO: take CODEOWNERS into account?
-  # https://gitlab.com/gitlab-org/gitlab-ce/issues/57653
+  # https://gitlab.com/gitlab-org/gitlab-foss/issues/57653
 
   # Make traintainers have triple the chance to be picked as a reviewer
   reviewer = roulette.spin_for_person(reviewers + traintainers + traintainers, random: random)
-- 
cgit v1.2.1