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

Conflicts: docker/marathon.json
Koriel · Jul 10, 2015 · 5268135 · 5268135
2 parents a69855f + aa33189
commit 5268135
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -8,7 +8,7 @@
     "type": "DOCKER",
     "docker": {
       "network": "HOST",
-      "image": "sytse/gitlab-ce:7.10.1"
+      "image": "gitlab/gitlab-ce:latest"
     },
     "volumes": [
       {