diff --git a/.travis.yml b/.travis.yml index 638b0c53704..caf5d019fa8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,7 +3,4 @@ sudo: false cache: bundler script: rake generate after_success: -- '[ "${TRAVIS_BRANCH}" = "master" ] && [ "${TRAVIS_PULL_REQUEST}" = "false" ] && rake deploy || false' -env: - global: - secure: RgYtd9+qY3kBrDbAqSGszBEiZIalPzSd72a0w4zyG1FX4B/xA9ilqH1mLaBbjNsuwsDIfW6D4Vupec8Uh/eBtLKAt05pdZ70WiP9TYg1QRQS9k5epaqbOvxFzIzQO4Mcz1dT0tuMJ9c0H9VXUjFJVtCG17vkPpK3qHkYW0GAxqE= +- '[ "${TRAVIS_BRANCH}" = "current" ] && [ "${TRAVIS_PULL_REQUEST}" = "false" ] && rake deploy || false' diff --git a/_deploy b/_deploy index 3633483305b..69146ecaf4d 160000 --- a/_deploy +++ b/_deploy @@ -1 +1 @@ -Subproject commit 3633483305bb092ff72024ac1b59e66f7c1aacc0 +Subproject commit 69146ecaf4d31902ab9ea0a4e6c9f3985d99e808 diff --git a/source/_includes/edit_github.html b/source/_includes/edit_github.html index 0ec614af4d4..f599869c811 100644 --- a/source/_includes/edit_github.html +++ b/source/_includes/edit_github.html @@ -1,4 +1,4 @@ {% assign url_parts = page.url | split: '/' %} {% if page.hide_github_edit != true %} -
+ {% endif %}