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
4535db04
Commit
4535db04
authored
Aug 11, 2014
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Increase import timeout from 2 to 4 minutes
Signed-off-by:
Dmitriy Zaporozhets
<
dmitriy.zaporozhets@gmail.com
>
parent
2c77dae2
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
2 deletions
+2
-2
app/views/projects/import.html.haml
app/views/projects/import.html.haml
+1
-1
lib/gitlab/backend/shell.rb
lib/gitlab/backend/shell.rb
+1
-1
No files found.
app/views/projects/import.html.haml
View file @
4535db04
...
...
@@ -25,6 +25,6 @@
.bs-callout.bs-callout-info
This url must be publicly accessible or you can add a username and password like this: https://username:password@gitlab.com/company/project.git.
%br
The import will time out after
2
minutes. For big repositories, use a clone/push combination.
The import will time out after
4
minutes. For big repositories, use a clone/push combination.
.form-actions
=
f
.
submit
'Retry import'
,
class:
"btn btn-create"
,
tabindex:
4
lib/gitlab/backend/shell.rb
View file @
4535db04
...
...
@@ -27,7 +27,7 @@ module Gitlab
# import_repository("gitlab/gitlab-ci", "https://github.com/randx/six.git")
#
def
import_repository
(
name
,
url
)
system
"
#{
gitlab_shell_path
}
/bin/gitlab-projects"
,
"import-project"
,
"
#{
name
}
.git"
,
url
system
"
#{
gitlab_shell_path
}
/bin/gitlab-projects"
,
"import-project"
,
"
#{
name
}
.git"
,
url
,
'240'
end
# Move repository
...
...
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