summaryrefslogtreecommitdiff
path: root/config/gitlab.yml.example
Commit message (Collapse)AuthorAgeFilesLines
* Add DNS verification to Pages custom domainsNick Thomas2018-02-231-0/+4
|
* Added ldap config setting to lower case usernamesFrancisco Javier López2018-02-051-0/+3
|
* port of 594e6a0a625^..f74c90f68c6Micaël Bergeron2018-02-011-0/+8
|
* Port some non-EE-specific config/ changes to CE42420-follow-up-from-resolve-asset-was-not-declared-to-be-precompiled-in-production-favicon-green-icoRémy Coutable2018-01-251-3/+3
| | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* Default to HTTPS for all Gravatar URLsdefault-to-https-for-gravatar-urlsAchilleas Pipinellis2018-01-251-3/+5
| | | | | If using gravatar.com, both plain_url and ssl_url in settings are now served via HTTPS. Make this the default.
* Make sure user email is read only when synced with LDAPDouwe Maan2017-12-151-0/+1
|
* Use tmp/test/artifacts for filesKamil Trzcinski2017-12-031-0/+2
|
* Set the default gitlab-shell timeout to 3 hoursNick Thomas2017-11-211-2/+2
|
* Fix invalid Gitaly ClientPath configgitaly-client-path-fixKim "BKC" Carlbäcker2017-11-021-1/+1
|
* Read circuitbreaker settings from `Gitlab::CurrentSettings`Bob Van Landuyt2017-10-171-8/+0
| | | | Instead of from the configuration file
* Merge branch '34102-online-view-of-artifacts-fe' into 'master'Nick Thomas2017-10-051-0/+1
|\ | | | | | | | | | | | | Add external link for online artifacts Closes #34102 See merge request gitlab-org/gitlab-ce!14399
| * Merge branch 'master' into 34102-online-view-of-artifacts-feEric Eastwood2017-10-041-1/+1
| |\
| * | Backend for HTML serving with GitLab PagesZeger-Jan van de Weg2017-10-021-0/+1
| | |
* | | Let fetch_ref pull from Gitaly instead of from diskJacob Vosmaer2017-10-041-1/+3
| |/ |/|
* | Add "implements" to the default issue closing message regexGuilherme Vieira2017-10-021-1/+1
|/
* Removed two legacy config optionsvoogsgerd/gitlab-ce-daniel-legacy-configDaniel Voogsgerd2017-09-211-6/+0
| | | | | Removed the max_size and timeout options from the git config in gitlab.yml.
* Revert "Merge branch 'revert-f2421b2b' into 'master'"revert-2f46c3a8Annabel Dunstone Gray2017-09-111-0/+7
| | | This reverts merge request !14148
* Revert "Merge branch ↵revert-f2421b2bRubén Dávila2017-09-081-7/+0
| | | | | '35012-navigation-add-option-to-change-navigation-color-palette' into 'master'" This reverts merge request !13619
* Fix specs; start on light themeAnnabel Dunstone Gray2017-09-061-1/+3
|
* Add blue themeAnnabel Dunstone Gray2017-09-061-0/+1
|
* Add functionality for two themesAnnabel Dunstone Gray2017-09-061-8/+4
|
* Restore some changes from !9199Rubén Dávila2017-09-061-1/+9
|
* Profile updates from providersAlexander Keramidas2017-09-061-3/+10
|
* Increase the timeout before aborting a storage access attemptbvl-increase-storage-check-timeoutBob Van Landuyt2017-09-041-1/+1
| | | | There are peaks of IO-wait time, most of them stay below 30 seconds.
* Default LDAP config verify_certificates to trueMichael Kozono2017-08-301-3/+2
|
* Use better higher threshold settings for storage access in testsBob Van Landuyt2017-08-161-0/+3
| | | | | | | | | | | `failure_count_threshold`: We should never need this, but we don't want to block access in tests because of this. `failure_wait_time`: Setting it to 0 now allows each storage attempt `storage_timeout`: Try a bit longer to access storage on CI in case the slow machines take a bit longer to spin up the process to perfom the check
* 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`
View Lorry Controller Status