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
0
Merge Requests
0
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
Tatuya Kamada
gitlab-ce
Commits
52681358
Commit
52681358
authored
Jul 10, 2015
by
Sytse Sijbrandij
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce
Conflicts: docker/marathon.json
parents
a69855fc
aa33189c
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
2 deletions
+2
-2
app/views/projects/new.html.haml
app/views/projects/new.html.haml
+1
-1
docker/marathon.json
docker/marathon.json
+1
-1
No files found.
app/views/projects/new.html.haml
View file @
52681358
...
...
@@ -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
...
...
docker/marathon.json
View file @
52681358
...
...
@@ -8,7 +8,7 @@
"type"
:
"DOCKER"
,
"docker"
:
{
"network"
:
"HOST"
,
"image"
:
"
sytse/gitlab-ce:7.10.1
"
"image"
:
"
gitlab/gitlab-ce:latest
"
},
"volumes"
:
[
{
...
...
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