archive-gh-me/docker-gitlab
1
0
Fork 0
mirror of https://github.com/sameersbn/docker-gitlab.git synced 2026-01-18 13:58:25 +00:00
Code Issues Projects Releases Wiki Activity

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

Browse Source 
functions: properly delete the bitbucket auth config when not in use
This commit is contained in:
Sameer Naik 2021-03-10 14:33:37 +05:30 committed by GitHub
commit 94496fdbac
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
assets/runtime/config/gitlabhq/gitlab.yml
View File

@ -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}}',

2
assets/runtime/functions
View File

@ -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
}