summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRémy Coutable <remy@rymai.me>2018-09-04 11:15:46 +0000
committerRémy Coutable <remy@rymai.me>2018-09-04 11:15:46 +0000
commitfcd1c94ab8b1dc35c35a4ea856926ea6fa12d936 (patch)
tree9bb357b1826e65969148b132690570b990da51fc
parent7add26e5e0e37219d9431cd3410e8767fe77e628 (diff)
parent9add8e3a66e6392e0b01b41cfa41646282014eac (diff)
downloadgitlab-ce-fcd1c94ab8b1dc35c35a4ea856926ea6fa12d936.tar.gz
Merge branch 'fix-wording-in-danger-mr-to-non-master-warning' into 'master'
Fix wording in Danger warning about MRs to non-master See merge request gitlab-org/gitlab-ce!21493
-rw-r--r--danger/metadata/Dangerfile2
1 files changed, 1 insertions, 1 deletions
diff --git a/danger/metadata/Dangerfile b/danger/metadata/Dangerfile
index 3cfaa04e01b..51fc9e6bfca 100644
--- a/danger/metadata/Dangerfile
+++ b/danger/metadata/Dangerfile
@@ -21,5 +21,5 @@ end
has_pick_into_stable_label = gitlab.mr_labels.find { |label| label.start_with?('Pick into') }
if gitlab.branch_for_base != "master" && !has_pick_into_stable_label
- warn "Most of the time, all merge requests should target `master`. Otherwise, please set the relevant `Pick into X.Y` label."
+ warn "Most of the time, merge requests should target `master`. Otherwise, please set the relevant `Pick into X.Y` label."
end