Merge pull request #1189 from RasaHQ/docs_reorg

build versions from master base branch and don't whitelist docs_reorg…
RasaHQ · Jun 27, 2018 · 78c24ce · 78c24ce
2 parents 7a37ff8 + 0bebd84
commit 78c24ce
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -56,7 +56,7 @@ jobs:
     - git config --global user.name "Travis CI"
     - git remote set-url --push origin "git@github.com:$TRAVIS_REPO_SLUG"
     - export ${!TRAVIS*}
-    - sphinx-versioning push -r docs_reorg docs newdocs . -- -b dirhtml  -A html_theme=rasabaster
+    - sphinx-versioning push docs newdocs . -- -b dirhtml  -A html_theme=rasabaster
   - stage: deploy
     install: skip
     script: skip

diff --git a/docs/conf.py b/docs/conf.py
@@ -325,7 +325,7 @@
 scv_show_banner = True
 scv_banner_greatest_tag = True
 scv_sort = ('semver',)
-scv_whitelist_branches = ('docs_reorg','master', 'latest')
+scv_whitelist_branches = ('master', 'latest')
 #scv_whitelist_tags = ('None',)
 scv_grm_exclude = ('README.md', '.gitignore', '.nojekyll', 'CNAME')
 scv_whitelist_tags = (re.compile(r'^[123456789]+\.[0-9]+\.\d+$'),