aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormichaelbirnstiehl <michael.birnstiehl@sonarsource.com>2020-11-10 17:04:28 -0600
committersonartech <sonartech@sonarsource.com>2020-11-23 20:06:20 +0000
commit38f2eb1dd00ad5c1d938164c3586d82d4c7e2339 (patch)
tree4c29015df9a73e26ebe7bfb504199b77802a4ef0
parentddcc6985dbfe524b799410937c9e48a1880f7e7a (diff)
downloadsonarqube-38f2eb1dd00ad5c1d938164c3586d82d4c7e2339.tar.gz
sonarqube-38f2eb1dd00ad5c1d938164c3586d82d4c7e2339.zip
SONAR-14018 Create Bitbucket ALM integration page
-rw-r--r--server/sonar-docs/src/images/add-bitbucket-project.pngbin0 -> 7650 bytes
-rw-r--r--server/sonar-docs/src/pages/analysis/bitbucket-integration.md10
2 files changed, 9 insertions, 1 deletions
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
--- /dev/null
+++ b/server/sonar-docs/src/images/add-bitbucket-project.png
Binary files 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