Merge remote-tracking branch 'upstream/pull/5273'

[rails.git] / Dangerfile

diff --git a/Dangerfile b/Dangerfile
index 3898f680f2587b558b577e24fd01456e0d9e7982..3445f5705115a38ba83e214aab1fe33505613d4d 100644 (file)
--- a/Dangerfile
+++ b/Dangerfile
@@ -16,16 +16,16 @@ end
 
 # Report if some translation file (except en.yml) is modified
 if modified_yml_files.empty?
-  auto_label.remove("Compromised Translations")
+  auto_label.remove("Inappropriate Translations")
 else
   modified_files_str = modified_yml_files.map { |file| "`#{file}`" }.join(", ")
   warn("The following YAML files other than `en.yml` have been modified: #{modified_files_str}. Only `en.yml` is allowed to be changed. Translations are updated via Translatewiki, see CONTRIBUTING.md.")
-  auto_label.set(pr_number, "Compromised Translations", "B60205")
+  auto_label.set(pr_number, "Inappropriate Translations", "B60205")
 end
 
 # Report if there are merge-commits in PR
 if git.commits.any? { |c| c.parents.count > 1 }
-  warn("Merge commits are found in PR. Please rebase to get rid of the merge commits in this PR and read CONTRIBUTE.md.")
+  warn("Merge commits are found in PR. Please rebase to get rid of the merge commits in this PR, see CONTRIBUTING.md.")
   auto_label.set(pr_number, "Merge Commits", "D93F0B")
 else
   auto_label.remove("Merge Commits")