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
Boxiang Sun
gitlab-ce
Commits
85c6652a
Commit
85c6652a
authored
Oct 01, 2017
by
Rubén Dávila
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix some broken specs
parent
c50725fe
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
3 deletions
+3
-3
app/models/gpg_key.rb
app/models/gpg_key.rb
+1
-1
spec/factories/gpg_key_subkeys.rb
spec/factories/gpg_key_subkeys.rb
+2
-2
No files found.
app/models/gpg_key.rb
View file @
85c6652a
...
@@ -119,7 +119,7 @@ class GpgKey < ActiveRecord::Base
...
@@ -119,7 +119,7 @@ class GpgKey < ActiveRecord::Base
def
generate_subkeys
def
generate_subkeys
gpg_subkeys
=
Gitlab
::
Gpg
.
subkeys_from_key
(
key
)
gpg_subkeys
=
Gitlab
::
Gpg
.
subkeys_from_key
(
key
)
gpg_subkeys
[
primary_keyid
].
each
do
|
subkey_data
|
gpg_subkeys
[
primary_keyid
]
&
.
each
do
|
subkey_data
|
subkeys
.
create!
(
keyid:
subkey_data
[
:keyid
],
fingerprint:
subkey_data
[
:fingerprint
])
subkeys
.
create!
(
keyid:
subkey_data
[
:keyid
],
fingerprint:
subkey_data
[
:fingerprint
])
end
end
end
end
...
...
spec/factories/gpg_key_subkeys.rb
View file @
85c6652a
...
@@ -4,7 +4,7 @@ FactoryGirl.define do
...
@@ -4,7 +4,7 @@ FactoryGirl.define do
factory
:gpg_key_subkey
do
factory
:gpg_key_subkey
do
gpg_key
gpg_key
keyid
{
gpg_key
.
subkeys
.
last
.
keyid
}
sequence
(
:keyid
)
{
|
n
|
"keyid-
#{
n
}
"
}
fingerprint
{
gpg_key
.
subkeys
.
last
.
fingerprint
}
sequence
(
:fingerprint
)
{
|
n
|
"fingerprint-
#{
n
}
"
}
end
end
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