summaryrefslogtreecommitdiff
path: root/config/gitlab.yml.example
Commit message (Expand)AuthorAgeFilesLines
...
| * 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
* | Merge commit 'f2f58a60b76acd479e37bdbc9246ec9f9b2bea82' into object-storage-e...Kamil Trzciński2018-02-281-9/+1
|\ \ | |/
| * 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
* | Merge commit '11c67e7c2f992299ff5918ce67995b73d1e0be6d' into object-storage-e...Kamil Trzciński2018-02-281-8/+5
|\ \ | |/
| * Merge branch '34102-online-view-of-artifacts-fe' into 'master'Nick Thomas2017-10-051-0/+1
| |\
| | * 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
| * Revert "Merge branch 'revert-f2421b2b' into 'master'"revert-2f46c3a8Annabel Dunstone Gray2017-09-111-0/+7
| * Revert "Merge branch '35012-navigation-add-option-to-change-navigation-color-...revert-f2421b2bRubén Dávila2017-09-081-7/+0
* | Merge branch 'jej/lfs-object-storage' into 'master'Douwe Maan2018-02-281-1/+37
* | Merge commit 'b39d0c318921bae2e3a11df9ee6828291dad9864' into object-storage-e...Kamil Trzciński2018-02-281-7/+23
|\ \ | |/
| * 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
| * 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
* | Merge commit '5b08d59f07fc53c1e34819fac20352119d5343e6' into object-storage-e...Kamil Trzciński2018-02-281-11/+67
|\ \ | |/
| * 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 f...Alexandros Keramidas2017-07-181-3/+3
| * | Merge branch '33949-remove-healthcheck-access-token' into 'master'Sean McGivern2017-07-111-2/+7
| |\ \ | | |/ | |/|
| | * Merge prometheus unicorn sampler settigns within monitoring settingsPawel Chojnacki2017-07-051-4/+2
| | * Bring back healthcheck token access to monitoring resources, but mark this as...Pawel Chojnacki2017-07-051-1/+2
| | * Remove the need to use health check tokenPawel Chojnacki2017-07-051-0/+6
* | | Merge branch 'zj-object-store-artifacts' into 'master'Grzegorz Bizon2018-02-281-0/+8
|/ /
* | 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.34737-authentiq-oauth-feature-specTimothy Andrew2017-07-071-1/+4
* | | Merge branch 'gitaly-mandatory' into 'master'Sean McGivern2017-07-071-4/+0
|\ \ \ | |/ / |/| |
| * | 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
|\ \ \ | |/ / |/| |
| * | Remove Authentiq from the OAuth login integration tests.Timothy Andrew2017-07-061-4/+0
| * | Fix build for !11963.Timothy Andrew2017-07-061-22/+3
| * | Add Omniauth OAuth config to the test section of `gitlab.yml`Timothy Andrew2017-07-061-0/+66
* | | Revert "Merge branch '18000-remember-me-for-oauth-login' into 'master'"revert-6df61942Sean McGivern2017-07-051-47/+0
* | | Merge branch '18000-remember-me-for-oauth-login' into 'master'Sean McGivern2017-07-051-0/+47
|\ \ \ | |_|/ |/| |
| * | Fix build for !11963.Timothy Andrew2017-07-031-22/+3
View Lorry Controller Status