summaryrefslogtreecommitdiff
path: root/tooling
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-03-18 15:09:45 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-03-18 15:09:45 +0000
commitaaf59610548d9b0fd01acfd50e831cbe519ecba2 (patch)
treeb6505abedcd965ebae5118b504b185b63129dc4c /tooling
parent1363ca12f1f07c634647cf55c4c16b7401098673 (diff)
downloadgitlab-ce-aaf59610548d9b0fd01acfd50e831cbe519ecba2.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'tooling')
-rw-r--r--tooling/overcommit/Gemfile (renamed from tooling/overcommit/gems.rb)2
-rw-r--r--tooling/overcommit/Gemfile.lock (renamed from tooling/overcommit/gems.locked)0
2 files changed, 1 insertions, 1 deletions
diff --git a/tooling/overcommit/gems.rb b/tooling/overcommit/Gemfile
index c563a23275a..5525662e43e 100644
--- a/tooling/overcommit/gems.rb
+++ b/tooling/overcommit/Gemfile
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-# Make sure to run `bundle install --gemfile=tooling/overcommit/gems.rb` when you update this file.
+# Make sure to run `make` (in this directory) when you update this file.
source 'https://rubygems.org'
gem 'overcommit'
diff --git a/tooling/overcommit/gems.locked b/tooling/overcommit/Gemfile.lock
index 15b80426c03..15b80426c03 100644
--- a/tooling/overcommit/gems.locked
+++ b/tooling/overcommit/Gemfile.lock