Commit 52681358 authored by Sytse Sijbrandij's avatar Sytse Sijbrandij
Browse files

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

Conflicts:
	docker/marathon.json
parents a69855fc aa33189c
...@@ -85,7 +85,7 @@ ...@@ -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
......
...@@ -8,7 +8,7 @@ ...@@ -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": [
{ {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment