summaryrefslogtreecommitdiff
path: root/config/gitlab.yml.example
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'rjh/additional-options-for-s3-compatible-hosts' into 'master'Rémy Coutable2018-07-091-0/+5
|\
| * Update gitlab.yml.exampleRichard Hancock2018-06-071-0/+1
| * Correcting spelling mistake.Richard Hancock2018-05-041-1/+1
| * Added options related to signed url creation to work with servcies that do no...Richard J Hancock2018-05-031-0/+4
* | Fix spelling: Uncommment -> UncommentStan Hu2018-06-271-1/+1
* | Resolve "Introduce new navigation themes in GitLab 11.0"Annabel Gray2018-06-071-3/+8
|/
* Merge branch 'add-jwt-strategy-to-gitlab-suite' into 'master'Douwe Maan2018-04-301-2/+2
|\
| * Ports omniauth-jwt gem onto GitLab OmniAuth Strategies suiteTiago Botelho2018-04-261-2/+2
* | Fix example config miss-alignment in uploads.object_store.connectionAlessio Caiazza2018-04-271-9/+9
* | Add gitlab-pages admin ping rake taskJacob Vosmaer (GitLab)2018-04-271-0/+2
|/
* Merge branch 'direct-upload-of-uploads' into 'master'Grzegorz Bizon2018-04-051-13/+15
|\
| * Allow to store uploads by default on Object Storagedirect-upload-of-uploadsKamil Trzciński2018-04-041-13/+15
* | Add support for Sidekiq JSON loggingStan Hu2018-04-041-0/+4
|/
* Merge branch 'ac/lfs-direct-upload-ee-to-ce' into 'master'Kamil Trzciński2018-03-281-3/+3
|\
| * Port LFS direct_upload from EEac/lfs-direct-upload-ee-to-ceAlessio Caiazza2018-03-271-3/+3
* | Merge branch '43512-add-support-for-omniauth-jwt-provider' into 'master'Douwe Maan2018-03-271-1/+22
|\ \ | |/ |/|
| * Adds JWT omnianuth integrationTiago Botelho2018-03-201-1/+22
* | Backport ee-40781-os-to-ceMicaël Bergeron2018-03-221-14/+12
* | Add proxy_download to perform proxied sending of all filesMicaël Bergeron2018-03-091-0/+3
* | Merge remote-tracking branch 'origin/master' into object-storage-ee-to-ce-bac...object-storage-ee-to-ce-backportKamil Trzciński2018-02-281-0/+4
|\ \ | |/
| * Add DNS verification to Pages custom domainsNick Thomas2018-02-231-0/+4
* | Merge commit '7e424eb852716495073881710e8a8851b4a4cd5a' into object-storage-e...Kamil Trzciński2018-02-281-0/+3
|\ \ | |/
| * Added ldap config setting to lower case usernamesFrancisco Javier López2018-02-051-0/+3
* | Merge commit '8af23def1d6' into object-storage-ee-to-ce-backportKamil Trzciński2018-02-281-6/+6
|\ \
| * | Revert "Merge branch '3867-port-to-ce' into 'master'"Kamil Trzciński2018-02-281-8/+0
| |/
| * 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
| * Default to HTTPS for all Gravatar URLsdefault-to-https-for-gravatar-urlsAchilleas Pipinellis2018-01-251-3/+5
* | Merge branch '4163-move-uploads-to-object-storage' into 'master'Sean McGivern2018-02-281-0/+29
* | Merge commit '4b92efd90cedaa0aff218d11fdce279701128bea' into object-storage-e...Kamil Trzciński2018-02-281-0/+1
|\ \ | |/
| * Make sure user email is read only when synced with LDAPDouwe Maan2017-12-151-0/+1
* | Merge branch 'zj-auto-upload-job-artifacts' into 'master'Kamil Trzciński2018-02-281-0/+1
* | Merge branch 'zj-multiple-artifacts-ee' into 'master'Grzegorz Bizon2018-02-281-0/+1
* | Merge commit '7fabc892f251740dbd9a4755baede662e6854870' into object-storage-e...Kamil Trzciński2018-02-281-2/+4
|\ \ | |/
| * 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
|\ \ | |/
View Lorry Controller Status