summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorAsh McKenzie <amckenzie@gitlab.com>2019-09-06 07:14:30 +0000
committerAsh McKenzie <amckenzie@gitlab.com>2019-09-06 07:14:30 +0000
commitf34e4545ec20953267ee187227116756562c6e8a (patch)
tree32326de09418e404ac74b2b05398bd5449ba8b6c /lib
parent351d72cbed57c5b117e6b2239dffabcedbc45046 (diff)
downloadgitlab-ce-f34e4545ec20953267ee187227116756562c6e8a.tar.gz
Revert "Merge branch '66596-allow-danger-to-be-run-locally' into 'master'"revert-351d72cb
This reverts merge request !32196
Diffstat (limited to 'lib')
-rw-r--r--lib/gitlab/danger/helper.rb6
-rw-r--r--lib/gitlab_danger.rb54
-rw-r--r--lib/tasks/gitlab_danger.rake17
3 files changed, 1 insertions, 76 deletions
diff --git a/lib/gitlab/danger/helper.rb b/lib/gitlab/danger/helper.rb
index 702c73e8e4d..17ad07bfc0c 100644
--- a/lib/gitlab/danger/helper.rb
+++ b/lib/gitlab/danger/helper.rb
@@ -38,12 +38,8 @@ module Gitlab
ENV['CI_PROJECT_NAME'] == 'gitlab-ee' || File.exist?('../../CHANGELOG-EE.md')
end
- def gitlab_helper
- gitlab if respond_to?(:gitlab)
- end
-
def release_automation?
- gitlab_helper&.mr_author == RELEASE_TOOLS_BOT
+ gitlab.mr_author == RELEASE_TOOLS_BOT
end
def project_name
diff --git a/lib/gitlab_danger.rb b/lib/gitlab_danger.rb
deleted file mode 100644
index b4768a9546d..00000000000
--- a/lib/gitlab_danger.rb
+++ /dev/null
@@ -1,54 +0,0 @@
-# frozen_string_literal: true
-
-class GitlabDanger
- LOCAL_RULES ||= %w[
- changes_size
- gemfile
- documentation
- frozen_string
- duplicate_yarn_dependencies
- prettier
- eslint
- database
- ].freeze
-
- CI_ONLY_RULES ||= %w[
- metadata
- changelog
- specs
- commit_messages
- roulette
- single_codebase
- gitlab_ui_wg
- ce_ee_vue_templates
- only_documentation
- ].freeze
-
- MESSAGE_PREFIX = '==>'.freeze
-
- attr_reader :gitlab_danger_helper
-
- def initialize(gitlab_danger_helper)
- @gitlab_danger_helper = gitlab_danger_helper
- end
-
- def self.local_warning_message
- "#{MESSAGE_PREFIX} Only the following Danger rules can be run locally: #{LOCAL_RULES.join(', ')}"
- end
-
- def self.success_message
- "#{MESSAGE_PREFIX} No Danger rule violations!"
- end
-
- def rule_names
- ci? ? LOCAL_RULES | CI_ONLY_RULES : LOCAL_RULES
- end
-
- def html_link(str)
- self.ci? ? gitlab_danger_helper.html_link(str) : str
- end
-
- def ci?
- !gitlab_danger_helper.nil?
- end
-end
diff --git a/lib/tasks/gitlab_danger.rake b/lib/tasks/gitlab_danger.rake
deleted file mode 100644
index c2f5843a9a5..00000000000
--- a/lib/tasks/gitlab_danger.rake
+++ /dev/null
@@ -1,17 +0,0 @@
-desc 'Run local Danger rules'
-task :danger_local do
- require 'gitlab_danger'
- require_relative '../../lib/gitlab/popen'
-
- puts("#{GitlabDanger.local_warning_message}\n")
-
- # _status will _always_ be 0, regardless of failure or success :(
- output, _status = Gitlab::Popen.popen(%w{danger dry_run})
-
- if output.empty?
- puts(GitlabDanger.success_message)
- else
- puts(output)
- exit(1)
- end
-end