From e9158ab0aa21ea9dfeb1286ad7ba127c8dda4295 Mon Sep 17 00:00:00 2001 From: Marcel Amirault Date: Mon, 2 Sep 2019 12:59:25 +0900 Subject: Rename images in procted branches/tags docs Name images after release version and not milestone --- .../img/protected_branches_devs_can_push_v12_1.png | Bin 0 -> 11941 bytes .../img/protected_branches_devs_can_push_v12_3.png | Bin 11941 -> 0 bytes doc/user/project/img/protected_branches_list_v12_1.png | Bin 0 -> 8774 bytes doc/user/project/img/protected_branches_list_v12_3.png | Bin 8774 -> 0 bytes doc/user/project/img/protected_branches_page_v12_1.png | Bin 0 -> 9445 bytes doc/user/project/img/protected_branches_page_v12_3.png | Bin 9445 -> 0 bytes doc/user/project/img/protected_tags_list_v12_1.png | Bin 0 -> 4395 bytes doc/user/project/img/protected_tags_list_v12_3.png | Bin 4395 -> 0 bytes doc/user/project/img/protected_tags_page_v12_1.png | Bin 0 -> 10431 bytes doc/user/project/img/protected_tags_page_v12_3.png | Bin 10431 -> 0 bytes .../img/protected_tags_permissions_dropdown_v12_1.png | Bin 0 -> 4517 bytes .../img/protected_tags_permissions_dropdown_v12_3.png | Bin 4517 -> 0 bytes doc/user/project/protected_branches.md | 6 +++--- doc/user/project/protected_tags.md | 6 +++--- 14 files changed, 6 insertions(+), 6 deletions(-) create mode 100644 doc/user/project/img/protected_branches_devs_can_push_v12_1.png delete mode 100644 doc/user/project/img/protected_branches_devs_can_push_v12_3.png create mode 100644 doc/user/project/img/protected_branches_list_v12_1.png delete mode 100644 doc/user/project/img/protected_branches_list_v12_3.png create mode 100644 doc/user/project/img/protected_branches_page_v12_1.png delete mode 100644 doc/user/project/img/protected_branches_page_v12_3.png create mode 100644 doc/user/project/img/protected_tags_list_v12_1.png delete mode 100644 doc/user/project/img/protected_tags_list_v12_3.png create mode 100644 doc/user/project/img/protected_tags_page_v12_1.png delete mode 100644 doc/user/project/img/protected_tags_page_v12_3.png create mode 100644 doc/user/project/img/protected_tags_permissions_dropdown_v12_1.png delete mode 100644 doc/user/project/img/protected_tags_permissions_dropdown_v12_3.png diff --git a/doc/user/project/img/protected_branches_devs_can_push_v12_1.png b/doc/user/project/img/protected_branches_devs_can_push_v12_1.png new file mode 100644 index 00000000000..adc03a41abb Binary files /dev/null and b/doc/user/project/img/protected_branches_devs_can_push_v12_1.png differ diff --git a/doc/user/project/img/protected_branches_devs_can_push_v12_3.png b/doc/user/project/img/protected_branches_devs_can_push_v12_3.png deleted file mode 100644 index adc03a41abb..00000000000 Binary files a/doc/user/project/img/protected_branches_devs_can_push_v12_3.png and /dev/null differ diff --git a/doc/user/project/img/protected_branches_list_v12_1.png b/doc/user/project/img/protected_branches_list_v12_1.png new file mode 100644 index 00000000000..365d8d99e5a Binary files /dev/null and b/doc/user/project/img/protected_branches_list_v12_1.png differ diff --git a/doc/user/project/img/protected_branches_list_v12_3.png b/doc/user/project/img/protected_branches_list_v12_3.png deleted file mode 100644 index 365d8d99e5a..00000000000 Binary files a/doc/user/project/img/protected_branches_list_v12_3.png and /dev/null differ diff --git a/doc/user/project/img/protected_branches_page_v12_1.png b/doc/user/project/img/protected_branches_page_v12_1.png new file mode 100644 index 00000000000..17f19642552 Binary files /dev/null and b/doc/user/project/img/protected_branches_page_v12_1.png differ diff --git a/doc/user/project/img/protected_branches_page_v12_3.png b/doc/user/project/img/protected_branches_page_v12_3.png deleted file mode 100644 index 17f19642552..00000000000 Binary files a/doc/user/project/img/protected_branches_page_v12_3.png and /dev/null differ diff --git a/doc/user/project/img/protected_tags_list_v12_1.png b/doc/user/project/img/protected_tags_list_v12_1.png new file mode 100644 index 00000000000..6a30f615f2f Binary files /dev/null and b/doc/user/project/img/protected_tags_list_v12_1.png differ diff --git a/doc/user/project/img/protected_tags_list_v12_3.png b/doc/user/project/img/protected_tags_list_v12_3.png deleted file mode 100644 index 6a30f615f2f..00000000000 Binary files a/doc/user/project/img/protected_tags_list_v12_3.png and /dev/null differ diff --git a/doc/user/project/img/protected_tags_page_v12_1.png b/doc/user/project/img/protected_tags_page_v12_1.png new file mode 100644 index 00000000000..841e19af8a7 Binary files /dev/null and b/doc/user/project/img/protected_tags_page_v12_1.png differ diff --git a/doc/user/project/img/protected_tags_page_v12_3.png b/doc/user/project/img/protected_tags_page_v12_3.png deleted file mode 100644 index 841e19af8a7..00000000000 Binary files a/doc/user/project/img/protected_tags_page_v12_3.png and /dev/null differ diff --git a/doc/user/project/img/protected_tags_permissions_dropdown_v12_1.png b/doc/user/project/img/protected_tags_permissions_dropdown_v12_1.png new file mode 100644 index 00000000000..913d4725d53 Binary files /dev/null and b/doc/user/project/img/protected_tags_permissions_dropdown_v12_1.png differ diff --git a/doc/user/project/img/protected_tags_permissions_dropdown_v12_3.png b/doc/user/project/img/protected_tags_permissions_dropdown_v12_3.png deleted file mode 100644 index 913d4725d53..00000000000 Binary files a/doc/user/project/img/protected_tags_permissions_dropdown_v12_3.png and /dev/null differ diff --git a/doc/user/project/protected_branches.md b/doc/user/project/protected_branches.md index 8423b962948..17541d834ee 100644 --- a/doc/user/project/protected_branches.md +++ b/doc/user/project/protected_branches.md @@ -34,11 +34,11 @@ that the `master` branch is protected by default. 1. From the **Branch** dropdown menu, select the branch you want to protect and click **Protect**. In the screenshot below, we chose the `develop` branch. - ![Protected branches page](img/protected_branches_page_v12_3.png) + ![Protected branches page](img/protected_branches_page_v12_1.png) 1. Once done, the protected branch will appear in the "Protected branches" list. - ![Protected branches list](img/protected_branches_list_v12_3.png) + ![Protected branches list](img/protected_branches_list_v12_1.png) ## Using the Allowed to merge and Allowed to push settings @@ -65,7 +65,7 @@ You can set the "Allowed to push" and "Allowed to merge" options while creating a protected branch or afterwards by selecting the option you want from the dropdown list in the "Already protected" area. -![Developers can push](img/protected_branches_devs_can_push_v12_3.png) +![Developers can push](img/protected_branches_devs_can_push_v12_1.png) If you don't choose any of those options while creating a protected branch, they are set to "Maintainers" by default. diff --git a/doc/user/project/protected_tags.md b/doc/user/project/protected_tags.md index 9651c8824ab..8cd034e5038 100644 --- a/doc/user/project/protected_tags.md +++ b/doc/user/project/protected_tags.md @@ -24,15 +24,15 @@ To protect a tag, you need to have at least Maintainer permission level. 1. From the **Tag** dropdown menu, select the tag you want to protect or type and click **Create wildcard**. In the screenshot below, we chose to protect all tags matching `v*`: - ![Protected tags page](img/protected_tags_page_v12_3.png) + ![Protected tags page](img/protected_tags_page_v12_1.png) 1. From the **Allowed to create** dropdown, select who will have permission to create matching tags and then click **Protect**: - ![Allowed to create tags dropdown](img/protected_tags_permissions_dropdown_v12_3.png) + ![Allowed to create tags dropdown](img/protected_tags_permissions_dropdown_v12_1.png) 1. Once done, the protected tag will appear in the **Protected tags** list: - ![Protected tags list](img/protected_tags_list_v12_3.png) + ![Protected tags list](img/protected_tags_list_v12_1.png) ## Wildcard protected tags -- cgit v1.2.1