Commit ae635516 authored by Lin Jen-Shin's avatar Lin Jen-Shin

Merge branch 'rename-tooling-overcommit-gemfiles-to-legacy-names' into 'master'

Use the legacy `Gemfile`/`Gemfile.lock` names in `tooling/overcommit`

See merge request gitlab-org/gitlab!27495
parents 42b9ba1a 031ad9c3
...@@ -15,8 +15,8 @@ ...@@ -15,8 +15,8 @@
# #
# Uncomment the following lines to make the configuration take effect. # Uncomment the following lines to make the configuration take effect.
# Make sure to run `cd tooling/overcommit && make && cd -` # Make sure to run `make -C tooling/overcommit`
gemfile: 'tooling/overcommit/gems.rb' gemfile: 'tooling/overcommit/Gemfile'
PostCheckout: PostCheckout:
BundleInstall: BundleInstall:
......
...@@ -17,7 +17,7 @@ static analysis offenses before committing locally. ...@@ -17,7 +17,7 @@ static analysis offenses before committing locally.
In your GitLab source directory run: In your GitLab source directory run:
```shell ```shell
cd tooling/overcommit && make && cd - make -C tooling/overcommit
``` ```
Then before a commit is created, Overcommit will automatically check for Then before a commit is created, Overcommit will automatically check for
......
# frozen_string_literal: true # 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' source 'https://rubygems.org'
gem 'overcommit' gem 'overcommit'
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment