Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Léo-Paul Géneau
gitlab-ce
Commits
ade54803
Commit
ade54803
authored
Jul 03, 2017
by
Alexis Reigel
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
add help links to gpg commits / gpg settings
parent
3b7ac360
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
18 additions
and
1 deletion
+18
-1
app/assets/stylesheets/pages/commits.scss
app/assets/stylesheets/pages/commits.scss
+5
-0
app/helpers/commits_helper.rb
app/helpers/commits_helper.rb
+7
-0
app/views/profiles/gpg_keys/index.html.haml
app/views/profiles/gpg_keys/index.html.haml
+4
-1
doc/workflow/gpg_signed_commits/index.md
doc/workflow/gpg_signed_commits/index.md
+2
-0
No files found.
app/assets/stylesheets/pages/commits.scss
View file @
ade54803
...
@@ -331,3 +331,8 @@
...
@@ -331,3 +331,8 @@
.gpg-badge-popover-username
{
.gpg-badge-popover-username
{
font-weight
:
bold
;
font-weight
:
bold
;
}
}
.commit
.gpg-badge-popover-help-link
{
display
:
block
;
color
:
$link-color
;
}
app/helpers/commits_helper.rb
View file @
ade54803
...
@@ -271,6 +271,13 @@ module CommitsHelper
...
@@ -271,6 +271,13 @@ module CommitsHelper
)
)
concat
"GPG key ID:
#{
signature
.
gpg_key_primary_keyid
}
"
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
end
title
=
capture
do
title
=
capture
do
...
...
app/views/profiles/gpg_keys/index.html.haml
View file @
ade54803
...
@@ -9,7 +9,10 @@
...
@@ -9,7 +9,10 @@
GPG keys allow you to verify signed commits.
GPG keys allow you to verify signed commits.
.col-lg-9
.col-lg-9
%h5
.prepend-top-0
%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'
=
render
'form'
%hr
%hr
%h5
%h5
...
...
doc/workflow/gpg_signed_commits/index.md
View file @
ade54803
...
@@ -3,6 +3,8 @@
...
@@ -3,6 +3,8 @@
## Getting started
## Getting started
-
[
Git Tools - Signing Your Work
](
https://git-scm.com/book/en/v2/Git-Tools-Signing-Your-Work
)
-
[
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
## How GitLab handles GPG
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment