pre-commit 0.2.0 → 0.3.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (2) hide show
  1. data/lib/pre-commit/checks.rb +2 -1
  2. metadata +2 -2
@@ -56,7 +56,8 @@ class PreCommit
56
56
  checks_to_run = `git config pre-commit.checks`.chomp.split(/,\s*/).map(&:to_sym)
57
57
 
58
58
  if checks_to_run.empty?
59
- Checks.values_at(:white_space, :console_log, :debugger, :tabs, :jshint, :migrations)
59
+ Checks.values_at(:white_space, :console_log, :debugger, :tabs, :jshint,
60
+ :migrations, :merge_conflict)
60
61
  else
61
62
  Checks.values_at(*checks_to_run)
62
63
  end.compact
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: pre-commit
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.2.0
4
+ version: 0.3.0
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -9,7 +9,7 @@ authors:
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2012-07-11 00:00:00.000000000 Z
12
+ date: 2012-07-24 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: execjs