diff options
| author | Alexis Reigel <mail@koffeinfrei.org> | 2017-07-03 09:41:32 +0200 |
|---|---|---|
| committer | Alexis Reigel <mail@koffeinfrei.org> | 2017-07-27 15:43:37 +0200 |
| commit | ade54803a7f8b1470320fc6fa5871f2ec208eb0f (patch) | |
| tree | 76f22770d4284c92a998f999cf2e19104ec4dcb5 | |
| parent | 3b7ac360cff04a5c1be83ee13b1354f07021c80d (diff) | |
| download | gitlab-ce-ade54803a7f8b1470320fc6fa5871f2ec208eb0f.tar.gz | |
add help links to gpg commits / gpg settings
| -rw-r--r-- | app/assets/stylesheets/pages/commits.scss | 5 | ||||
| -rw-r--r-- | app/helpers/commits_helper.rb | 7 | ||||
| -rw-r--r-- | app/views/profiles/gpg_keys/index.html.haml | 5 | ||||
| -rw-r--r-- | doc/workflow/gpg_signed_commits/index.md | 2 |
4 files changed, 18 insertions, 1 deletions
diff --git a/app/assets/stylesheets/pages/commits.scss b/app/assets/stylesheets/pages/commits.scss index b1710eee1bf..5de98cfc7af 100644 --- a/app/assets/stylesheets/pages/commits.scss +++ b/app/assets/stylesheets/pages/commits.scss @@ -331,3 +331,8 @@ .gpg-badge-popover-username { font-weight: bold; } + +.commit .gpg-badge-popover-help-link { + display: block; + color: $link-color; +} diff --git a/app/helpers/commits_helper.rb b/app/helpers/commits_helper.rb index 42e9379d1f4..60acc1e2f82 100644 --- a/app/helpers/commits_helper.rb +++ b/app/helpers/commits_helper.rb @@ -271,6 +271,13 @@ module CommitsHelper ) concat "GPG key ID: #{signature.gpg_key_primary_keyid}" + concat( + link_to( + 'Learn about signing commits', + help_page_path('workflow/gpg_signed_commits/index.md'), + class: 'gpg-badge-popover-help-link' + ) + ) end title = capture do diff --git a/app/views/profiles/gpg_keys/index.html.haml b/app/views/profiles/gpg_keys/index.html.haml index 30066522766..8331daeeb75 100644 --- a/app/views/profiles/gpg_keys/index.html.haml +++ b/app/views/profiles/gpg_keys/index.html.haml @@ -9,7 +9,10 @@ GPG keys allow you to verify signed commits. .col-lg-9 %h5.prepend-top-0 - Add an GPG key + 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') = render 'form' %hr %h5 diff --git a/doc/workflow/gpg_signed_commits/index.md b/doc/workflow/gpg_signed_commits/index.md index 041c681ba63..f7f5492c35a 100644 --- a/doc/workflow/gpg_signed_commits/index.md +++ b/doc/workflow/gpg_signed_commits/index.md @@ -3,6 +3,8 @@ ## Getting started - [Git Tools - Signing Your Work](https://git-scm.com/book/en/v2/Git-Tools-Signing-Your-Work) +- [Git Tools - Signing Your Work: GPG introduction](https://git-scm.com/book/en/v2/Git-Tools-Signing-Your-Work#_gpg_introduction) +- [Git Tools - Signing Your Work: Signing commits](https://git-scm.com/book/en/v2/Git-Tools-Signing-Your-Work#_signing_commits) ## How GitLab handles GPG |