summaryrefslogtreecommitdiff
path: root/config/gitlab.yml.example
Commit message (Collapse)AuthorAgeFilesLines
* 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
| | |
| * | Merge branch 'rs-archive-cache-worker-cron' into 'master' Dmitriy Zaporozhets2016-04-131-0/+3
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | Move RepositoryArchiveCacheWorker to sidekiq-cron Closes #15105 See merge request !3663
| | * | Move RepositoryArchiveCacheWorker to sidekiq-cronrs-archive-cache-worker-cronRobert Speicher2016-04-121-0/+3
| | |/ | | | | | | | | | Closes #15105
| * | Add changelog entries, install docs, and gitlab.yml.example entry for the ↵DJ Mountney2016-04-121-0/+9
| |/ | | | | | | trusted_proxies setting
* | Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into auto-fsckJacob Vosmaer2016-04-121-1/+4
|\ \ | |/
| * Remove dumb debug statement and add many tests.Jacob Schatz2016-04-071-1/+1
| |
| * Added documentationPatricio Cano2016-04-061-0/+1
| |
| * Config examplesPatricio Cano2016-04-041-0/+2
| |
* | Rename almost all the thingsJacob Vosmaer2016-04-061-1/+1
| |
* | Rebase repo check MRJacob Vosmaer2016-04-041-0/+7
|/
* Improve and finish the fallback to the In-Reply-To and References header for ↵2364-fallback-to-in-reply-to-headerRémy Coutable2016-03-251-1/+1
| | | | | | | | | | | | | | | | the reply-by-email feature A few things to note: - The IncomingEmail feature is now enabled even without a correctly-formatted sub-address - Message-ID for new thread mail are kept the same so that subsequent notifications to this thread are grouped in the thread by the email service that receives the notification (i.e. In-Reply-To of the answer == Message-ID of the first thread message) - To maximize our chance to be able to retrieve the reply key, we look for it in the In-Reply-To header and the References header - The pattern for the fallback reply message id is "reply-[key]@[gitlab_host]" - Improve docs thanks to Axil
* Added omniauth-auth0 Gem + Applicable Documentation.Daniel Carraro2016-03-161-0/+6
|
* Document true/false as supported value.saml-decouplingDouwe Maan2016-02-191-2/+2
|
* Decouple SAML authentication from the default Omniauth logicPatricio Cano2016-02-181-2/+9
|
* Revert "Merge branch 'saml-decoupling' into 'master' "Douwe Maan2016-02-181-9/+2
| | | | | This reverts commit c04e22fba8d130a58f498ff48127712d7dae17ee, reversing changes made to 0feab326d52222dc0ab5bd0a6b15dab297f44aa9.
* Decouple SAML authentication from the default Omniauth logicPatricio Cano2016-02-181-2/+9
|
* Fix typos and grammarAchilleas Pipinellis2016-02-101-1/+2
| | | | [ci skip]
* Edit configuration files for relative URL supportAchilleas Pipinellis2016-02-091-2/+5
| | | | [ci skip]
* Optimize LDAP and add a search timeoutDrew Blessing2016-01-111-0/+5
|
View Lorry Controller Status