summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPierre GRANDIN <pgrandin@users.noreply.github.com>2015-12-21 15:48:07 -0800
committerPierre GRANDIN <pgrandin@users.noreply.github.com>2015-12-21 15:48:07 -0800
commit0d7420e06ce4d64a1a1c8a8ca35d3ae81fa8ccc5 (patch)
tree9c24ba1504b571a9ef0b3fa4db329bedd6a8c876
parent5194a9919591e65ffb8977cb8d7edeb8c4891a54 (diff)
downloadnavit-0d7420e06ce4d64a1a1c8a8ca35d3ae81fa8ccc5.tar.gz
Automatically merge to master only for the official repoR6433
Try to fix #1338: CircleCI fails pushing to master from forked repos
-rw-r--r--circle.yml1
1 files changed, 1 insertions, 0 deletions
diff --git a/circle.yml b/circle.yml
index cc0cca530..d5fbe0be8 100644
--- a/circle.yml
+++ b/circle.yml
@@ -72,6 +72,7 @@ test:
deployment:
merge_into_master:
branch: trunk
+ owner: navit-gps
commands:
- bash ci/update_version.sh push
- git push origin $CIRCLE_SHA1:refs/heads/master