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
Kazuhiko Shiozaki
gitlab-ce
Commits
f502a83b
Commit
f502a83b
authored
Jul 16, 2015
by
Marin Jankovski
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master' of github.com:gitlabhq/gitlabhq
parents
d9078749
bce9315a
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
8 additions
and
9 deletions
+8
-9
doc/api/merge_requests.md
doc/api/merge_requests.md
+0
-8
docker/Dockerfile
docker/Dockerfile
+3
-1
docker/assets/wrapper
docker/assets/wrapper
+5
-0
No files found.
doc/api/merge_requests.md
View file @
f502a83b
...
...
@@ -336,14 +336,6 @@ Parameters:
```
json
{
"author"
:
{
"id"
:
1
,
"username"
:
"admin"
,
"email"
:
"admin@example.com"
,
"name"
:
"Administrator"
,
"blocked"
:
false
,
"created_at"
:
"2012-04-29T08:46:00Z"
},
"note"
:
"text1"
}
```
...
...
docker/Dockerfile
View file @
f502a83b
...
...
@@ -30,7 +30,9 @@ RUN ( \
echo
""
&&
\
echo
"# Docker options"
&&
\
echo
"# Prevent Postgres from trying to allocate 25% of total memory"
&&
\
echo
"postgresql['shared_buffers'] = '1MB'"
)
>>
/etc/gitlab/gitlab.rb
echo
"postgresql['shared_buffers'] = '1MB'"
)
>>
/etc/gitlab/gitlab.rb
&&
\
mkdir
-p
/assets/
&&
\
cp
/etc/gitlab/gitlab.rb /assets/gitlab.rb
# Expose web & ssh
EXPOSE
443 80 22
...
...
docker/assets/wrapper
View file @
f502a83b
...
...
@@ -13,4 +13,9 @@ function entrypoint() {
gitlab-ctl
tail
# tail all logs
}
if
[[
!
-e
/etc/gitlab/gitlab.rb
]]
;
then
cp
/assets/gitlab.rb /etc/gitlab/gitlab.rb
chmod
0600 /etc/gitlab/gitlab.rb
fi
entrypoint
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