Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Sign up
Appearance settings

Link/formatting #33

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
shanbbb merged 4 commits into main from GIJ-Cloud-Viz
Jun 16, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
View file Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,13 @@ Jira admins are not able to connect Jira Cloud to self-hosted git servers when h

Jira admins will see a message similar to the one below when connecting to self-hosted git servers hosted behind a firewall or otherwise not reachable.

| |
| --- |
| **Error** |
| --- |
| ```java<br>com.bigbrassband.gitforjiracloud.appserver.apiendpoint.tasks.TaskException: com.bigbrassband.gitforjiracloud.indexer.sources.TrackedGitLabRepoException: Can not connect to GitLab server<br>at com.bigbrassband.gitforjiracloud.appserver.apiendpoint.tasks.Task.runWithMappedExceptions(Task.java:56)<br>at com.bigbrassband.gitforjiracloud.appserver.apiendpoint.ApiEndPoint.runTasks(ApiEndPoint.java:162)<br>at com.bigbrassband.gitforjiracloud.appserver.apiendpoint.ApiEndPoints.handleRequest(ApiEndPoints.java:79)<br>at com.bigbrassband.gitforjiracloud.appserver.AppServer$SuperHandler.handle(AppServer.java:219)<br>at com.bigbrassband.common.util.httpplumbing.WebServer$InternalRequestHandler.handle(WebServer.java:164)<br>at org.apache.http.protocol.HttpService.doService(HttpService.java:437)<br>at org.apache.http.protocol.HttpService.handleRequest(HttpService.java:342)<br>at com.bigbrassband.common.util.httpplumbing.Worker.run(Worker.java:41)<br>at java.util.concurrent.Executors$RunnableAdapter.call(Executors.java:511)<br>at java.util.concurrent.FutureTask.run(FutureTask.java:266)<br>at java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1149)<br>at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:624)<br>at java.lang.Thread.run(Thread.java:748)<br>Caused by: com.bigbrassband.gitforjiracloud.indexer.sources.TrackedGitLabRepoException: Can not connect to GitLab server<br>at com.bigbrassband.gitforjiracloud.indexer.sources.GitlabApiMonster.getGitlabApi(GitlabApiMonster.java:34)<br>at com.bigbrassband.gitforjiracloud.indexer.sources.GitlabRepoSource.getRepositories(GitlabRepoSource.java:47)<br>at com.bigbrassband.gitforjiracloud.appserver.apiendpoint.tasks.git.repos.PingRepoTask.pingRepoSource(PingRepoTask.java:91)<br>at com.bigbrassband.gitforjiracloud.appserver.apiendpoint.tasks.git.repos.PingRepoTask.run(PingRepoTask.java:71)<br>at com.bigbrassband.gitforjiracloud.appserver.apiendpoint.tasks.Task.runWithMappedExceptions(Task.java:36)<br>... 12 more<br>Caused by: org.gitlab.api.GitlabAPIException<br>at org.gitlab.api.http.GitlabHTTPRequestor.handleAPIError(GitlabHTTPRequestor.java:543)<br>at org.gitlab.api.http.GitlabHTTPRequestor.to(GitlabHTTPRequestor.java:201)<br>at org.gitlab.api.http.GitlabHTTPRequestor.to(GitlabHTTPRequestor.java:167)<br>at org.gitlab.api.GitlabAPI.getVersion(GitlabAPI.java:3199)<br>at org.gitlab.api.GitlabAPI.createPATAuthOnly(GitlabAPI.java:158)<br>at org.gitlab.api.GitlabAPI.create(GitlabAPI.java:145)<br>at com.bigbrassband.gitforjiracloud.indexer.sources.GitlabApiMonster.getGitlabApi(GitlabApiMonster.java:29)<br>... 16 more<br>Caused by: com.fasterxml.jackson.core.JsonParseException: Unexpected character ('<' (code 60)): expected a valid value (number, String, array, object, 'true', 'false' or 'null')<br><br>``` |

## Solution

See [Whitelist BigBrassBand Cloud](/git-integration-for-jira-cloud/allow-list-whitelist-bigbrassband-cloud/).
See [Whitelist BigBrassBand Cloud](/git-integration-for-jira-cloud/allow-list-whitelist-bigbrassband-cloud-gij-cloud).

**Contact Us**

Expand Down
16 changes: 8 additions & 8 deletions git-integration-for-jira-cloud/create-branch-gij-cloud.md
View file Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ taxonomy:

**Jira administrator notes**

