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
Jérome Perrin
gitlab-ce
Commits
7b4d29f4
Commit
7b4d29f4
authored
Feb 22, 2017
by
Alexis Reigel
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
add profile gpg key page to manage gpg keys
parent
ab4120de
Changes
9
Hide whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
131 additions
and
0 deletions
+131
-0
app/controllers/profiles/gpg_keys_controller.rb
app/controllers/profiles/gpg_keys_controller.rb
+33
-0
app/models/user.rb
app/models/user.rb
+1
-0
app/views/layouts/nav/_profile.html.haml
app/views/layouts/nav/_profile.html.haml
+4
-0
app/views/profiles/gpg_keys/_form.html.haml
app/views/profiles/gpg_keys/_form.html.haml
+10
-0
app/views/profiles/gpg_keys/_key.html.haml
app/views/profiles/gpg_keys/_key.html.haml
+13
-0
app/views/profiles/gpg_keys/_key_table.html.haml
app/views/profiles/gpg_keys/_key_table.html.haml
+11
-0
app/views/profiles/gpg_keys/index.html.haml
app/views/profiles/gpg_keys/index.html.haml
+18
-0
config/routes/profile.rb
config/routes/profile.rb
+1
-0
spec/features/profiles/gpg_keys_spec.rb
spec/features/profiles/gpg_keys_spec.rb
+40
-0
No files found.
app/controllers/profiles/gpg_keys_controller.rb
0 → 100644
View file @
7b4d29f4
class
Profiles::GpgKeysController
<
Profiles
::
ApplicationController
def
index
@gpg_keys
=
current_user
.
gpg_keys
@gpg_key
=
GpgKey
.
new
end
def
create
@gpg_key
=
current_user
.
gpg_keys
.
new
(
gpg_key_params
)
if
@gpg_key
.
save
redirect_to
profile_gpg_keys_path
else
@gpg_keys
=
current_user
.
gpg_keys
.
select
(
&
:persisted?
)
render
:index
end
end
def
destroy
@gpp_key
=
current_user
.
gpg_keys
.
find
(
params
[
:id
])
@gpp_key
.
destroy
respond_to
do
|
format
|
format
.
html
{
redirect_to
profile_gpg_keys_url
,
status:
302
}
format
.
js
{
head
:ok
}
end
end
private
def
gpg_key_params
params
.
require
(
:gpg_key
).
permit
(
:key
)
end
end
app/models/user.rb
View file @
7b4d29f4
...
@@ -76,6 +76,7 @@ class User < ActiveRecord::Base
...
@@ -76,6 +76,7 @@ class User < ActiveRecord::Base
where
(
type
.
not_eq
(
'DeployKey'
).
or
(
type
.
eq
(
nil
)))
where
(
type
.
not_eq
(
'DeployKey'
).
or
(
type
.
eq
(
nil
)))
end
,
dependent: :destroy
# rubocop:disable Cop/ActiveRecordDependent
end
,
dependent: :destroy
# rubocop:disable Cop/ActiveRecordDependent
has_many
:deploy_keys
,
->
{
where
(
type:
'DeployKey'
)
},
dependent: :destroy
# rubocop:disable Cop/ActiveRecordDependent
has_many
:deploy_keys
,
->
{
where
(
type:
'DeployKey'
)
},
dependent: :destroy
# rubocop:disable Cop/ActiveRecordDependent
has_many
:gpg_keys
,
dependent: :destroy
has_many
:emails
,
dependent: :destroy
# rubocop:disable Cop/ActiveRecordDependent
has_many
:emails
,
dependent: :destroy
# rubocop:disable Cop/ActiveRecordDependent
has_many
:personal_access_tokens
,
dependent: :destroy
# rubocop:disable Cop/ActiveRecordDependent
has_many
:personal_access_tokens
,
dependent: :destroy
# rubocop:disable Cop/ActiveRecordDependent
...
...
app/views/layouts/nav/_profile.html.haml
View file @
7b4d29f4
...
@@ -43,6 +43,10 @@
...
@@ -43,6 +43,10 @@
=
link_to
profile_keys_path
,
title:
'SSH Keys'
do
=
link_to
profile_keys_path
,
title:
'SSH Keys'
do
%span
%span
SSH Keys
SSH Keys
=
nav_link
(
controller: :gpg_keys
)
do
=
link_to
profile_gpg_keys_path
,
title:
'GPG Keys'
do
%span
GPG Keys
=
nav_link
(
controller: :preferences
)
do
=
nav_link
(
controller: :preferences
)
do
=
link_to
profile_preferences_path
,
title:
'Preferences'
do
=
link_to
profile_preferences_path
,
title:
'Preferences'
do
%span
%span
...
...
app/views/profiles/gpg_keys/_form.html.haml
0 → 100644
View file @
7b4d29f4
%div
=
form_for
[
:profile
,
@gpg_key
],
html:
{
class:
'js-requires-input'
}
do
|
f
|
=
form_errors
(
@gpg_key
)
.form-group
=
f
.
label
:key
,
class:
'label-light'
=
f
.
text_area
:key
,
class:
"form-control"
,
rows:
8
,
required:
true
,
placeholder:
"Don't paste the private part of the GPG key. Paste the public part which begins with '-----BEGIN PGP PUBLIC KEY BLOCK-----'."
.prepend-top-default
=
f
.
submit
'Add key'
,
class:
"btn btn-create"
app/views/profiles/gpg_keys/_key.html.haml
0 → 100644
View file @
7b4d29f4
%li
.key-list-item
.pull-left.append-right-10
=
icon
'key'
,
class:
"settings-list-icon hidden-xs"
.key-list-item-info
=
key
.
emails
.
join
(
' '
)
.description
=
key
.
fingerprint
.pull-right
%span
.key-created-at
created
#{
time_ago_with_tooltip
(
key
.
created_at
)
}
=
link_to
profile_gpg_key_path
(
key
),
data:
{
confirm:
'Are you sure?'
},
method: :delete
,
class:
"btn btn-transparent prepend-left-10"
do
%span
.sr-only
Remove
=
icon
(
'trash'
)
app/views/profiles/gpg_keys/_key_table.html.haml
0 → 100644
View file @
7b4d29f4
-
is_admin
=
local_assigns
.
fetch
(
:admin
,
false
)
-
if
@gpg_keys
.
any?
%ul
.well-list
=
render
partial:
'profiles/gpg_keys/key'
,
collection:
@gpg_keys
,
locals:
{
is_admin:
is_admin
}
-
else
%p
.settings-message.text-center
-
if
is_admin
There are no GPG keys associated with this account.
-
else
There are no GPG keys with access to your account.
app/views/profiles/gpg_keys/index.html.haml
0 → 100644
View file @
7b4d29f4
-
page_title
"GPG Keys"
=
render
'profiles/head'
.row.prepend-top-default
.col-lg-3.profile-settings-sidebar
%h4
.prepend-top-0
=
page_title
%p
GPG keys allow you to verify signed commits.
.col-lg-9
%h5
.prepend-top-0
Add an GPG key
=
render
'form'
%hr
%h5
Your GPG keys (
#{
@gpg_keys
.
count
}
)
.append-bottom-default
=
render
'key_table'
config/routes/profile.rb
View file @
7b4d29f4
...
@@ -23,6 +23,7 @@ resource :profile, only: [:show, :update] do
...
@@ -23,6 +23,7 @@ resource :profile, only: [:show, :update] do
end
end
resource
:preferences
,
only:
[
:show
,
:update
]
resource
:preferences
,
only:
[
:show
,
:update
]
resources
:keys
,
only:
[
:index
,
:show
,
:create
,
:destroy
]
resources
:keys
,
only:
[
:index
,
:show
,
:create
,
:destroy
]
resources
:gpg_keys
,
only:
[
:index
,
:create
,
:destroy
]
resources
:emails
,
only:
[
:index
,
:create
,
:destroy
]
resources
:emails
,
only:
[
:index
,
:create
,
:destroy
]
resources
:chat_names
,
only:
[
:index
,
:new
,
:create
,
:destroy
]
do
resources
:chat_names
,
only:
[
:index
,
:new
,
:create
,
:destroy
]
do
collection
do
collection
do
...
...
spec/features/profiles/gpg_keys_spec.rb
0 → 100644
View file @
7b4d29f4
require
'rails_helper'
feature
'Profile > GPG Keys'
,
:gpg
do
let
(
:user
)
{
create
(
:user
)
}
before
do
login_as
(
user
)
end
describe
'User adds a key'
do
before
do
visit
profile_gpg_keys_path
end
scenario
'saves the new key'
do
fill_in
(
'Key'
,
with:
attributes_for
(
:gpg_key
)[
:key
])
click_button
(
'Add key'
)
expect
(
page
).
to
have_content
(
'mail@koffeinfrei.org lex@panter.ch'
)
expect
(
page
).
to
have_content
(
'4F4840A503964251CF7D7F5DC728AF10972E97C0'
)
end
end
scenario
'User sees their keys'
do
create
(
:gpg_key
,
user:
user
)
visit
profile_gpg_keys_path
expect
(
page
).
to
have_content
(
'mail@koffeinfrei.org lex@panter.ch'
)
expect
(
page
).
to
have_content
(
'4F4840A503964251CF7D7F5DC728AF10972E97C0'
)
end
scenario
'User removes a key via the key index'
do
create
(
:gpg_key
,
user:
user
)
visit
profile_gpg_keys_path
click_link
(
'Remove'
)
expect
(
page
).
to
have_content
(
'Your GPG keys (0)'
)
end
end
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