summaryrefslogtreecommitdiff
path: root/config/gitlab.yml.example
Commit message (Collapse)AuthorAgeFilesLines
* Add latest changes from gitlab-org/gitlab@masterogolowinski-master-patch-80898GitLab Bot2019-12-161-0/+5
|
* Add latest changes from gitlab-org/gitlab@masterGitLab Bot2019-12-101-0/+3
|
* Add latest changes from gitlab-org/gitlab@masterGitLab Bot2019-11-261-2/+2
|
* Add latest changes from gitlab-org/gitlab@masterGitLab Bot2019-11-071-6/+8
|
* Add latest changes from gitlab-org/gitlab@masterGitLab Bot2019-11-041-0/+7
|
* Add latest changes from gitlab-org/gitlab@masterGitLab Bot2019-11-011-0/+1
|
* Add latest changes from gitlab-org/gitlab@masterGitLab Bot2019-10-301-1/+1
|
* Add latest changes from gitlab-org/gitlab@masterGitLab Bot2019-10-161-0/+6
|
* Add latest changes from gitlab-org/gitlab@masterGitLab Bot2019-10-081-2/+1
|
* Add latest changes from gitlab-org/gitlab@masterGitLab Bot2019-10-041-1/+23
|
* Add latest changes from gitlab-org/gitlab@masterGitLab Bot2019-09-161-0/+4
|
* Backport of ee/15773: Allow SmartCard authentication to use SAN extensionsSebastián Arcila Valenzuela2019-09-121-0/+4
|
* Enable JSON logs for Sidekiq by defaultStan Hu2019-09-091-1/+1
| | | | | JSON logs include arguments by default, and they're easier to parse/filter.
* Add skeleton Pages internal API61927-skeleton-pages-internal-apiKrasimir Angelov2019-09-061-0/+3
| | | | | | | Basic `/internal/pages` endpoint that will be used for Pages virtual domains internal API. The endpoint is currently behind feature flag and provides authetication similar to how Workhorse is authenticating with the GitLab.
* Add note to gitlab.yml about Service Desk requirementWinnie Hellmann2019-09-041-0/+1
|
* Add Notification secret into gitlab.yml.templateValery Sizov2019-09-031-0/+1
|
* Update docs and comments about saml with allow_bypass_two_factordodocat2019-08-271-0/+8
| | | | allow_bypass_two_factor configration dose not work with saml provider
* Enable CSP in gitlab.yml.exampleenable-csp-in-dev-and-ci-ceHeinrich Lee Yu2019-08-221-5/+26
| | | | This enables CSP in dev and CI
* Fix typo in Content Security Policy exampleJ0WI2019-08-221-1/+1
|
* feat: SMIME signed notification emailsDiego Louzán2019-08-201-0/+9
| | | | | | - Add mail interceptor the signs outgoing email with SMIME - Add lib and helpers to work with SMIME data - New configuration params for setting up SMIME key and cert files
* Add support for Content-Security-PolicyStan Hu2019-08-071-0/+23
| | | | | | | | | | | | | | | | | | | | A nonce-based Content-Security-Policy thwarts XSS attacks by allowing inline JavaScript to execute if the script nonce matches the header value. Rails 5.2 supports nonce-based Content-Security-Policy headers, so provide configuration to enable this and make it work. To support this, we need to change all `:javascript` HAML filters to the following form: ``` = javascript_tag nonce: true do :plain ... ``` We use `%script` throughout our HAML to store JSON and other text, but since this doesn't execute, browsers don't appear to block this content from being used and require the nonce value to be present.
* Backport of https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/3809ce-docker_image_replicationValery Sizov2019-08-011-0/+5
| | | | Introducing Docker Registry replication
* Backport of https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/14597ce-docker_image_replication-event-generationValery Sizov2019-07-241-0/+9
| | | | | This is the first part of Docker Registry replication for secondary Geo node.
* Don't use transactions and exceptionsReuben Pereira2019-07-161-0/+13
| | | | Instead return error objects.
* CE-EE parity for shared config filesRobert Speicher2019-07-091-0/+3
| | | | | This copies over EE-specific changes to shared configuration files in CE.
* Replace 'JIRA' with 'Jira'Takuya Noguchi2019-06-281-1/+1
| | | | | | https://community.atlassian.com/t5/Jira-questions/Is-it-quot-JIRA-quot-or-quot-Jira-quot/qaq-p/681163 Signed-off-by: Takuya Noguchi <takninnovationresearch@gmail.com>
* Backport gitlab.yml.example from EEconfig-yaml-differencesYorick Peterse2019-06-201-1/+197
| | | | | | | | To make this happen, we need to conditionally add the group_saml strategy when running tests, but only on EE. This requires some changes to Gitlab.ee? so that it can be used before/without loading the Rails environment. We also have to change how we require a few files, so this can run outside of Rails.
* Add Puma samplerJan Provaznik2019-05-291-0/+2
| | | | | This sampler gathers Puma-specific metrics which can be used by Prometheus then.
* Expain usage of `artifacts_server` in `gitlab.yml`explain-artifacts-server-configuration-docsKrasimir Angelov2019-05-101-1/+1
| | | | | | Add comment to clarify intended usage of `artifacts_server`. Related to https://gitlab.com/gitlab-org/gitlab-ce/issues/49475.
* Remove from providers with iconGosia Ksionek2019-05-071-0/+4
| | | | | | Remove puts Remove puts
* Allow Sentry client-side DSN to be passed on gitlab.ymlDouglas Barbosa Alexandre2019-05-011-0/+1
|
* feat: allow Sentry configuration to be passed on gitlab.ymlRoger Meier2019-04-301-0/+7
|
* Add doc link to omnibus for changing gitlab.ymlDmitriy Zaporozhets2019-04-101-1/+2
|
* Allow external diffs to be used conditionallyNick Thomas2019-03-271-0/+8
| | | | | | | | | | Since external diffs are likely to be a bit slower than in-database ones, add a mode that makes diffs external after they've been obsoleted by events. This should strike a balance between performance and disk space. A background cron drives the majority of migrations, since diffs become outdated through user actions.
* Integrate Gitlab::Keys with Gitlab::ShellPatrick Bajao2019-03-191-0/+2
| | | | | | | | | | | In this commit, some methods that aren't being used are removed from `Gitlab::Shell`. They are the ff: - `#remove_keys_not_found_in_db` - `#batch_read_key_ids` - `#list_key_ids` The corresponding methods in `Gitlab::Keys` have been removed as well.
* Update packages comment in gitlab.yml.example [ci skip]Dmitriy Zaporozhets2019-03-071-1/+1
|
* Allow raw `tls_options` to be passed in LDAP configurationDrew Blessing2019-03-041-15/+50
| | | | | | | We've previously exposed ca_file and ssl_version but there are many possible options that can be used inside tls_options. Instead of exposing individual ones, simply expose the entire hash so it can be passed in and we won't have to add things in the future.
* Prepare test suite for switch to Gitaly-embedded Git hooksJacob Vosmaer2019-02-271-2/+0
|
* Allow MR diffs to be placed into an object storeNick Thomas2019-02-051-0/+29
|
* Add SSE-C key configuration option for Amazon S3 remote backupsPepijn Van Eeckhoudt2019-01-091-0/+4
|
* Merge remote-tracking branch 'origin/master' into support-gitaly-tlsAhmad Hassan2018-12-111-8/+11
|\
| * Support RSA and ECDSA algorithms in Omniauth JWTMichael Tsyganov2018-12-051-8/+8
| | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * Add config to disable impersonationImre Farkas2018-11-291-0/+3
| | | | | | | | | | | | | | | | Adds gitlab.impersonation_enabled config option defaulting to true to keep the current default behaviour. Only the act of impersonation is modified, impersonation token management is not affected.
* | Merge remote-tracking branch 'origin/master' into support-gitaly-tlsAhmad Hassan2018-11-151-1/+5
|\ \ | |/
| * Merge branch 'dz-add-packages-to-yml' into 'master'Marin Jankovski2018-11-061-0/+4
| |\ | | | | | | | | | | | | Add packages section to CE config file See merge request gitlab-org/gitlab-ce!22151
| | * Add packages section to CE config filedz-add-packages-to-ymlDmitriy Zaporozhets2018-10-051-0/+4
| | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | Fix typos in comments and specsGeorge Tsiolis2018-11-011-1/+1
| | |
* | | Add documentation for tls gitalyAhmad Hassan2018-11-021-1/+1
|/ /
* | Remove broken git storage for testingZeger-Jan van de Weg2018-10-231-3/+0
| | | | | | | | | | | | | | | | | | | | | | Broken storage used to be used to test situations where the Git storage wasn't being reached. These days we can just mock the Gitaly response. But given the broken storage is removed now, Gitaly can take over control of the storage being reachable. If it's not, Gitaly won't boot. That's nice for situations where a disk wasn't mounted for instance. Gitaly MR: https://gitlab.com/gitlab-org/gitaly/merge_requests/675
* | Make GitLab pages support access controlTuomo Ala-Vannesluoma2018-10-051-0/+1
|/