667 Commits

Author SHA1 Message Date
Ian Matyssik
07462abcf0 Use current parameters for gitlab-pages 2017-04-05 03:43:06 +09:00
Ian Matyssik
b1b5855875 Make sure that https for pages is enabled before using https config for it. 2017-04-05 03:41:45 +09:00
Niclas Mietz
da465a5cc9 Merge pull request #1147 from phpb-com/update-to-9-0-0
Update Gitlab to 9.0.0
2017-03-26 20:10:56 +02:00
Ian Matyssik
fb8cfdb5b2
Set git config for repack.writeBitmaps to true 2017-03-25 06:15:11 +09:00
ian
91ee8a146f
Sync gitlab.yml with upstream for 9.0.0 2017-03-25 06:15:06 +09:00
ian
7ae13a0a19
Fix incomplete generation of pages nginx config. Fixes #1127 2017-03-22 22:14:46 +09:00
ian
234605dbc1
Remove ipv6only directive from listen parameter in nginx config for pages 2017-03-22 22:09:42 +09:00
Niclas Mietz
b1fe1c4802 Merge pull request #937 from maikelvl/hotfix/container-registry
Improve container registry docs and certificate handling
2017-03-21 07:52:57 +01:00
Niclas Mietz
30caea33ba Merge pull request #1139 from phpb-com/master
Use yarn to install JS dependencies
2017-03-21 07:46:35 +01:00
solidnerd
114e656c77
Use webpack:compile when GITLAB_RELATIVE_URL_ROOT is set 2017-03-21 07:42:42 +01:00
Ian Matyssik
a42aadc777 Use yarn to install JS dependencies
Since yarn is part of the image now, we should use it to install JS dependencies.
2017-03-20 21:58:26 +09:00
solidnerd
d49d4b2dae
Again fixes for #1128 2017-03-18 19:06:43 +01:00
solidnerd
54a094ed98
Deploy gitlab-pages only if it's enabled 2017-03-18 14:41:24 +01:00
solidnerd
cd635cd57e
Add GitLab Pages 2017-03-18 11:51:49 +01:00
Chang Hyun Park
644895fb3f
Adds installation of dependent node packages, and webpack compilation
Dependent node packages are built with the `npm install` command
Then the rake webpack:compile instruction compiles necessary webpack stuff.

