diff options
| author | Sytse Sijbrandij <sytse@gitlab.com> | 2015-07-10 18:44:54 +0200 |
|---|---|---|
| committer | Sytse Sijbrandij <sytse@gitlab.com> | 2015-07-10 18:44:54 +0200 |
| commit | 526813581b042bc6abad60eb4e582be81620be77 (patch) | |
| tree | 2c8c235198bd2d9f24fa45c3e97ebbe82cef7f62 | |
| parent | a69855fc90cec7e8e079c8bd9d2127858d03d006 (diff) | |
| parent | aa33189c09c5f096db5cb59bfa23741cb148f46e (diff) | |
| download | gitlab-ce-526813581b042bc6abad60eb4e582be81620be77.tar.gz | |
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce
Conflicts:
docker/marathon.json
| -rw-r--r-- | app/views/projects/new.html.haml | 2 | ||||
| -rw-r--r-- | docker/marathon.json | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/views/projects/new.html.haml b/app/views/projects/new.html.haml index 5114e63c05f..d49eacb30dd 100644 --- a/app/views/projects/new.html.haml +++ b/app/views/projects/new.html.haml @@ -85,7 +85,7 @@ %li The import will time out after 4 minutes. For big repositories, use a clone/push combination. %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 diff --git a/docker/marathon.json b/docker/marathon.json index 2f3bb6f17b4..9b2091a8c22 100644 --- a/docker/marathon.json +++ b/docker/marathon.json @@ -8,7 +8,7 @@ "type": "DOCKER", "docker": { "network": "HOST", - "image": "sytse/gitlab-ce:7.10.1" + "image": "gitlab/gitlab-ce:latest" }, "volumes": [ { |