kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce

Browse source 
Conflicts:
	docker/marathon.json
This commit is contained in:
Sytse Sijbrandij 2015-07-10 18:44:54 +02:00
commit 526813581b
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/views/projects/new.html.haml
View file

@ -85,7 +85,7 @@
%li %li
The import will time out after 4 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.
%li %li
To migrate an SVN repository, check out #{link_to "this document", "http://doc.gitlab.com/ce/workflow/migrating_from_svn.html"}. To migrate an SVN repository, check out #{link_to "this document", "http://doc.gitlab.com/ce/workflow/importing/migrating_from_svn.html"}.
%hr.prepend-botton-10 %hr.prepend-botton-10

2
docker/marathon.json
View file

@ -8,7 +8,7 @@
"type": "DOCKER", "type": "DOCKER",
"docker": { "docker": {
"network": "HOST", "network": "HOST",
"image": "sytse/gitlab-ce:7.10.1" "image": "gitlab/gitlab-ce:latest"
}, },
"volumes": [ "volumes": [
{ {