Merge pull request #10 from thefuntasty/skywall-patch-1

Do not show error when merging develop into master
futuredapp · Jul 11, 2019 · 93d9eae · 93d9eae
2 parents 2325918 + fc941ed
commit 93d9eae
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/Dangerfile b/Dangerfile
@@ -11,7 +11,7 @@ branch_name_pattern = /^(feature|hotfix|fix)\/([A-Z]{2,})-\d+-/
 # Convenience variables
 has_correct_prefix = github.branch_for_head.match(/^(feature|hotfix|fix|release|housekeep)\//)
 is_feature_or_fix = github.branch_for_head.match(/^(feature|hotfix|fix)\//)
-can_be_merged_to_master = github.branch_for_head.match(/^(release|hotfix)\//)
+can_be_merged_to_master = github.branch_for_head.match(/^(release|hotfix|develop)\//)
 
 branch_contains_jira_id = github.branch_for_head.match(branch_name_pattern)
 title_contains_jira_id = github.pr_title.match(pr_title_pattern)

diff --git a/thefuntasty_danger.gemspec b/thefuntasty_danger.gemspec
@@ -1,7 +1,7 @@
 
 Gem::Specification.new do |spec|
   spec.name        = "thefuntasty_danger"
-  spec.version     = "0.1.5"
+  spec.version     = "0.1.6"
   spec.authors     = ["Matěj Kašpar Jirásek"]
   spec.email       = ["[email protected]"]