Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAsh McKenzie <amckenzie@gitlab.com>2019-09-06 10:14:30 +0300
committerAsh McKenzie <amckenzie@gitlab.com>2019-09-06 10:14:30 +0300
commitf34e4545ec20953267ee187227116756562c6e8a (patch)
tree32326de09418e404ac74b2b05398bd5449ba8b6c /danger/gemfile
parent351d72cbed57c5b117e6b2239dffabcedbc45046 (diff)
Revert "Merge branch '66596-allow-danger-to-be-run-locally' into 'master'"
This reverts merge request !32196
Diffstat (limited to 'danger/gemfile')
-rw-r--r--danger/gemfile/Dangerfile19
1 files changed, 3 insertions, 16 deletions
diff --git a/danger/gemfile/Dangerfile b/danger/gemfile/Dangerfile
index 07c4c07cfe8..dfe64f79d7b 100644
--- a/danger/gemfile/Dangerfile
+++ b/danger/gemfile/Dangerfile
@@ -1,9 +1,5 @@
-GEMFILE_LOCK_NOT_UPDATED_MESSAGE_SHORT = <<~MSG.freeze
-%<gemfile>s was updated but %<gemfile_lock>s wasn't updated.
-MSG
-
-GEMFILE_LOCK_NOT_UPDATED_MESSAGE_FULL = <<~MSG.freeze
-**#{GEMFILE_LOCK_NOT_UPDATED_MESSAGE_SHORT}**
+GEMFILE_LOCK_NOT_UPDATED_MESSAGE = <<~MSG.freeze
+**%<gemfile>s was updated but %<gemfile_lock>s wasn't updated.**
Usually, when %<gemfile>s is updated, you should run
```
@@ -23,14 +19,5 @@ gemfile_modified = git.modified_files.include?("Gemfile")
gemfile_lock_modified = git.modified_files.include?("Gemfile.lock")
if gemfile_modified && !gemfile_lock_modified
- gitlab_danger = GitlabDanger.new(helper.gitlab_helper)
-
- format_str = gitlab_danger.ci? ? GEMFILE_LOCK_NOT_UPDATED_MESSAGE_FULL : GEMFILE_LOCK_NOT_UPDATED_MESSAGE_SHORT
-
- message = format(format_str,
- gemfile: gitlab_danger.html_link("Gemfile"),
- gemfile_lock: gitlab_danger.html_link("Gemfile.lock")
- )
-
- warn(message)
+ warn format(GEMFILE_LOCK_NOT_UPDATED_MESSAGE, gemfile: gitlab.html_link("Gemfile"), gemfile_lock: gitlab.html_link("Gemfile.lock"))
end