summaryrefslogtreecommitdiff
path: root/danger
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2019-09-17 14:16:34 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2019-09-17 14:16:34 +0000
commit4ab54c2233e91f60a80e5b6fa2181e6899fdcc3e (patch)
tree2b256ff8dfe63dafe7f42b0d995f9e74fd1dc48b /danger
parentbd860c22f6a4b9473cbddd34a53eead8235a7ea1 (diff)
downloadgitlab-ce-4ab54c2233e91f60a80e5b6fa2181e6899fdcc3e.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'danger')
-rw-r--r--danger/changelog/Dangerfile6
-rw-r--r--danger/only_documentation/Dangerfile24
2 files changed, 6 insertions, 24 deletions
diff --git a/danger/changelog/Dangerfile b/danger/changelog/Dangerfile
index 2d1ca64a9e8..f83dc556964 100644
--- a/danger/changelog/Dangerfile
+++ b/danger/changelog/Dangerfile
@@ -12,6 +12,12 @@ You can create one with:
bin/changelog -m %<mr_iid>s "%<mr_title>s"
```
+If you want to create a changelog entry for GitLab EE, run the following instead:
+
+```
+bin/changelog --ee -m %<mr_iid>s "%<mr_title>s"
+```
+
Note: Merge requests with %<labels>s do not trigger this check.
MSG
diff --git a/danger/only_documentation/Dangerfile b/danger/only_documentation/Dangerfile
deleted file mode 100644
index ce7ede26d9a..00000000000
--- a/danger/only_documentation/Dangerfile
+++ /dev/null
@@ -1,24 +0,0 @@
-# rubocop:disable Style/SignalException
-# frozen_string_literal: true
-
-has_only_docs_changes = helper.all_changed_files.all? { |file| file.start_with?('doc/', '.gitlab/ci/docs.gitlab-ci.yml', '.markdownlint.json') || file.end_with?('.md') }
-is_docs_only_branch = gitlab.branch_for_head =~ /(^docs[\/-].*|.*-docs$)/
-
-if is_docs_only_branch && !has_only_docs_changes
- fail "It seems like your branch name has a `docs` prefix or suffix. "\
- "The CI won't run the full pipeline, but you also have changed non-docs files. "\
- "Please recreate this MR with a new branch name."
-end
-
-if has_only_docs_changes && !is_docs_only_branch
- markdown(<<~MARKDOWN)
-
- ## Documentation only changes
-
- Hey! Seems your merge request contains only docs changes.
- Tired of waiting 2 hours for the pipeline to finish?
- Next time, prepend `docs-` to [your branch name](https://docs.gitlab.com/ee/development/documentation/#branch-naming)
- and the pipeline will finish before you say GitLab (x300)!
-
- MARKDOWN
-end