From: michaelbirnstiehl Date: Tue, 10 Nov 2020 23:04:28 +0000 (-0600) Subject: SONAR-14018 Create Bitbucket ALM integration page X-Git-Tag: 8.6.0.39681~90 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=38f2eb1dd00ad5c1d938164c3586d82d4c7e2339;p=sonarqube.git SONAR-14018 Create Bitbucket ALM integration page --- diff --git a/server/sonar-docs/src/images/add-bitbucket-project.png b/server/sonar-docs/src/images/add-bitbucket-project.png new file mode 100644 index 00000000000..67ad29a2174 Binary files /dev/null and b/server/sonar-docs/src/images/add-bitbucket-project.png differ diff --git a/server/sonar-docs/src/pages/analysis/bitbucket-integration.md b/server/sonar-docs/src/pages/analysis/bitbucket-integration.md index a9f5f0c9f65..46c2d87c025 100644 --- a/server/sonar-docs/src/pages/analysis/bitbucket-integration.md +++ b/server/sonar-docs/src/pages/analysis/bitbucket-integration.md @@ -13,7 +13,11 @@ Once you've set up your integration, you'll be able to: - Integration with Bitbucket Server requires at least Bitbucket Server version 5.15. ## Importing your Bitbucket repositories into SonarQube +<<<<<<< HEAD To import your Bitbucket Server projects into SonarQube, you need to first set your global SonarQube settings. Navigate to **Administration > Configuration > General Settings > ALM Integrations**, select the **Bitbucket** tab, and specify the following settings: +======= +To import your Bitbucket Server projects into SonarQube, first you need to set your global SonarQube settings. Navigate to **Administration > Configuration > General Settings > ALM Integrations**, select the **Bitbucket** tab, and specify the following settings: +>>>>>>> cefea0d718f... SONAR-14018 Create Bitbucket ALM integration page - **Configuration Name** (Enterprise and Data Center Edition only) – The name used to identify your Bitbucket Server configuration at the project level. Use something succinct and easily recognizable. - **Bitbucket Server URL** – your instances URL. For example, `https://bitbucket-server.your-company.com`. @@ -43,4 +47,8 @@ From here, set your: ### Advanced pull request decoration configuration -@include pages/includes/advanced-pr \ No newline at end of file +<<<<<<< HEAD +@include pages/includes/advanced-pr +======= +@include pages/includes/advanced-pr-decor-section +>>>>>>> cefea0d718f... SONAR-14018 Create Bitbucket ALM integration page