From aa2b78d016c5e53a41e23aabf97f07678f7f3066 Mon Sep 17 00:00:00 2001
From: mathmerized <mathmerized@gmail.com>
Date: Tue, 17 Apr 2018 15:42:17 -0400
Subject: [PATCH] remove git hook gem not necessary and add master branch back
 into .travis.yml

---
 .travis.yml | 3 ++-
 Gemfile     | 8 --------
 2 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 65425a0f6..736fbe8fa 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,7 +3,8 @@ rvm:
 - 2.2.2
 branches:
   only:
-  - /quarter\d*/
+    - master
+    - /quarter\d*/
 env:
 - TEST_SUITE=rspec
 - TEST_SUITE=cucumber
diff --git a/Gemfile b/Gemfile
index 55bf0e21c..9343786ff 100644
--- a/Gemfile
+++ b/Gemfile
@@ -18,11 +18,3 @@ gem "capybara", '2.6.2' # lock gem for old capybara behavior on hidden element x
 gem 'ckeditor'
 gem 'rack-test'
 gem 'sass-rails'
-
-# This gem allows us to share githooks. Githooks in the .hooks folder can be checked
-# in, and when "bundle install" is run this gem automatically creates symlinks into
-# your local .git/hooks. If you have pre-existing hooks in .git/hooks, it will move
-# them to .git/hooks/old and you can move them back at your leisure. Any hooks
-# checked in to .hooks will be shared among the team. If you need to re-generate
-# the symlinks,you can use 'bundle exec git-hookshot'
-gem "git-hookshot", github: "brandonweiss/git-hookshot"