Signed-off-by: Chang Hyun Park <heartinpiece@gmail.com>
2017-03-04 12:47:42 +01:00
ayapapa
153eece62f fixed backup issue 2017-02-28 22:03:45 +09:00
Paolo Mainardi
7b22b77566 Fix logical check of booleans 2017-02-18 15:37:37 +01:00
Paolo Mainardi
8d925d9a34 Add google cloud storage support (#1030)
* add google cloud storage support

* add documentation of paramenters

* use the same key for both providers

* use the same key for both providers
2017-02-15 20:08:10 +01:00
Sameer Naik
92876097ca
removed double-slash from gitlab-shell/config.yml template 2017-01-30 19:56:10 +05:30
Sameer Naik
4902d4dab3 unicorn.rb: sync with upstream 2017-01-28 20:59:54 +05:30
Sameer Naik
dca8b41a10 sync gitlab-shell config.yml with upstream 2017-01-28 20:58:13 +05:30
solidnerd
30e32a41af
Fix typo in gitlab_ssl config 2016-12-26 15:09:42 +01:00
Niclas Mietz
80566356c3 Merge pull request #1029 from timfeirg/master
upgrade to CE v8.15.0
2016-12-26 13:53:01 +01:00
Niclas Mietz
72eacd1f42 Merge pull request #842 from solidnerd/change-gitlab_clone_url
Change `GITLAB_CLONE_URL` from github to gitlab directly
2016-12-26 13:52:40 +01:00
solidnerd
f0021000dd FIX OAUTH_AUTHENTIQ configuration proccess 2016-12-25 22:51:23 +08:00
solidnerd
5732e644e1 Update NGINX configuration files to add websocket support 2016-12-25 22:50:27 +08:00
solidnerd
cd51342183 Fix Typos and Grammar 2016-12-25 22:50:27 +08:00
solidnerd
ea679665e8 Add OAUTH Authentiq support
Signed-off-by: solidnerd <niclas@mietz.io>
2016-12-25 22:50:27 +08:00
solidnerd
4b70522f37 Add GITLAB_MATTERMOST_ENABLED and GITLAB_MATTERMOST_URL
Signed-off-by: solidnerd <niclas@mietz.io>
2016-12-25 22:50:27 +08:00
Alex Brausewetter
93acbe0dd8 With MySQL run gitlab:setup before db:migrate
Fixes an issue where starting a new MySQL based container would failed
due to foreign key constraints.
2016-11-26 13:15:57 +01:00
solidnerd
9ec8d20e91
Add IMAP_TIMEOUT
Allows configuration of idle_timeout for incoming email

Signed-off-by: solidnerd <niclas@mietz.io>
2016-11-22 21:49:35 +01:00
solidnerd
30d4006fe3
Sync gitlab.yml with upstream
Signed-off-by: solidnerd <niclas@mietz.io>
2016-11-22 21:48:50 +01:00
Maikel Vlasman
20b37e5c82 Reuse GITLAB_REGISTRY_KEY_PATH and GITLAB_REGISTRY_CERT_PATH. 2016-11-22 19:54:15 +01:00
Maikel Vlasman
67866370e9 Update certificates when SSL_REGISTRY_CERT_PATH exists. 2016-11-22 19:54:15 +01:00
hexim
4b7e4bf727 fix http to https redirect 2016-11-03 21:29:42 +01:00
hexim
b7b4846c47 fix ipv6only 2016-11-03 20:04:01 +01:00
Niclas Mietz
deb046a258 Merge pull request #931 from sameersbn/upstream-conf-sync
sync with upstream configurations
2016-11-02 08:34:56 +01:00
Pieter Meyvaert
005f754a38 Applied patches for gitlab 8.13.0 2016-10-25 10:11:17 +02:00
Sameer Naik
db34a40615 sync upstream configuration 2016-10-16 22:16:14 +05:30
SolidNerd
553dc2de82 update gitlab rackt_attack.rb 2016-09-30 17:24:05 +02:00
SolidNerd
e4a50f3612 add redis sentinels to gitlab-shell config 2016-09-30 17:24:05 +02:00
Gert-Jan Timmer
c80bd87662 UID/GID non-unique fix
Complete details for PR: https://github.com/sameersbn/docker-postgresql/pull/78

allow non-unique id's, because the gid selected by the user may already be in use within the container. This fix solves that issue.

Docker error log:
```
Adapting uid and gid for postgres:postgres to 1024:101
groupmod: GID '101' already exists
```

Error within log means that GID: 101 is already in use within the container.
By using groupmod with option ```-o``` it will be allowed.
2016-08-31 15:25:16 +02:00
SolidNerd
33b2148a64 Update resque.yml 2016-08-23 20:59:20 +02:00
SolidNerd
6f49e45412 Add GITLAB_SECRETS_SECRET_KEY_BASE and GITLAB_SECRETS_OTP_KEY_BASE 2016-08-23 20:57:13 +02:00
SolidNerd
155920da38 Upgrade Ruby to 2.3 2016-08-22 22:41:09 +02:00
SolidNerd
287e7d52f7 Change GITLAB_CLONE_URL from github to gitlab directly 2016-08-17 23:39:46 +02:00
SolidNerd
15e1a8f8c9 Improve error message when ssl key, ssl certificate or dhparam were not found 2016-08-05 22:00:12 +02:00
SolidNerd
078735183f Fix Google OAuth multiple restricted domains configuration
This fixes a bug that occured during the implementation of 2aff87196d .
It was not possible to get it working without restricted domains. This fixes it.
2016-08-01 23:10:56 +02:00
SolidNerd
3186fb9540 Add SKIP_STORAGE_VALIDATION to let assets:precompile
This is the new way how we could resolve the problem with assets:precompile since 8.10.0
GITLAB MR Link: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/5478/commits
2016-07-30 10:38:32 +02:00
Aurélien Chrétien
2aff87196d Improve OAUTH_GOOGLE_RESTRICT_DOMAIN for mutltiple restricted domains
Since 85cb5635ba the google oauth handle multiple hosted domain validation.
2016-07-28 11:24:36 +02:00