delta/gitlab/gitlab-ce.git/docker, branch bump_gitlab_shell

Merge branch 'chef-docker' into 'master'

2015-07-16T20:19:51+00:00


Added note about chef

Added note about chef being required to generate GitLab config. because of tweet https://twitter.com/grahamgilbert/status/621015318442459136

See merge request !982

added additional space

2015-07-15T23:40:20+00:00

added note about chef

2015-07-15T18:13:40+00:00

Fix docker image

2015-07-14T17:46:55+00:00

Revert "Change default admin password from "5iveL!fe" to "password""

2015-07-14T15:59:36+00:00

This reverts commit 8a01a1222875b190d32769f7a6e7a74720079d2a.

information about why we use fig.yml

2015-07-10T19:33:31+00:00

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

2015-07-10T16:44:54+00:00

Conflicts:
	docker/marathon.json

Add volumes to marathon file.

2015-07-10T16:43:32+00:00

Update image to latest one

2015-07-10T16:32:09+00:00

Revert "Remove intro and link to Dockerhub"

2015-07-10T10:59:25+00:00

This reverts commit 57ec2832875aa976950093479b6a69f4e852807c.