Merge branch 'master' of github.com:gitlabhq/gitlabhq
This commit is contained in:
commit
bb2358379e
3 changed files with 4 additions and 4 deletions
|
@ -86,7 +86,7 @@
|
|||
- if @project.avatar?
|
||||
You can change your project avatar here
|
||||
- else
|
||||
You can upload an project avatar here
|
||||
You can upload a project avatar here
|
||||
%a.choose-btn.btn.btn-small.js-choose-project-avatar-button
|
||||
%i.icon-paper-clip
|
||||
%span Choose File ...
|
||||
|
|
|
@ -70,7 +70,7 @@ sudo cp lib/support/init.d/gitlab /etc/init.d/gitlab
|
|||
There are new configuration options available for [`gitlab.yml`](config/gitlab.yml.example). View them with the command below and apply them to your current `gitlab.yml`.
|
||||
|
||||
```
|
||||
git diff origin/7-6-stable:config/gitlab.yml.example origin/7-8-stable:config/gitlab.yml.example
|
||||
git diff origin/7-7-stable:config/gitlab.yml.example origin/7-8-stable:config/gitlab.yml.example
|
||||
```
|
||||
|
||||
#### Change Nginx settings
|
||||
|
|
|
@ -11,7 +11,7 @@ RUN apt-get update -q \
|
|||
# If the Omnibus package version below is outdated please contribute a merge request to update it.
|
||||
# If you run GitLab Enterprise Edition point it to a location where you have downloaded it.
|
||||
RUN TMP_FILE=$(mktemp); \
|
||||
wget -q -O $TMP_FILE https://downloads-packages.s3.amazonaws.com/ubuntu-14.04/gitlab_7.7.2-omnibus.5.4.2.ci-1_amd64.deb \
|
||||
wget -q -O $TMP_FILE https://downloads-packages.s3.amazonaws.com/ubuntu-14.04/gitlab_7.8.0-omnibus-1_amd64.deb \
|
||||
&& dpkg -i $TMP_FILE \
|
||||
&& rm -f $TMP_FILE
|
||||
|
||||
|
@ -31,4 +31,4 @@ VOLUME ["/var/opt/gitlab", "/var/log/gitlab", "/etc/gitlab"]
|
|||
ADD gitlab.rb /etc/gitlab/
|
||||
|
||||
# Default is to run runit & reconfigure
|
||||
CMD gitlab-ctl reconfigure & /opt/gitlab/embedded/bin/runsvdir-start
|
||||
CMD gitlab-ctl reconfigure & /opt/gitlab/embedded/bin/runsvdir-start
|
Loading…
Reference in a new issue