summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndre Arko <andre@arko.net>2018-09-18 20:05:48 -0700
committerAndre Arko <andre@arko.net>2018-09-18 20:05:48 -0700
commit7856ce7d6d491e596fbe9e0c62dc80d5a89a5fd2 (patch)
treea696af2f35544c39699e6994942f1621f0ef9b93
parent4e215b74197581de3b11cf3e2948d604da7ca2d6 (diff)
downloadbundler-7856ce7d6d491e596fbe9e0c62dc80d5a89a5fd2.tar.gz
configure bors instead of homu
-rw-r--r--.github/bors.toml1
-rw-r--r--.travis.yml3
2 files changed, 3 insertions, 1 deletions
diff --git a/.github/bors.toml b/.github/bors.toml
new file mode 100644
index 0000000000..b5d43bdc13
--- /dev/null
+++ b/.github/bors.toml
@@ -0,0 +1 @@
+committer = { name = "Bundlerbot", email = "bot@bundler.io" }
diff --git a/.travis.yml b/.travis.yml
index 95b959aea1..9cd9f873cc 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -9,7 +9,8 @@ before_script:
branches:
only:
- master
- - auto
+ - staging
+ - trying
- /.+-dev$/
- /.+-stable$/