* Jira users can now provide their own personal access tokens (PAT) even if they are not required/mandated by the Jira admin. See [Require Personal Access Tokens for user actions (create branch/pull request)](/git-integration-for-jira-cloud/require-personal-access-tokens-for-user-actions-create-branch-pull-request/) for instructions on how to configure this feature.
* The **View developer tools** _permission_ is required to view the Source Code panel (see more in [Issue Git Source Code Panel](/git-integration-for-jira-cloud/issue-git-source-code-panel/). Jira users must also have the **Browse Project** _permissions_ to a project associated with a repository to view.
* Jira users can now provide their own personal access tokens (PAT) even if they are not required/mandated by the Jira admin. See [Require Personal Access Tokens for user actions (create branch/pull request)](/git-integration-for-jira-cloud/require-personal-access-tokens-for-user-actions-create-branch-pull-request-gij-cloud) for instructions on how to configure this feature.
* The **View developer tools** _permission_ is required to view the Source Code panel (see more in [Issue Git Source Code Panel](/git-integration-for-jira-cloud/issue-git-source-code-panel-gij-cloud). Jira users must also have the **Browse Project** _permissions_ to a project associated with a repository to view.
* Creating branch feature can be disabled for all Jira users (regardless of permissions) in General settings


Expand All @@ -28,15 +28,15 @@ The Create branch feature offers Jira users the ability to create a git branch d
![](https://bigbrassband.atlassian.net/wiki/download/attachments/733282366/gitcloud-create-branch-dlg.png?version=1&modificationDate=1635931446719&cacheVersion=1&api=v2)


For information about creating pull/merge requests from a Jira issue - see [Create pull or merge request](/git-integration-for-jira-cloud/create-pull-or-merge-request/).
For information about creating pull/merge requests from a Jira issue - see [Create pull or merge request](/git-integration-for-jira-cloud/create-pull-or-merge-request-gij-cloud).

## **Advantages**

When creating a branch from within Jira:

* Automatically populates branch name with issue key (necessary for branch ↔ issue association) and issue summary.
* Further - default branch naming conventions can be customized to match your development workflow. For example: `${issuetype:New Issue,new,Bug Fix,bug}/${issuekey}-${summary}` generates "`bug/PRJ-123-add-more-logging`" (See General settings for more information).
* Require each Jira user to provide their Personal Access Token for creating branches. This option adds some friction to creating branches/pull requests but enabling this setting will enforce the git server user permissions as well as give better attribution for the actions. See [Require Personal Access Tokens for user actions (create branch/pull request)](/git-integration-for-jira-cloud/require-personal-access-tokens-for-user-actions-create-branch-pull-request/) for more information.
* Require each Jira user to provide their Personal Access Token for creating branches. This option adds some friction to creating branches/pull requests but enabling this setting will enforce the git server user permissions as well as give better attribution for the actions. See [Require Personal Access Tokens for user actions (create branch/pull request)](/git-integration-for-jira-cloud/require-personal-access-tokens-for-user-actions-create-branch-pull-request-gij-cloud) for more information.
* Each Jira user can set a **Default repository** for the current Jira project. (See User settings for more information).


Expand All @@ -59,15 +59,15 @@ When creating a branch from within Jira:

## **Steps to creating a git branch in Jira**

1. **Prerequisite:** Jira administrator configures a Full feature integration in the Git Integration for Jira Cloud app. See [Integration Guide](/git-integration-for-jira-cloud/Integration-Guide) for more information.
1. **Prerequisite:** Jira administrator configures a Full feature integration in the Git Integration for Jira Cloud app. See [Integration Guide](/git-integration-for-jira-cloud/integration-guide-gij-cloud) for more information.
2. To access the Create branch action - do one of the following:
1. Enable the **Git Development panel** or
2. Open the [Issue Git Source Code Panel](/git-integration-for-jira-cloud/issue-git-source-code-panel/)
2. Open the [Issue Git Source Code Panel](/git-integration-for-jira-cloud/issue-git-source-code-panel-gij-cloud)
3. Click **Create branch** in one of the panels from step 2.
4. Select git repository.
1. Optional: designate the repository to be the default selected repository for current Jira project. To configure default repositories for more than one Jira project - use the [User settings](/git-integration-for-jira-cloud/User-Settings) page.
1. Optional: designate the repository to be the default selected repository for current Jira project. To configure default repositories for more than one Jira project - use the [User settings](/git-integration-for-jira-cloud/user-settings-gij-cloud) page.
2. Use the search box to look for the specific name of the repository that will be used.
5. If a [personal access token is required](/git-integration-for-jira-cloud/require-personal-access-tokens-for-user-actions-create-branch-pull-request/) (and not yet provided) - follow on screen instructions to provide a [personal access token](/git-integration-for-jira-cloud/creating-personal-access-tokens/) with correct permissions for selected repository.
5. If a [personal access token is required](/git-integration-for-jira-cloud/require-personal-access-tokens-for-user-actions-create-branch-pull-request-gij-cloud) (and not yet provided) - follow on screen instructions to provide a [personal access token](/git-integration-for-jira-cloud/creating-personal-access-tokens-gij-cloud) with correct permissions for selected repository.
6. Select base branch.
7. Verify branch name is correct. Edit as desired. Note: the Jira issue key must remain in the branch name to create the branch ↔ Jira issue association.
8. Click **Create branch**.
Expand Down
View file Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ taxonomy:

**Jira administrator notes**

* Jira users can be required to provide their own Personal Access Token when creating a branch or pull request. See [Require Personal Access Tokens for user actions (create branch/pull request)](/git-integration-for-jira-cloud/require-personal-access-tokens-for-user-actions-create-branch-pull-request/) for instructions on how to configure this feature.
* The **View developer tools** _permission_ is required to view the Source Code panel (see more in [Issue Git Source Code Panel](/git-integration-for-jira-cloud/issue-git-source-code-panel/)). Jira users must also have the **Browse Project** _permissions_ to a project associated with a repository to view.
* Jira users can be required to provide their own Personal Access Token when creating a branch or pull request. See [Require Personal Access Tokens for user actions (create branch/pull request)](/git-integration-for-jira-cloud/require-personal-access-tokens-for-user-actions-create-branch-pull-request-gij-cloud) for instructions on how to configure this feature.
* The **View developer tools** _permission_ is required to view the Source Code panel (see more in [Issue Git Source Code Panel](/git-integration-for-jira-cloud/issue-git-source-code-panel-gij-cloud)). Jira users must also have the **Browse Project** _permissions_ to a project associated with a repository to view.
* Creating pull/merge request feature can be disabled for all Jira users (regardless of permissions) in General settings.


Expand All @@ -32,14 +32,14 @@ The **Create pull request** feature offers Jira users the ability to create a gi

![](https://bigbrassband.atlassian.net/wiki/download/thumbnails/733315235/create-pull-request.png?version=2&modificationDate=1599320965937&cacheVersion=1&api=v2&width=933&height=349)

For information about creating a branch from a Jira issue - see [Create branch](/git-integration-for-jira-cloud/Create-branch).
For information about creating a branch from a Jira issue - see [Create branch](/git-integration-for-jira-cloud/create-branch-gij-cloud).

## **Advantages**

When creating a pull request from within Jira:

* Automatically populates the pull request title with issue key (necessary for pull request ↔ issue association) and issue summary.
* Require each Jira user to provide their Personal Access Token for creating pull requests. This option adds some friction to creating pull requests/branches but enabling this setting will enforce the git server user permissions as well as give better attribution for the actions. See [Require Personal Access Tokens for user actions (create branch/pull request)](/git-integration-for-jira-cloud/require-personal-access-tokens-for-user-actions-create-branch-pull-request/) for more information.
* Require each Jira user to provide their Personal Access Token for creating pull requests. This option adds some friction to creating pull requests/branches but enabling this setting will enforce the git server user permissions as well as give better attribution for the actions. See [Require Personal Access Tokens for user actions (create branch/pull request)](/git-integration-for-jira-cloud/require-personal-access-tokens-for-user-actions-create-branch-pull-request-gij-cloud) for more information.
* Each Jira user can set a **Default repository** for the current Jira project. (See User settings for more information).


Expand All @@ -62,15 +62,15 @@ When creating a pull request from within Jira:

## **Steps to creating a git pull request in Jira**

1. **Prerequisite:** Jira administrator configures a Full feature integration in the Git Integration for Jira Cloud app. See [Integration Guide](/git-integration-for-jira-cloud/Integration-Guide) for more information.
1. **Prerequisite:** Jira administrator configures a Full feature integration in the Git Integration for Jira Cloud app. See [Integration Guide](/git-integration-for-jira-cloud/integration-guide-gij-cloud) for more information.
2. To access the Create pull request action - do one of the following:
1. Enable the **Git Development panel** or
2. Open the [Issue Git Source Code Panel](/git-integration-for-jira-cloud/issue-git-source-code-panel/)
2. Open the [Issue Git Source Code Panel](/git-integration-for-jira-cloud/issue-git-source-code-panel-gij-cloud)
3. Click **Create pull request** in one of the panels from step 2.
4. Select git repository.
1. Optional: designate the repository to be the default selected repository for current Jira project. To configure default repositories for more than one Jira project - use the **User settings** page.
2. Use the search box to look for the specific name of the repository that will be used.
5. If a [personal access token is required](/git-integration-for-jira-cloud/require-personal-access-tokens-for-user-actions-create-branch-pull-request/) (and not yet provided) - follow on screen instructions to provide a [personal access token](/git-integration-for-jira-cloud/creating-personal-access-tokens/) with correct permissions for selected repository.
5. If a [personal access token is required](/git-integration-for-jira-cloud/require-personal-access-tokens-for-user-actions-create-branch-pull-request-gij-cloud) (and not yet provided) - follow on screen instructions to provide a [personal access token](/git-integration-for-jira-cloud/creating-personal-access-tokens-gij-cloud) with correct permissions for selected repository.
6. Select source branch.
7. Select target branch.
8. Verify pull request title is correct. Edit as desired. Note: the Jira issue key must remain in the pull request name to create the pull request ↔ Jira issue association.
Expand Down
View file Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ taxonomy:
category: git-integration-for-jira-cloud

---
The Git Integration for Jira app adds two features on the Jira issue developer panel – **Create branch**, and **Create pull/merge request**. For more information on where to access them, see the [Jira Git development panel documentation](https://bigbrassband.com/git-integration-for-jira/documentation/jira-developer-panel.html).
The Git Integration for Jira app adds two features on the Jira issue developer panel – **Create branch**, and **Create pull/merge request**. For more information on where to access them, see the [Jira Git development panel documentation](/git-integration-for-jira-cloud/jira-git-integration-development-panel-gij-cloud).

Pull/merge requests are still indexed based on branch name even if the PR/MR title does not have the Jira issue key – as long as the branch name contains the Jira issue key.

Expand All @@ -25,10 +25,10 @@ Main branch for repositories within an integration can only be changed on the gi

Open a Jira issue then on the developer panel, click **Create Branch** label to create a branch for the selected repository.

For detailed information on this feature, see [Creating branches from Jira](/git-integration-for-jira-cloud/Create-branch).
For detailed information on this feature, see [Creating branches from Jira](/git-integration-for-jira-cloud/create-branch-gij-cloud).

## Creating pull/merge requests

Open a Jira issue then on the developer panel, click **Create pull/merge request** label to create a pull/merge request for the selected repository.

For detailed information on this feature, see [Creating pull/merge requests from Jira](https://bigbrassband.atlassian.net/wiki/spaces/GITCLOUD/pages/733315235).
For detailed information on this feature, see [Creating pull/merge requests from Jira](/git-integration-for-jira-cloud/creating-branches-and%20pull-merge-requests-gij-cloud)
View file Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,14 +20,12 @@ _**Optional headers:**_
* 'x-bbb-webhook-id' -- Can be any string representing the _id_ of the request to be used.


| |
| --- |
| **Usage examples:** |
| --- |
| ```java<br>curl -H 'x-bbb-webhook-type: push' -H 'content-type: application/json' -X POST -d @payload.json https://webhook/url<br>``` |
| ```java<br>curl -H 'x-bbb-webhook-type: push' -H 'x-bbb-webhook-id: id-string' -H 'content-type: application/json' -X POST -d @payload.json https://webhook/url<br>``` |

| |
| --- |
| **Payload.json** |
| --- |
| ```java<br>{<br> "origin": "repository-origin"<br>}<br>``` |

View file Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ If two-factor authentication is enabled for your GitLab account, you will need t

While instructions from GitLab works just fine, here are some specific instructions to get you up and running:

1. Login to your GitLab account then go to your profile settings (menu ![(blue star)](https://bigbrassband.atlassian.net/wiki/s/-1639011364/6452/8b4898d3c114827e64ec143b4fa79bb76a6cfa5b/_/images/icons/emoticons/star_blue.png) Profile ➜ **Preferences**).
1. Login to your GitLab account then go to your profile settings (menu Profile ➜ **Preferences**).

![](https://bigbrassband.atlassian.net/wiki/download/thumbnails/107216897/gitlab-user-profile-settings(c).png?version=2&modificationDate=1650862373604&cacheVersion=1&api=v2&width=262&height=327)
2. On the sidebar, click **Access Tokens**.
Expand Down
View file Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ Individual Jira Cloud users can enable or disable the GitKraken integration with

## Administrator settings

Jira Cloud administrators can disable or enable the GitKraken integration with Git Integration for Jira Cloud for all Jira users. All Jira Cloud users can enable the GitKraken integration separately (see [User settings](#User-settings) above).
Jira Cloud administrators can disable or enable the GitKraken integration with Git Integration for Jira Cloud for all Jira users. All Jira Cloud users can enable the GitKraken integration separately (see [User settings](/git-integration-for-jira-cloud/user-settings-gij-cloud) above).

Go to the Git Integration for Jira – **General settings** tab (sidebar).

Expand Down
Loading

AltStyle によって変換されたページ (->オリジナル) /