Skip to content

Commit

Permalink
remove git hook gem not necessary and add master branch back into .tr…
Browse files Browse the repository at this point in the history
…avis.yml
  • Loading branch information
mathmerized committed Apr 17, 2018
1 parent 5a57e23 commit aa2b78d
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 9 deletions.
3 changes: 2 additions & 1 deletion .travis.yml
Expand Up @@ -3,7 +3,8 @@ rvm:
- 2.2.2
branches:
only:
- /quarter\d*/
- master
- /quarter\d*/
env:
- TEST_SUITE=rspec
- TEST_SUITE=cucumber
Expand Down
8 changes: 0 additions & 8 deletions Gemfile
Expand Up @@ -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"

0 comments on commit aa2b78d

Please sign in to comment.