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
1
Merge Requests
1
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
nexedi
gitlab-ce
Commits
ff9eb304
Commit
ff9eb304
authored
Apr 03, 2017
by
Douglas Barbosa Alexandre
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Set the right timeout for Gitlab::Shell#fetch_remote
parent
6143642a
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
1 deletion
+2
-1
lib/gitlab/shell.rb
lib/gitlab/shell.rb
+2
-1
No files found.
lib/gitlab/shell.rb
View file @
ff9eb304
...
@@ -93,12 +93,13 @@ module Gitlab
...
@@ -93,12 +93,13 @@ module Gitlab
# name - project path with namespace
# name - project path with namespace
# remote - remote name
# remote - remote name
# forced - should we use --force flag?
# forced - should we use --force flag?
# no_tags - should we use --no-tags flag?
#
#
# Ex.
# Ex.
# fetch_remote("gitlab/gitlab-ci", "upstream")
# fetch_remote("gitlab/gitlab-ci", "upstream")
#
#
def
fetch_remote
(
storage
,
name
,
remote
,
forced:
false
,
no_tags:
false
)
def
fetch_remote
(
storage
,
name
,
remote
,
forced:
false
,
no_tags:
false
)
args
=
[
gitlab_shell_projects_path
,
'fetch-remote'
,
storage
,
"
#{
name
}
.git"
,
remote
,
'
21
00'
]
args
=
[
gitlab_shell_projects_path
,
'fetch-remote'
,
storage
,
"
#{
name
}
.git"
,
remote
,
'
8
00'
]
args
<<
'--force'
if
forced
args
<<
'--force'
if
forced
args
<<
'--no-tags'
if
no_tags
args
<<
'--no-tags'
if
no_tags
...
...
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