Add latest changes from gitlab-org/gitlab@master

4 files changed, 6 insertions, 24 deletions

diff --git a/danger/changelog/Dangerfile b/danger/changelog/Dangerfile
index 4c0ce5c44b5..7167ee5aad5 100644
--- a/danger/changelog/Dangerfile
+++ b/danger/changelog/Dangerfile
@@ -38,16 +38,17 @@ end
 def check_changelog_yaml(path)
   raw_file = File.read(path)
   yaml = YAML.safe_load(raw_file)
+  yaml_merge_request = yaml["merge_request"].to_s
 
   fail "`title` should be set, in #{helper.html_link(path)}! #{SEE_DOC}" if yaml["title"].nil?
   fail "`type` should be set, in #{helper.html_link(path)}! #{SEE_DOC}" if yaml["type"].nil?
 
   return if helper.security_mr?
-  return if helper.mr_iid.to_s.empty?
+  return if helper.mr_iid.empty?
 
   cherry_pick_against_stable_branch = helper.cherry_pick_mr? && helper.stable_branch?
 
-  if yaml["merge_request"].nil?
+  if yaml_merge_request.empty?
     mr_line = raw_file.lines.find_index("merge_request:\n")
 
     if mr_line
@@ -55,7 +56,7 @@ def check_changelog_yaml(path)
     else
       message "Consider setting `merge_request` to #{helper.mr_iid} in #{helper.html_link(path)}. #{SEE_DOC}"
     end
-  elsif yaml["merge_request"] != helper.mr_iid && !cherry_pick_against_stable_branch
+  elsif yaml_merge_request != helper.mr_iid && !cherry_pick_against_stable_branch
     fail "Merge request ID was not set to #{helper.mr_iid}! #{SEE_DOC}"
   end
 rescue Psych::Exception
diff --git a/danger/changes_size/Dangerfile b/danger/changes_size/Dangerfile
deleted file mode 100644
index 52e6cb65d04..00000000000
--- a/danger/changes_size/Dangerfile
+++ /dev/null
@@ -1,19 +0,0 @@
-# frozen_string_literal: true
-
-# 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/.git' '--work-tree=/builds/gitlab-org/gitlab' 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') }
-# locale_files_updated.each do |locale_file_updated|
-#   git_stats = git.info_for_file(locale_file_updated)
-#   message "Git stats for #{locale_file_updated}: #{git_stats[:insertions]} insertions, #{git_stats[:deletions]} insertions"
-# end
-
-if git.lines_of_code > 2_000
-  warn "This merge request is definitely too big (#{git.lines_of_code} lines changed), please split it into multiple merge requests."
-elsif git.lines_of_code > 500
-  warn "This merge request is quite big (#{git.lines_of_code} lines changed), please consider splitting it into multiple merge requests."
-end
diff --git a/danger/database/Dangerfile b/danger/database/Dangerfile
index af4d6ed513d..cd56ea8dd22 100644
--- a/danger/database/Dangerfile
+++ b/danger/database/Dangerfile
@@ -55,7 +55,7 @@ if gitlab.mr_labels.include?('database') || db_paths_to_review.any?
   markdown(DB_MESSAGE)
   markdown(DB_FILES_MESSAGE + helper.markdown_list(db_paths_to_review)) if db_paths_to_review.any?
 
-  unless helper.has_database_scoped_labels?(gitlab.mr_labels)
+  unless helper.has_database_scoped_labels?
     gitlab.api.update_merge_request(gitlab.mr_json['project_id'],
                                     gitlab.mr_json['iid'],
                                     add_labels: 'database::review pending')
diff --git a/danger/feature_flag/Dangerfile b/danger/feature_flag/Dangerfile
index d14dd97380f..88ce6393b64 100644
--- a/danger/feature_flag/Dangerfile
+++ b/danger/feature_flag/Dangerfile
@@ -13,7 +13,7 @@ group: "%<group>s"
 SUGGEST_COMMENT
 
 def check_feature_flag_yaml(feature_flag)
-  mr_group_label = helper.group_label(gitlab.mr_labels)
+  mr_group_label = helper.group_label
 
   if feature_flag.group.nil?
     message_for_feature_flag_missing_group!(feature_flag: feature_flag, mr_group_label: mr_group_label)