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
Tatuya Kamada
gitlab-ce
Commits
36c2c354
Commit
36c2c354
authored
Feb 25, 2014
by
Jacob Vosmaer
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Adapt use of Gitlab::Popen to new style
parent
38f4b61a
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
2 deletions
+2
-2
app/models/key.rb
app/models/key.rb
+1
-1
lib/gitlab/satellite/satellite.rb
lib/gitlab/satellite/satellite.rb
+1
-1
No files found.
app/models/key.rb
View file @
36c2c354
...
@@ -53,7 +53,7 @@ class Key < ActiveRecord::Base
...
@@ -53,7 +53,7 @@ class Key < ActiveRecord::Base
Tempfile
.
open
(
'gitlab_key_file'
)
do
|
file
|
Tempfile
.
open
(
'gitlab_key_file'
)
do
|
file
|
file
.
puts
key
file
.
puts
key
file
.
rewind
file
.
rewind
cmd_output
,
cmd_status
=
popen
(
"ssh-keygen -lf
#{
file
.
path
}
"
,
'/tmp'
)
cmd_output
,
cmd_status
=
popen
(
%W(ssh-keygen -lf
#{
file
.
path
}
)
,
'/tmp'
)
end
end
if
cmd_status
.
zero?
if
cmd_status
.
zero?
...
...
lib/gitlab/satellite/satellite.rb
View file @
36c2c354
...
@@ -33,7 +33,7 @@ module Gitlab
...
@@ -33,7 +33,7 @@ module Gitlab
end
end
def
create
def
create
output
,
status
=
popen
(
"git clone
#{
project
.
repository
.
path_to_repo
}
#{
path
}
"
,
output
,
status
=
popen
(
%W(git clone --
#{
project
.
repository
.
path_to_repo
}
#{
path
}
)
,
Gitlab
.
config
.
satellites
.
path
)
Gitlab
.
config
.
satellites
.
path
)
log
(
"PID:
#{
project
.
id
}
: git clone
#{
project
.
repository
.
path_to_repo
}
#{
path
}
"
)
log
(
"PID:
#{
project
.
id
}
: git clone
#{
project
.
repository
.
path_to_repo
}
#{
path
}
"
)
...
...
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