Skip to content

Commit 5f37a97

Browse files
committed
Merge branch 'release/v2.7.2'
2 parents 0b05456 + edd1786 commit 5f37a97

40 files changed

+2543
-1111
lines changed

.gitignore

+16-13
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,23 @@
1+
!/spec/integration/*/log/.gitkeep
2+
!/spec/integration/*/tmp/.gitkeep
3+
*.gem
14
.DS_Store
5+
.bundle
6+
.gems
7+
.rbenv-version
8+
.ruby-*
9+
/.idea/
10+
/.rbx
11+
/.rvmrc
212
/.yardoc/*
3-
/doc/*
13+
/Gemfile.lock
414
/coverage/*
5-
/spec/debug.log
6-
/pkg/*
715
/dist
8-
/Gemfile.lock
9-
*.gem
10-
/.idea/
11-
/.rvmrc
12-
.bundle
13-
/.rbx
16+
/doc/*
17+
/pkg/*
18+
/spec/debug.log
1419
/spec/integration/*/bin/
20+
/spec/integration/*/db/test.*
1521
/spec/integration/*/log/*
16-
!/spec/integration/*/log/.gitkeep
1722
/spec/integration/*/tmp/*
18-
!/spec/integration/*/tmp/.gitkeep
19-
/spec/integration/*/db/test.*
20-
.rbenv-version
23+
.byebug_history

.overcommit.yml

+38
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
# Use this file to configure the Overcommit hooks you wish to use. This will
2+
# extend the default configuration defined in:
3+
# https://github.com/brigade/overcommit/blob/master/config/default.yml
4+
#
5+
# At the topmost level of this YAML file is a key representing type of hook
6+
# being run (e.g. pre-commit, commit-msg, etc.). Within each type you can
7+
# customize each hook, such as whether to only run it on certain files (via
8+
# `include`), whether to only display output if it fails (via `quiet`), etc.
9+
#
10+
# For a complete list of hooks, see:
11+
# https://github.com/brigade/overcommit/tree/master/lib/overcommit/hook
12+
#
13+
# For a complete list of options that you can use to customize hooks, see:
14+
# https://github.com/brigade/overcommit#configuration
15+
#
16+
# Uncomment the following lines to make the configuration take effect.
17+
18+
PreCommit:
19+
RuboCop:
20+
enabled: true
21+
on_warn: fail # Treat all warnings as failures
22+
23+
PrePush:
24+
RSpec:
25+
enabled: true
26+
on_warn: fail # Treat all warnings as failures
27+
#
28+
# TrailingWhitespace:
29+
# enabled: true
30+
# exclude:
31+
# - '**/db/structure.sql' # Ignore trailing whitespace in generated files
32+
#
33+
#PostCheckout:
34+
# ALL: # Special hook name that customizes all hooks of this type
35+
# quiet: true # Change all post-checkout hooks to only display output on failure
36+
#
37+
# IndexTags:
38+
# enabled: true # Generate a tags file with `ctags` each time HEAD changes

.rbenv-gemsets

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
.gems

.rubocop.yml

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
inherit_from: ./.rubocop_todo.yml
2+
3+
AllCops:
4+
Exclude:
5+
- 'vendor/**/*'
6+
- 'spec/fixtures/**/*'
7+
- 'tmp/**/*'

0 commit comments

Comments
 (0)