Merge 009bd6e into 9170151

target · Oct 8, 2018 · 74f7404 · 74f7404
2 parents 9170151 + 009bd6e
commit 74f7404
Show file tree

Hide file tree

Showing 19 changed files with 423 additions and 185 deletions.
diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md
@@ -56,8 +56,8 @@ go build . && ./flottbot
 DEBU[0000] Registering bot...
 DEBU[0000] Bot 'flottbot' registered!
 DEBU[0000] Searching for rules directory...
-DEBU[0000] Fetching all YAML files...
-DEBU[0000] Reading and parsing YAML files...
+DEBU[0000] Fetching all rule files...
+DEBU[0000] Reading and parsing rule files...
 DEBU[0000] Successfully created rules
 DEBU[0000] Registering flottbot to Slack...
 DEBU[0000] Found channels!

diff --git a/.gitignore b/.gitignore
@@ -58,6 +58,8 @@ Temporary Items
 debug
 flottbot
 !flottbot/
+config/
 
 ### Git ###
 vendor
+_vendor*
diff --git a/.travis.yml b/.travis.yml
@@ -5,6 +5,7 @@ before_install:
   - go get github.com/mattn/goveralls
   - go get github.com/fzipp/gocyclo
   - go get github.com/golang/dep/cmd/dep
+install: true
 before_script:
   - echo $TRAVIS_COMMIT
   - echo $TRAVIS_TAG

diff --git a/Gopkg.lock b/Gopkg.lock