Merge pull request #2318 from sameersbn/fix-8311b1

functions: properly delete the bitbucket auth config when not in use

Author: Sameer Naik

assets/runtime/config/gitlabhq/gitlab.yml

@@ -929,7 +929,7 @@ production: &base
       - { name: 'bitbucket',
           app_id: '{{OAUTH_BITBUCKET_API_KEY}}',
           app_secret: '{{OAUTH_BITBUCKET_APP_SECRET}}',
-          url: '{{OAUTH_BITBUCKET_URL}}'}
+          url: '{{OAUTH_BITBUCKET_URL}}' }
       - { name: 'gitlab',
           label: 'GitLab.com',
           app_id: '{{OAUTH_GITLAB_API_KEY}}',

assets/runtime/functions

@@ -556,7 +556,7 @@ gitlab_configure_oauth_bitbucket() {
       OAUTH_BITBUCKET_APP_SECRET \
       OAUTH_BITBUCKET_URL
   else
-    exec_as_git sed -i "/name: 'bitbucket'/,/{{OAUTH_BITBUCKET_APP_SECRET}}/d" ${GITLAB_CONFIG}
+    exec_as_git sed -i "/name: 'bitbucket'/,/{{OAUTH_BITBUCKET_URL}}/d" ${GITLAB_CONFIG}
   fi
 }