summaryrefslogtreecommitdiff
path: root/config/gitlab.yml.example
Commit message (Collapse)AuthorAgeFilesLines
* Enable snippets for new projects by defaultenable-snippets-by-defaultSean McGivern2017-03-101-1/+1
| | | | | If there is an existing gitlab.yml file with snippets explicitly disabled, they won't be enabled with this change.
* Merge branch '28447-hybrid-repository-storages' into 'master' Sean McGivern2017-03-071-2/+4
|\ | | | | | | | | Update storage settings to allow extra values per shard See merge request !9597
| * Update storage settings to allow extra values per shard28447-hybrid-repository-storagesAlejandro Rodríguez2017-03-031-2/+4
| | | | | | | | | | | | | | This will be necessary when adding gitaly settings. This version doesn't make any functional changes, but allows us to include this breaking change in 9.0 and add the needed extra settings in the future with backwards compatibility
* | Merge branch '24998-fix-typo-gitlab-config-file' into 'master' Rémy Coutable2017-03-061-1/+1
|\ \ | | | | | | | | | | | | | | | | | | Fix typo in Gitlab application config file Closes #24998 See merge request !9702
| * | Fix typo in Gitlab application config filemedied2017-03-041-1/+1
| |/
* | Merge branch 'backup_storage_class' into 'master' Rémy Coutable2017-03-061-0/+2
|\ \ | | | | | | | | | | | | Add storage class configuration option for Amazon S3 remote backups See merge request !9599
| * | Add storage class configuration option for Amazon S3 remote backupsJon Keys2017-02-281-0/+2
| |/
* | Renable StuckCiBuildsWorker to StucjCiJobsWorker27523-make-stuck-build-detection-more-performantTomasz Maczukin2017-03-031-2/+2
| |
* | Update default configuration of stuck_ci_builds_worker cron intervalTomasz Maczukin2017-03-011-1/+1
|/
* Remove all instances of theme_id; require downtimeAnnabel Dunstone Gray2017-02-151-1/+1
|
* Drop theme ID from users tableAnnabel Dunstone Gray2017-02-151-8/+0
|
* Merge branch 'master' into 'jej-pages-to-ce'jej-pages-to-ceJames Edwards-Jones2017-02-061-0/+10
|\ | | | | | | # Conflicts: # db/schema.rb
| * add rack middleware to proxy webpack dev serverMike Greiling2017-02-011-0/+10
| |
* | Final fixesKamil Trzcinski2017-01-311-2/+2
| |
* | Implement extra domains and save pages configurationKamil Trzcinski2017-01-311-0/+2
| |
* | Change pages domain to hostKamil Trzcinski2017-01-311-1/+1
| |
* | Support https and custom port for pagesKamil Trzcinski2017-01-311-0/+2
| |
* | Add GitLab PagesKamil Trzcinski2017-01-311-0/+11
|/ | | | | | | | | | | | | | | | - The pages are created when build artifacts for `pages` job are uploaded - Pages serve the content under: http://group.pages.domain.com/project - Pages can be used to serve the group page, special project named as host: group.pages.domain.com - User can provide own 403 and 404 error pages by creating 403.html and 404.html in group page project - Pages can be explicitly removed from the project by clicking Remove Pages in Project Settings - The size of pages is limited by Application Setting: max pages size, which limits the maximum size of unpacked archive (default: 100MB) - The public/ is extracted from artifacts and content is served as static pages - Pages asynchronous worker use `dd` to limit the unpacked tar size - Pages needs to be explicitly enabled and domain needs to be specified in gitlab.yml - Pages are part of backups - Pages notify the deployment status using Commit Status API - Pages use a new sidekiq queue: pages - Pages use a separate nginx config which needs to be explicitly added
* Merge branch 'zj-mattermost-slash-config' into 'master' Kamil Trzciński2016-12-211-1/+1
|\ | | | | | | | | | | | | Mattermost slash auto config Closes #24769 See merge request !8070
| * Merge branch 'master' into 'zj-mattermost-slash-config'Zeger-Jan van de Weg2016-12-181-3/+4
| |\ | | | | | | | | | | | | | | | # Conflicts: # config/gitlab.yml.example # lib/mattermost/session.rb # spec/lib/mattermost/session_spec.rb
| * | Base work for auto config MM slash commandsZ.J. van de Weg2016-12-161-0/+5
| | |
* | | Added support for Authentiq oauth providerAlex2016-12-211-0/+10
| |/ |/|
* | Store mattermost_url in settingsKamil Trzcinski2016-12-171-0/+6
|/
* Add idle_timeout to reply by email doc.Marin Jankovski2016-11-161-1/+1
|
* Make mail_room idle_timeout option configurable.Marin Jankovski2016-11-161-0/+2
|
* Update gitlab.yml.exampleElan Ruusamäe2016-11-021-1/+3
|
* Finish updates to use JIRA gemFelipe Artur2016-10-261-0/+4
| | | | Code improvements, bug fixes, finish documentation and specs
* Merge branch 'docs/refactor-reply-by-email' into 'master' Achilleas Pipinellis2016-10-111-1/+1
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move reply by email docs to a new location ## What does this MR do? Move reply by email docs to a new location. Part of https://gitlab.com/gitlab-org/gitlab-ce/issues/3349 ## Moving docs to a new location? See the guidelines: http://docs.gitlab.com/ce/development/doc_styleguide.html#changing-document-location - [ ] Make sure the old link is not removed and has its contents replaced with a link to the new location. - [ ] Make sure internal links pointing to the document in question are not broken. - [ ] Search and replace any links referring to old docs in GitLab Rails app, specifically under the `app/views/` directory. - [ ] If working on CE, submit an MR to EE with the changes as well. See merge request !6517
| * Move reply by email docs to a new locationdocs/refactor-reply-by-emailAchilleas Pipinellis2016-09-251-1/+1
| | | | | | | | [ci skip]
* | add configurable email subject suffixFu Xu2016-10-031-0/+1
|/
* Update default path for repository_downloads_path in gitlab.yml.exampleDouglas Barbosa Alexandre2016-07-211-2/+2
|
* Refactor repository paths handling to allow multiple git mount pointsAlejandro Rodríguez2016-06-291-4/+10
|
* Move keep to ArtifactsControllerKamil Trzcinski2016-06-131-2/+2
|
* Allow to expire build artifactsKamil Trzcinski2016-06-131-0/+3
|
* Fix incorrect registry key valueAchilleas Pipinellis2016-06-101-1/+1
| | | | Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/18441
* Add proper config values for Registry in gitlab.ymlAchilleas Pipinellis2016-05-221-4/+4
|
* Bring back path to registry settingsKamil Trzcinski2016-05-161-0/+1
|
* Bring back port to registry configurationKamil Trzcinski2016-05-161-1/+2
|
* Simplify registry configurationKamil Trzcinski2016-05-141-3/+1
|
* Remove unused partsKamil Trzcinski2016-05-091-1/+0
|
* Rename `images` to `container_registry`Kamil Trzcinski2016-05-091-0/+1
|
* Merge remote-tracking branch 'origin/master' into docker-registryKamil Trzcinski2016-05-091-1/+0
|\
| * Use the new admin settings for gravatarArtem Sidorenko2016-05-041-1/+0
| |
* | Auth tokenKamil Trzcinski2016-04-291-0/+10
|/
* Merge branch 'admin-email-frequency' into 'master' Jacob Vosmaer2016-04-281-2/+2
|\ | | | | | | | | | | | | | | | | Send 'admin emails' weekly, not daily Daily seems to be to spammy, so let's default to weekly instead. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/15520 See merge request !3923
| * Send 'admin emails' weekly, not dailyJacob Vosmaer2016-04-261-2/+2
| | | | | | | | Daily seems to be to spammy, so let's default to weekly instead.
* | Backport GitHub Enterprise import support from EEStan Hu2016-04-261-0/+2
|/ | | | | | | | | | These changes were pulled from GitLab EE to support configuring an alternative API URL than the default https://api.github.com. In addition, the `verify_ssl` flag allows users to disable SSL cert checking. One modification: add a default `args` option if it does not exist to avoid breaking existing configurations.
* Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into auto-fsckJacob Vosmaer2016-04-131-0/+19
|\
| * Merge branch 'external-omniauth-providers' into 'master' Marin Jankovski2016-04-131-0/+7
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow Omniauth providers to be marked as external Related to #4009 With this MR we will be able to allow the user to set which Omniauth Providers they would like to have as external. All users login in via these providers will be marked as external, even if they already had an account before. If the provider is removed form the list of external providers, the users will be marked as internal at their next login. MR for Omnibus: gitlab-org/omnibus-gitlab!727 /cc @dblessing @DouweM See merge request !3657
| | * Documentation of featurePatricio Cano2016-04-111-0/+7
| | |