summaryrefslogtreecommitdiff
path: root/config/gitlab.yml.example
Commit message (Collapse)AuthorAgeFilesLines
* Add sidekiq metrics endpoint and add http server to sidekiqPaweł Chojnacki2017-08-071-0/+6
|
* Add a Circuitbreaker for storage pathsBob Van Landuyt2017-08-041-0/+9
|
* Fix LDAP documentation and example configmk-fix-ldap-ca-file-docsMichael Kozono2017-07-311-1/+1
|
* Mention how to test LDAP connectionsMichael Kozono2017-07-261-1/+2
|
* Update more examplesMichael Kozono2017-07-261-1/+1
|
* Copy comment improvements from documentationMichael Kozono2017-07-261-4/+11
|
* Add LDAP config optionsMichael Kozono2017-07-261-1/+29
|
* Merge branch 'authentiq-updates' into 'master'Rémy Coutable2017-07-191-3/+3
|\ | | | | | | | | Added authentiq provider to tests and updated documentation, gem and config file. See merge request !12952
| * Added authentiq provider to tests and updated documentation, gem and config ↵Alexandros Keramidas2017-07-181-3/+3
| | | | | | | | file.
* | Merge branch '33949-remove-healthcheck-access-token' into 'master'Sean McGivern2017-07-111-2/+7
|\ \ | |/ |/| | | | | | | | | Remove the need to use health check token by adding ability to whitelist hosts Closes #33949 See merge request !12612
| * Merge prometheus unicorn sampler settigns within monitoring settingsPawel Chojnacki2017-07-051-4/+2
| |
| * Bring back healthcheck token access to monitoring resources, but mark this ↵Pawel Chojnacki2017-07-051-1/+2
| | | | | | | | as deprecated
| * Remove the need to use health check tokenPawel Chojnacki2017-07-051-0/+6
| | | | | | | | | | in favor of whitelist that will be used to control the access to monitoring resources
* | Merge branch '34737-authentiq-oauth-feature-spec' into 'master'Douwe Maan2017-07-071-1/+4
|\ \ | | | | | | | | | | | | | | | | | | Test logging in via the Authentiq OAuth provider in a feature spec Closes #34737 See merge request !12694
| * | Test logging in via the Authentiq OAuth provider in a feature spec.34737-authentiq-oauth-feature-specTimothy Andrew2017-07-071-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - The `migration:path-pg` build was previously failing when the Authentiq feature spec was enabled by placing Authentiq configuration in the `test` section of `gitlab.yml` - The `migration:path-pg` task checks out an old revision of the codebase (`v8.14.10`) and runs a `schema:load`. It then checks out the commit under test, and runs `db:migrate`, to verify that migrations run without errors. - The problem here is that `v8.14.10` does not have the Authentiq module installed, but is run with the `gitlab.yml` for `master`, which would contain the `Authentiq` configuration in the `test` section. - The solution was to use the `v8.14.10` `gitlab.yml` for the `schema:load`, rather than the `gitlab.yml` from master.
* | | Merge branch 'gitaly-mandatory' into 'master'Sean McGivern2017-07-071-4/+0
|\ \ \ | |/ / |/| | | | | | | | Remove option to disable Gitaly in Rails See merge request !12677
| * | Remove option to disable Gitaly completelyJacob Vosmaer2017-07-071-4/+0
| | |
* | | Merge branch '18000-remember-me-for-oauth-login' into 'master'Douwe Maan2017-07-061-0/+43
|\ \ \ | |/ / |/| | | | | | | | | | | | | | Fix `migration:path` build for "Honor the 'Remember me' parameter for OAuth-based login" Closes #34713 See merge request !12668
| * | Remove Authentiq from the OAuth login integration tests.Timothy Andrew2017-07-061-4/+0
| | | | | | | | | | | | | | | - This is causing autoload-related errors in the `migration:path` builds. We need to find a better way of testing this provider.
| * | Fix build for !11963.Timothy Andrew2017-07-061-22/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Don't use `request.env['omniauth.params']` if it isn't present. - Remove the `saml` section from the `gitlab.yml` test section. Some tests depend on this section not being initially present, so it can be overridden in the test. This MR doesn't add any tests for SAML, so we didn't really need this in the first place anyway. - Clean up the test -> omniauth section of `gitlab.yml`
| * | Add Omniauth OAuth config to the test section of `gitlab.yml`Timothy Andrew2017-07-061-0/+66
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - I tried to get this to work by stubbing out portions of the config within the test. This didn't work as expected because Devise/Omniauth loaded before the stub could run, and the stubbed config was ignored. - I attempted to fix this by reloading Devise/Omniauth after stubbing the config. This successfully got Devise to load the stubbed providers, but failed while trying to access a route such as `user_gitlab_omniauth_authorize_path`. - I spent a while trying to figure this out (even trying `Rails.application.reload_routes!`), but nothing seemed to work. - I settled for adding this config directly to `gitlab.yml` rather than go down this path any further.
* | | Revert "Merge branch '18000-remember-me-for-oauth-login' into 'master'"revert-6df61942Sean McGivern2017-07-051-47/+0
| | | | | | | | | This reverts merge request !11963
* | | Merge branch '18000-remember-me-for-oauth-login' into 'master'Sean McGivern2017-07-051-0/+47
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | Honor the "Remember me" parameter for OAuth-based login Closes #18000 See merge request !11963
| * | Fix build for !11963.Timothy Andrew2017-07-031-22/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Don't use `request.env['omniauth.params']` if it isn't present. - Remove the `saml` section from the `gitlab.yml` test section. Some tests depend on this section not being initially present, so it can be overridden in the test. This MR doesn't add any tests for SAML, so we didn't really need this in the first place anyway. - Clean up the test -> omniauth section of `gitlab.yml`
| * | Add Omniauth OAuth config to the test section of `gitlab.yml`Timothy Andrew2017-07-031-0/+66
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - I tried to get this to work by stubbing out portions of the config within the test. This didn't work as expected because Devise/Omniauth loaded before the stub could run, and the stubbed config was ignored. - I attempted to fix this by reloading Devise/Omniauth after stubbing the config. This successfully got Devise to load the stubbed providers, but failed while trying to access a route such as `user_gitlab_omniauth_authorize_path`. - I spent a while trying to figure this out (even trying `Rails.application.reload_routes!`), but nothing seemed to work. - I settled for adding this config directly to `gitlab.yml` rather than go down this path any further.
* | Instrument Unicorn with Ruby exporterPaweł Chojnacki2017-07-041-0/+4
|/
* Enable gitaly token auth when testingJacob Vosmaer2017-06-201-0/+1
|
* Rubocop and comment fixesJacob Vosmaer2017-06-201-2/+4
|
* Pass Gitaly token on Ruby gRPC requestsJacob Vosmaer2017-06-191-0/+3
|
* Sync email address from specified omniauth providerRobin Bobbitt2017-06-071-0/+4
|
* Merge branch 'dm-gravatar-username' into 'master'Sean McGivern2017-06-011-1/+1
|\ | | | | | | | | | | | | Add username parameter to gravatar URL Closes #24472 See merge request !11741
| * Add username parameter to gravatar URLDouwe Maan2017-06-011-1/+1
| |
* | Enable Gitaly by default in GitLab 9.3Jacob Vosmaer2017-05-301-1/+1
|/
* Update gitlab.yml with default settingzj-ps-update-gitlab-ymlZ.J. van de Weg2017-05-221-1/+1
|
* Add Pipeline Schedules that supersedes experimental Trigger ScheduleZeger-Jan van de Weg2017-05-071-1/+1
|
* Merge branch 'mrchrisw-import-shell-timeout'Sean McGivern2017-05-051-0/+3
|\
| * Add configurable timeout for git fetch and clone operationsmrchrisw-import-shell-timeoutChris Wilson2017-04-271-0/+3
| | | | | | | | | | | | | | GitLab uses the import_project method in GitLab Shell, This method uses a timeout for the operation, hardcoded to 800 seconds. With this MR the timeout is now configurable in the gitlab_shell settings.
* | Make location of gitlab_workhorse_secret configurableJakub Jirutka2017-04-191-0/+5
|/ | | | | | Hard-coding location of configuration files is very bad practice. This patch applies the same approach as currently used for gitlab_shell_secret file.
* Setup and run a Gitaly server for testing if GitalyClient is enabledgitaly-testingAlejandro Rodríguez2017-04-111-2/+2
|
* Change configuration in gitlab.com as trigger_schedule_worker will perform ↵Shinya Maeda2017-04-061-1/+1
| | | | twice a day
* Rename ScheduledTrigger to TriggerSchedule. Because table structure changed.Shinya Maeda2017-04-061-1/+1
|
* Add config for workerShinya Maeda2017-04-061-0/+3
|
* Add support for Gitaly calls over TCP connectionfeature/support-grpc-calls-over-tcp-connAhmad Sherif2017-04-031-1/+1
| | | | Closes gitaly#166
* Merge branch '29843-project-subgroup-transfer' into 'security'Rémy Coutable2017-03-291-0/+2
| | | | | | Use full path for moving directories when changing namespace path See merge request !2078
* Change socket_path to gitaly_addressJacob Vosmaer2017-03-291-8/+8
|
* Add gitaly source installation instructionsJacob Vosmaer2017-03-211-1/+1
|
* Merge branch 'pages-multiple-ips-doc' into 'master' Kamil Trzciński2017-03-161-2/+2
|\ | | | | | | | | The GitLab Pages external-http and external-https arguments can be specified multiple times See merge request !9812
| * The GitLab Pages external-http and external-https arguments can be specified ↵Nick Thomas2017-03-081-2/+2
| | | | | | | | multiple times
* | Remove unused satellites configStan Hu2017-03-131-10/+0
| | | | | | | | | | Note that the old migrations depend on 1_settings.rb, so we can't quite remove those completely.
* | Merge branch 'enable-snippets-by-default' into 'master' Douwe Maan2017-03-101-1/+1
|\ \ | | | | | | | | | | | | | | | | | | Enable snippets for new projects by default Closes #28192 See merge request !9857