Commit 4fc184f2 authored by Lin Jen-Shin's avatar Lin Jen-Shin

Merge branch 'acunskis-danger-fix' into 'master'

Fix locally incompatible Dangerfile

See merge request gitlab-org/gitlab!66136
parents 966f2b39 a8136fc9
# frozen_string_literal: true
# rubocop:disable Style/SignalException
DATA_WAREHOUSE_LABELS = [
"Data Warehouse::Impact Check",
......@@ -15,11 +14,6 @@ Notification to the Data Team about changes to the db/structure.sql file, add la
MSG
db_schema_updated = !git.modified_files.grep(%r{\Adb/structure\.sql}).empty?
no_data_warehouse_labels = (gitlab.mr_labels & DATA_WAREHOUSE_LABELS).empty?
if db_schema_updated && no_data_warehouse_labels
markdown(CHANGED_SCHEMA_MESSAGE)
end
markdown(CHANGED_SCHEMA_MESSAGE) if db_schema_updated && no_data_warehouse_labels
......@@ -221,7 +221,7 @@ RSpec.describe Tooling::Danger::ProjectHelper do
describe '.local_warning_message' do
it 'returns an informational message with rules that can run' do
expect(described_class.local_warning_message).to eq('==> Only the following Danger rules can be run locally: changelog, database, datateam, documentation, duplicate_yarn_dependencies, eslint, gitaly, karma, pajamas, pipeline, prettier, product_intelligence, utility_css')
expect(described_class.local_warning_message).to eq('==> Only the following Danger rules can be run locally: changelog, database, documentation, duplicate_yarn_dependencies, eslint, gitaly, karma, pajamas, pipeline, prettier, product_intelligence, utility_css')
end
end
......
......@@ -6,7 +6,6 @@ module Tooling
LOCAL_RULES ||= %w[
changelog
database
datateam
documentation
duplicate_yarn_dependencies
eslint
......@@ -22,6 +21,7 @@ module Tooling
CI_ONLY_RULES ||= %w[
ce_ee_vue_templates
ci_templates
datateam
metadata
feature_flag
roulette
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment