diff --git a/.overcommit.yml b/.overcommit.yml
new file mode 100644
index 0000000..8bf12d0
--- /dev/null
+++ b/.overcommit.yml
@@ -0,0 +1,32 @@
+# Use this file to configure the Overcommit hooks you wish to use. This will
+# extend the default configuration defined in:
+# https://github.com/brigade/overcommit/blob/master/config/default.yml
+#
+# At the topmost level of this YAML file is a key representing type of hook
+# being run (e.g. pre-commit, commit-msg, etc.). Within each type you can
+# customize each hook, such as whether to only run it on certain files (via
+# `include`), whether to only display output if it fails (via `quiet`), etc.
+#
+# For a complete list of hooks, see:
+# https://github.com/brigade/overcommit/tree/master/lib/overcommit/hook
+#
+# For a complete list of options that you can use to customize hooks, see:
+# https://github.com/brigade/overcommit#configuration
+#
+# Uncomment the following lines to make the configuration take effect.
+
+PreCommit:
+  Rubocop:
+    enabled: true
+    on_warn: warn # fail # Treat all warnings as failures
+
+  TrailingWhitespace:
+    exclude:
+      - '**/db/structure.sql' # Ignore trailing whitespace in generated files
+
+  PostCheckout:
+    ALL: # Special hook name that customizes all hooks of this type
+     quiet: true # Change all post-checkout hooks to only display output on failure
+
+#  IndexTags:
+#    enabled: true # Generate a tags file with `ctags` each time HEAD changes
diff --git a/Gemfile.lock b/Gemfile.lock
index f4de2ec..34748fa 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -38,7 +38,7 @@ GEM
       rack (>= 0.9.0)
     binding_of_caller (0.7.2)
       debug_inspector (>= 0.0.1)
-    brakeman (3.0.2)
+    brakeman (3.0.3)
       erubis (~> 2.6)
       fastercsv (~> 1.5)
       haml (>= 3.0, < 5.0)