From e7452bc3537753103c7295456afc7c4286c16e0e Mon Sep 17 00:00:00 2001 From: charlieablett Date: Tue, 7 May 2019 11:53:42 +1200 Subject: Upgrade jira user permissions workflow docs Update screecaps to reflect jira version ~8.1 and update instructions to include Permission Schemes. --- .../img/jira_add_permission_scheme.png | Bin 0 -> 38913 bytes .../integrations/img/jira_add_user_to_group.png | Bin 24838 -> 266180 bytes .../integrations/img/jira_added_user_to_group.png | Bin 0 -> 82473 bytes .../integrations/img/jira_create_new_group.png | Bin 19127 -> 262453 bytes .../integrations/img/jira_create_new_user.png | Bin 12625 -> 173516 bytes .../project/integrations/img/jira_group_access.png | Bin 19147 -> 112706 bytes .../integrations/img/jira_user_management_link.png | Bin 23906 -> 206155 bytes .../integrations/jira_server_configuration.md | 38 +++++++++++++-------- 8 files changed, 24 insertions(+), 14 deletions(-) create mode 100644 doc/user/project/integrations/img/jira_add_permission_scheme.png create mode 100644 doc/user/project/integrations/img/jira_added_user_to_group.png diff --git a/doc/user/project/integrations/img/jira_add_permission_scheme.png b/doc/user/project/integrations/img/jira_add_permission_scheme.png new file mode 100644 index 00000000000..d527864ac56 Binary files /dev/null and b/doc/user/project/integrations/img/jira_add_permission_scheme.png differ diff --git a/doc/user/project/integrations/img/jira_add_user_to_group.png b/doc/user/project/integrations/img/jira_add_user_to_group.png index 27dac49260c..d8cf541a81e 100644 Binary files a/doc/user/project/integrations/img/jira_add_user_to_group.png and b/doc/user/project/integrations/img/jira_add_user_to_group.png differ diff --git a/doc/user/project/integrations/img/jira_added_user_to_group.png b/doc/user/project/integrations/img/jira_added_user_to_group.png new file mode 100644 index 00000000000..b3e29a65d6e Binary files /dev/null and b/doc/user/project/integrations/img/jira_added_user_to_group.png differ diff --git a/doc/user/project/integrations/img/jira_create_new_group.png b/doc/user/project/integrations/img/jira_create_new_group.png index 06c4e84fc61..84be3a94a45 100644 Binary files a/doc/user/project/integrations/img/jira_create_new_group.png and b/doc/user/project/integrations/img/jira_create_new_group.png differ diff --git a/doc/user/project/integrations/img/jira_create_new_user.png b/doc/user/project/integrations/img/jira_create_new_user.png index e9c03ed770d..8460dc98ef9 100644 Binary files a/doc/user/project/integrations/img/jira_create_new_user.png and b/doc/user/project/integrations/img/jira_create_new_user.png differ diff --git a/doc/user/project/integrations/img/jira_group_access.png b/doc/user/project/integrations/img/jira_group_access.png index 448cc55504d..58cf114bd55 100644 Binary files a/doc/user/project/integrations/img/jira_group_access.png and b/doc/user/project/integrations/img/jira_group_access.png differ diff --git a/doc/user/project/integrations/img/jira_user_management_link.png b/doc/user/project/integrations/img/jira_user_management_link.png index 5eb9d031c3e..43ef18da6c8 100644 Binary files a/doc/user/project/integrations/img/jira_user_management_link.png and b/doc/user/project/integrations/img/jira_user_management_link.png differ diff --git a/doc/user/project/integrations/jira_server_configuration.md b/doc/user/project/integrations/jira_server_configuration.md index 20036183187..7462bd2c783 100644 --- a/doc/user/project/integrations/jira_server_configuration.md +++ b/doc/user/project/integrations/jira_server_configuration.md @@ -12,7 +12,7 @@ It is important that the user `gitlab` has 'write' access to projects in Jira. We have split this stage in steps so it is easier to follow. -1. Log in to your Jira instance as an administrator and under **Administration** +1. Log in to your Jira instance as an administrator and under **Jira Administration** go to **User Management** to create a new user. ![Jira user management link](img/jira_user_management_link.png) @@ -27,27 +27,37 @@ We have split this stage in steps so it is easier to follow. ![Jira create new user](img/jira_create_new_user.png) -1. Create a `gitlab-developers` group which will have write access +1. Create a `gitlab-developers` group which will (eventually) have write access to projects in Jira. Go to the **Groups** tab and select **Create group**. ![Jira create new user](img/jira_create_new_group.png) - Give it an optional description and click **Create group**. + Give it a name and click **Create group**. - ![Jira create new group](img/jira_create_new_group_name.png) +1. Add the `gitlab` user to the `gitlab-developers` group by clicking **Edit members** + The `gitlab-developers` group should be selected on the left hand box. Under **Add members to selected group(s)**, + type in `gitlab`. -1. To give the newly-created group 'write' access, go to - **Application access > View configuration** and add the `gitlab-developers` - group to Jira Core. + ![Jira add user to group](img/jira_add_user_to_group.png) + + Click **Add selected users** and `gitlab` should appear in the middle box. It + is saved automatically. + + ![Jira added user to group](img/jira_added_user_to_group.png) + +1. To give the newly-created group 'write' access, you need to create a **Permission Scheme**. + To do this, click the gear > **Issues**. On the left hand menu, click + **Permission Schemes**. Click **Add Permission Scheme** and fill in a name + and (optional) description. + + ![Jira add new permission scheme](img/jira_add_permission_scheme.png) + +1. Once your permission scheme is created, you'll be taken back to the permissions scheme list. + Locate your new permissions scheme and click **Permissions**. Next to **Administer Projects**, + click **Edit**. In the resulting dialog box, select **Group** and select `gitlab-developers` + from the dropdown. ![Jira group access](img/jira_group_access.png) -1. Add the `gitlab` user to the `gitlab-developers` group by going to - **Users > GitLab user > Add group** and selecting the `gitlab-developers` - group from the dropdown menu. Notice that the group says _Access_, which is - intended as part of this process. - - ![Jira add user to group](img/jira_add_user_to_group.png) - The Jira configuration is complete. Write down the new Jira username and its password as they will be needed when [configuring GitLab in the next section](jira.md#configuring-gitlab). -- cgit v1.2.1