Bertrand Gouny
cb48a6aff0
ldap ca_file and ssl_version config params
2017-10-30 14:27:33 +01:00
solidnerd
31dee60bec
Update gitaly config.toml
...
Signed-off-by: solidnerd <niclas@mietz.io>
2017-10-26 23:00:14 +02:00
Niclas Mietz
bddb64b4fc
Merge pull request #1355 from LordFPL/patch-2
...
Add gitaly-ruby & gitlab-shell dir
2017-10-26 22:56:47 +02:00
solidnerd
311dc66915
Update gitlab.yml from upstream
...
Signed-off-by: solidnerd <niclas@mietz.io>
2017-10-26 21:47:53 +02:00
solidnerd
f765ef06be
Add GITLAB_PAGES_ARTIFACTS_SERVER
...
Signed-off-by: solidnerd <niclas@mietz.io>
2017-10-26 21:47:53 +02:00
solidnerd
df4d252cc9
Add GITLAB_PAGES_CLIENT_PATH
...
Signed-off-by: solidnerd <niclas@mietz.io>
2017-10-26 21:47:53 +02:00
solidnerd
c570f1c196
Remove GITALY_ENABLED
...
Since the last version Gitaly is now the way to go. So I removed this variable from the image.
Signed-off-by: solidnerd <niclas@mietz.io>
2017-10-26 21:47:53 +02:00
solidnerd
3fc8424bba
Use git as installation for gitaly
...
This commit applys the patch from @fmauNeko .
Signed-off-by: solidnerd <niclas@mietz.io>
2017-10-26 21:47:53 +02:00
solidnerd
e025be725e
Fix gitlab-pages installation
...
This fixes the installation of gitlab-pages.
Git will be now used to download gitlab-pages and the new make script will be used.
Signed-off-by: solidnerd <niclas@mietz.io>
2017-10-22 19:22:47 +02:00
solidnerd
295ec223e7
Syntax mistake on LDAP_VERIFY_SSL
...
Deleting quotes on LDAP_VERIFY_SSL
Signed-off-by: solidnerd <niclas@mietz.io>
# Conflicts:
# assets/runtime/config/gitlabhq/gitlab.yml
2017-10-20 22:06:05 +02:00
BirgerK
bdb4dbd18f
fix possible values for ldap-encryption
2017-10-19 23:32:39 +02:00
LordFPL
1cd2d70082
Add LDAP_VERIFY_SSL var ( #1367 )
...
* Add LDAP_VERIFY_SSL var
Due to https://about.gitlab.com/2017/09/22/gitlab-10-0-released/#ldap-config-%22verify_certificates%22-defaults-to-secure , this config should be present.
* Update env-defaults
* Update functions
* Update README.md
2017-10-08 12:58:17 +03:00
Niclas Mietz
ad57bec259
Merge pull request #1358 from evenh/clean-history
...
GitLab CE 10.0.0
2017-10-03 12:42:35 +03:00
Even Holthe
985d57afb9
Add ajv as an explicit dependency
...
Thanks to @phenomax to pointing this out. Should probably be removed in
the future once it's fixed upstream.
See the following links for more info:
- https://gitlab.com/gitlab-org/gitlab-ce/issues/38275
- https://gitlab.com/gitlab-org/gitlab-ce/issues/38050
- https://github.com/sameersbn/docker-gitlab/issues/1360
2017-10-01 21:33:25 +02:00
LordFPL
90dbcf257d
Add gitaly-ruby & gitlab-shell dir
...
Fix https://github.com/sameersbn/docker-gitlab/issues/1354
2017-09-21 12:16:12 +02:00
Mariusz 'koder' Chwalba
cee6b282ba
Increase default memory max to address #1347
2017-09-20 12:57:42 +02:00
Silas Rech
cd97f7ca0e
Fix some whitespace / tab issues
2017-08-24 16:58:26 +02:00
Silas Rech
5c2e00e2ec
Add monitoring keys
2017-08-24 16:50:32 +02:00
Max
b9b56bf6be
Add variables to config functions
2017-08-23 23:08:25 +02:00
Max
1b09ce0bef
Add config vars for the gitaly token & gitlab repository timeout/reset
2017-08-23 22:59:37 +02:00
Max
9c601cf643
Add prometheus client reset to unicorn.rb - https://gitlab.com/gitlab-org/gitlab-ce/blob/9-5-stable/config/unicorn.rb.example#L124
2017-08-22 13:40:19 +02:00
Max
27ed0c7ec5
Change ldap.servers.main.method key to encryption - https://gitlab.com/gitlab-org/gitlab-ce/blob/9-5-stable/config/gitlab.yml.example#L728
2017-08-22 13:38:09 +02:00
Max
50fd3e71f9
Add gitaly.token to gitlab.yml - https://gitlab.com/gitlab-org/gitlab-ce/blob/9-5-stable/config/gitlab.yml.example#L492
2017-08-22 13:37:01 +02:00
Max
dc5c505d1d
add gitaly_adress to repositories.storages in gitlab.yml - https://gitlab.com/gitlab-org/gitlab-ce/blob/9-5-stable/config/gitlab.yml.example#L651
2017-08-22 13:33:44 +02:00
Max
72c5bc9ac3
Add build in monitor settings to gitlab.yml
2017-08-22 13:30:26 +02:00
Max
953d1f3c7a
Add new repository keys to gitlab.yml - https://gitlab.com/gitlab-org/gitlab-ce/blob/9-5-stable/config/gitlab.yml.example#L509
2017-08-22 13:26:38 +02:00
Max
6fe7c832e6
Changed gitlab.yml lmap.method key to lmap.encryption - https://gitlab.com/gitlab-org/gitlab-ce/blob/9-5-stable/config/gitlab.yml.example#L273
2017-08-22 13:22:43 +02:00
solidnerd
d1287f4895
Remove explicit gettext:compile
...
This is not needed anymore it got fixed by the upstream.
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/13122/diffs
Signed-off-by: solidnerd <niclas@mietz.io>
2017-08-19 09:06:56 +02:00
solidnerd
de3a4a1349
Add gettext:compile for assets
...
This helps to let js and other stuff working correctly with i18n translations.
Fixes #1301
2017-07-25 09:29:41 +02:00
Niclas Mietz
f1c0cb372e
Merge pull request #1137 from 3kami3/real_ip
...
Add $NGINX_REAL_IP_RECURSIVE and $NGINX_REAL_IP_TRUSTED_ADDRESSES
2017-07-23 13:20:17 +02:00
Niclas Mietz
04589d2d66
Merge pull request #1288 from MichaelEischer/regenerate-secrets
...
Regenerate secrets on container startup
2017-07-23 13:19:21 +02:00
Sergey Rusakov
31c7561641
Add RE2 library to install script
2017-07-21 23:29:17 +02:00
Michael Eischer
e383d84296
Generate secrets on container startup
2017-07-16 20:30:33 +02:00
Abel Tay
3b1b03c75d
Fix typo in gitlab-workhorse
2017-07-07 14:42:41 +08:00
solidnerd
435f01cc2b
Fix missing install_template for Gitaly
2017-07-02 19:31:10 +02:00
solidnerd
510284bc1e
Use same method for asset compiling in REALTIVE_URL_ROOT
...
Signed-off-by: solidnerd <niclas@mietz.io>
2017-07-02 14:13:26 +02:00
solidnerd
f1079faf2e
Fix GITALY_ENABLED in gitlab.yml
...
Signed-off-by: solidnerd <niclas@mietz.io>
2017-07-02 14:10:38 +02:00
solidnerd
94dab8a58d
Fix GITLAB_PIPELINE_SCHEDULE_WORKER_CRON
...
Signed-off-by: solidnerd <niclas@mietz.io>
2017-07-02 14:10:34 +02:00
Niclas Mietz
b56372f358
Merge branch 'master' into master
2017-07-02 14:03:48 +02:00
Niclas Mietz
2e6a520a51
Merge pull request #1232 from Glowbal/configure-pipeline-schedule-worker
...
Add environment variable to configure pipeline schedule worker cron job
2017-07-02 14:01:29 +02:00
solidnerd
ceb4e1d1f0
Use gitlab:assets:compile for compiling assets
...
This commit will replace the following rake tasks through a single one.
- assets:clean
- assets:precompile
- webpack:compile
Signed-off-by: solidnerd <niclas@mietz.io>
2017-07-02 12:52:16 +02:00
solidnerd
d4de4f3b7b
Remove lock for omniauth-google-oauth2
...
This gonna be fixed through the upstream commit b60a14357f
2017-07-02 12:52:16 +02:00
timfeirg
793b33c2e5
install gitaly
2017-07-01 17:26:40 +08:00
timfeirg
0c28126033
extra steps required when installing gitlab-shell
2017-06-29 12:25:01 +08:00
timfeirg
3a32735558
Upgrade to Gitlab CE 9.3.0
2017-06-27 16:46:32 +08:00
Peter Leitzen
ad68271db1
Expose DB_COLLATION parameter
2017-06-24 14:32:33 +02:00
Glowbal
53f50a9777
Add configure cron jobs step
2017-06-08 20:38:36 +02:00
Thomas Kooi
15286b137d
Add env variable to configure pipeline schedule worker cron job
2017-05-28 13:52:42 +02:00
Andrew Stuart
42275623d6
Temporary workaround for omniauth Gemfile.lock incompatibility
2017-05-26 11:46:04 -07:00
Andrew Stuart
105c701235
Add flexibility to use versions committed into gitlab-ce
2017-05-26 11:45:42 -07:00
