diff options
author | Achilleas Pipinellis <axilleas@axilleas.me> | 2017-08-18 10:48:11 +0300 |
---|---|---|
committer | Achilleas Pipinellis <axilleas@axilleas.me> | 2017-08-18 10:52:35 +0300 |
commit | 4d4994f4cdf8d55009595b6feb3761f23823b8db (patch) | |
tree | 98bf9304dd9e09ee96619fcf875deb83802dae6b | |
parent | 1b46a8360e0adffba79fad5730e94e333350f063 (diff) | |
download | gitlab-ce-4d4994f4cdf8d55009595b6feb3761f23823b8db.tar.gz |
Change GPG docs location
-rw-r--r-- | app/views/profiles/gpg_keys/index.html.haml | 2 | ||||
-rw-r--r-- | app/views/projects/commit/_signature_badge.html.haml | 2 | ||||
-rw-r--r-- | doc/README.md | 2 | ||||
-rw-r--r-- | doc/user/project/gpg_signed_commits/img/profile_settings_gpg_keys.png (renamed from doc/workflow/gpg_signed_commits/img/profile_settings_gpg_keys.png) | bin | 32699 -> 32699 bytes | |||
-rw-r--r-- | doc/user/project/gpg_signed_commits/img/profile_settings_gpg_keys_paste_pub.png (renamed from doc/workflow/gpg_signed_commits/img/profile_settings_gpg_keys_paste_pub.png) | bin | 24514 -> 24514 bytes | |||
-rw-r--r-- | doc/user/project/gpg_signed_commits/img/profile_settings_gpg_keys_single_key.png (renamed from doc/workflow/gpg_signed_commits/img/profile_settings_gpg_keys_single_key.png) | bin | 10331 -> 10331 bytes | |||
-rw-r--r-- | doc/user/project/gpg_signed_commits/img/project_signed_and_unsigned_commits.png (renamed from doc/workflow/gpg_signed_commits/img/project_signed_and_unsigned_commits.png) | bin | 112812 -> 112812 bytes | |||
-rw-r--r-- | doc/user/project/gpg_signed_commits/img/project_signed_commit_unverified_signature.png (renamed from doc/workflow/gpg_signed_commits/img/project_signed_commit_unverified_signature.png) | bin | 9542 -> 9542 bytes | |||
-rw-r--r-- | doc/user/project/gpg_signed_commits/img/project_signed_commit_verified_signature.png (renamed from doc/workflow/gpg_signed_commits/img/project_signed_commit_verified_signature.png) | bin | 14029 -> 14029 bytes | |||
-rw-r--r-- | doc/user/project/gpg_signed_commits/index.md (renamed from doc/workflow/gpg_signed_commits/index.md) | 2 | ||||
-rw-r--r-- | doc/user/project/index.md | 1 |
11 files changed, 5 insertions, 4 deletions
diff --git a/app/views/profiles/gpg_keys/index.html.haml b/app/views/profiles/gpg_keys/index.html.haml index 8331daeeb75..720a97cddb7 100644 --- a/app/views/profiles/gpg_keys/index.html.haml +++ b/app/views/profiles/gpg_keys/index.html.haml @@ -12,7 +12,7 @@ Add a GPG key %p.profile-settings-content Before you can add a GPG key you need to - = link_to 'generate it.', help_page_path('workflow/gpg_signed_commits/index.md') + = link_to 'generate it.', help_page_path('user/project/gpg_signed_commits/index.md') = render 'form' %hr %h5 diff --git a/app/views/projects/commit/_signature_badge.html.haml b/app/views/projects/commit/_signature_badge.html.haml index 66f00eb5507..a3783b31b86 100644 --- a/app/views/projects/commit/_signature_badge.html.haml +++ b/app/views/projects/commit/_signature_badge.html.haml @@ -12,7 +12,7 @@ %span.monospace= signature.gpg_key_primary_keyid - = link_to('Learn more about signing commits', help_page_path('workflow/gpg_signed_commits/index.md'), class: 'gpg-popover-help-link') + = link_to('Learn more about signing commits', help_page_path('user/project/gpg_signed_commits/index.md'), class: 'gpg-popover-help-link') %button{ class: css_classes, data: { toggle: 'popover', html: 'true', placement: 'auto top', title: title, content: content } } = label diff --git a/doc/README.md b/doc/README.md index 547541c4876..e359c7295cb 100644 --- a/doc/README.md +++ b/doc/README.md @@ -98,7 +98,7 @@ Manage your [repositories](user/project/repository/index.md) from the UI (user i - [Git](topics/git/index.md): Getting started with Git, branching strategies, Git LFS, advanced use. - [Git cheatsheet](https://gitlab.com/gitlab-com/marketing/raw/master/design/print/git-cheatsheet/print-pdf/git-cheatsheet.pdf): Download a PDF describing the most used Git operations. - [GitLab Flow](workflow/gitlab_flow.md): explore the best of Git with the GitLab Flow strategy. -- [Signing commits](workflow/gpg_signed_commits/index.md): use GPG to sign your commits. +- [Signing commits](user/project/gpg_signed_commits/index.md): use GPG to sign your commits. ### Migrate and import your projects from other platforms diff --git a/doc/workflow/gpg_signed_commits/img/profile_settings_gpg_keys.png b/doc/user/project/gpg_signed_commits/img/profile_settings_gpg_keys.png Binary files differindex e525083918b..e525083918b 100644 --- a/doc/workflow/gpg_signed_commits/img/profile_settings_gpg_keys.png +++ b/doc/user/project/gpg_signed_commits/img/profile_settings_gpg_keys.png diff --git a/doc/workflow/gpg_signed_commits/img/profile_settings_gpg_keys_paste_pub.png b/doc/user/project/gpg_signed_commits/img/profile_settings_gpg_keys_paste_pub.png Binary files differindex 8e26d98f1b0..8e26d98f1b0 100644 --- a/doc/workflow/gpg_signed_commits/img/profile_settings_gpg_keys_paste_pub.png +++ b/doc/user/project/gpg_signed_commits/img/profile_settings_gpg_keys_paste_pub.png diff --git a/doc/workflow/gpg_signed_commits/img/profile_settings_gpg_keys_single_key.png b/doc/user/project/gpg_signed_commits/img/profile_settings_gpg_keys_single_key.png Binary files differindex f715c46adc3..f715c46adc3 100644 --- a/doc/workflow/gpg_signed_commits/img/profile_settings_gpg_keys_single_key.png +++ b/doc/user/project/gpg_signed_commits/img/profile_settings_gpg_keys_single_key.png diff --git a/doc/workflow/gpg_signed_commits/img/project_signed_and_unsigned_commits.png b/doc/user/project/gpg_signed_commits/img/project_signed_and_unsigned_commits.png Binary files differindex 16ec2d031ae..16ec2d031ae 100644 --- a/doc/workflow/gpg_signed_commits/img/project_signed_and_unsigned_commits.png +++ b/doc/user/project/gpg_signed_commits/img/project_signed_and_unsigned_commits.png diff --git a/doc/workflow/gpg_signed_commits/img/project_signed_commit_unverified_signature.png b/doc/user/project/gpg_signed_commits/img/project_signed_commit_unverified_signature.png Binary files differindex 22565cf7c7e..22565cf7c7e 100644 --- a/doc/workflow/gpg_signed_commits/img/project_signed_commit_unverified_signature.png +++ b/doc/user/project/gpg_signed_commits/img/project_signed_commit_unverified_signature.png diff --git a/doc/workflow/gpg_signed_commits/img/project_signed_commit_verified_signature.png b/doc/user/project/gpg_signed_commits/img/project_signed_commit_verified_signature.png Binary files differindex 1778b2ddf2b..1778b2ddf2b 100644 --- a/doc/workflow/gpg_signed_commits/img/project_signed_commit_verified_signature.png +++ b/doc/user/project/gpg_signed_commits/img/project_signed_commit_verified_signature.png diff --git a/doc/workflow/gpg_signed_commits/index.md b/doc/user/project/gpg_signed_commits/index.md index 7d5762d2b9d..31ae33ced06 100644 --- a/doc/workflow/gpg_signed_commits/index.md +++ b/doc/user/project/gpg_signed_commits/index.md @@ -23,7 +23,7 @@ For a signature to be verified two prerequisites need to be met: 1. On the upper right corner, click on your avatar and go to your **Settings**. - ![Settings dropdown](../../gitlab-basics/img/profile_settings.png) + ![Settings dropdown](../../../gitlab-basics/img/profile_settings.png) 1. Navigate to the **GPG keys** tab. diff --git a/doc/user/project/index.md b/doc/user/project/index.md index 0dd0faf35e9..a0c4118aa8f 100644 --- a/doc/user/project/index.md +++ b/doc/user/project/index.md @@ -24,6 +24,7 @@ integrated platform from messing with history or pushing code without review - [Protected tags](protected_tags.md): Control over who has permission to create tags, and prevent accidental update or deletion + - [Signing commits](gpg_signed_commits/index.md): use GPG to sign your commits - [Merge Requests](merge_requests/index.md): Apply your branching strategy and get reviewed by your team - [Merge Request Approvals](https://docs.gitlab.com/ee/user/project/merge_requests/merge_request_approvals.html) (**EES/EEP**): Ask for approval before |