Commit Graph

317 Commits

Author SHA1 Message Date
Stan Hu 29c5b31c19 Remove unused satellites config
Note that the old migrations depend on 1_settings.rb, so we can't
quite remove those completely.
2017-03-13 22:16:29 -07:00
Douwe Maan c17f260473 Merge branch 'enable-snippets-by-default' into 'master'
Enable snippets for new projects by default

Closes #28192

See merge request !9857
2017-03-10 15:56:59 +00:00
Jacob Vosmaer 543a68cfb5 Document gitaly.socket_path setting 2017-03-10 15:03:56 +01:00
Sean McGivern 16475bede7 Enable snippets for new projects by default
If there is an existing gitlab.yml file with snippets explicitly
disabled, they won't be enabled with this change.
2017-03-10 13:09:24 +00:00
Sean McGivern a5db7f5425 Merge branch '28447-hybrid-repository-storages' into 'master'
Update storage settings to allow extra values per shard

See merge request !9597
2017-03-07 16:55:03 +00:00
Rémy Coutable 354272460a Merge branch '24998-fix-typo-gitlab-config-file' into 'master'
Fix typo in Gitlab application config file

Closes #24998

See merge request !9702
2017-03-06 18:13:45 +00:00
Rémy Coutable 8526c9f3c4 Merge branch 'backup_storage_class' into 'master'
Add storage class configuration option for Amazon S3 remote backups

See merge request !9599
2017-03-06 17:42:30 +00:00
medied c71825d9ca Fix typo in Gitlab application config file 2017-03-04 11:53:05 -08:00
Alejandro Rodríguez 0b9d56f960 Update storage settings to allow extra values per shard
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
2017-03-03 12:13:30 -03:00
Tomasz Maczukin 4d4e99a2f1
Renable StuckCiBuildsWorker to StucjCiJobsWorker 2017-03-03 00:43:39 +01:00
Tomasz Maczukin a4e996d773
Update default configuration of stuck_ci_builds_worker cron interval 2017-03-01 13:29:52 +01:00
Jon Keys 7a7ec1ac0f Add storage class configuration option for Amazon S3 remote backups 2017-02-28 16:30:58 -05:00
Annabel Dunstone Gray c780ad0e92 Remove all instances of theme_id; require downtime 2017-02-15 13:31:18 -06:00
Annabel Dunstone Gray 0667d1aa7f Drop theme ID from users table 2017-02-15 13:31:18 -06:00
James Edwards-Jones b988faaf85 Merge branch 'master' into 'jej-pages-to-ce'
# Conflicts:
#   db/schema.rb
2017-02-06 15:12:27 +00:00
Mike Greiling a2d837a371 add rack middleware to proxy webpack dev server 2017-02-01 16:23:26 -06:00
Kamil Trzcinski 4d23371758 Final fixes 2017-01-31 22:53:58 +00:00
Kamil Trzcinski 13b6bad17e Implement extra domains and save pages configuration 2017-01-31 22:53:57 +00:00
Kamil Trzcinski b27371d898 Change pages domain to host 2017-01-31 22:50:40 +00:00
Kamil Trzcinski fa68e403e0 Support https and custom port for pages 2017-01-31 22:50:40 +00:00
Kamil Trzcinski 120f9abaa1 Add GitLab Pages
- 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
2017-01-31 22:50:39 +00:00
Kamil Trzciński a516478d7b Merge branch 'zj-mattermost-slash-config' into 'master'
Mattermost slash auto config

Closes #24769

See merge request !8070
2016-12-21 14:59:41 +00:00
Alex 6e186b76bb Added support for Authentiq oauth provider 2016-12-21 10:51:10 +02:00
Zeger-Jan van de Weg a9d9895dc7 Merge branch 'master' into 'zj-mattermost-slash-config'
# Conflicts:
#   config/gitlab.yml.example
#   lib/mattermost/session.rb
#   spec/lib/mattermost/session_spec.rb
2016-12-18 12:59:09 +00:00
Kamil Trzcinski e663725961 Store mattermost_url in settings 2016-12-17 10:31:14 +01:00
Z.J. van de Weg 87d160634d Base work for auto config MM slash commands 2016-12-16 12:21:09 +01:00
Marin Jankovski 04f2dd65fb Add idle_timeout to reply by email doc. 2016-11-16 12:46:37 +01:00
Marin Jankovski aa9a289ce5 Make mail_room idle_timeout option configurable. 2016-11-16 12:46:37 +01:00
Elan Ruusamäe afc465d9ec Update gitlab.yml.example 2016-11-02 00:04:54 +02:00
Felipe Artur c2d6822e94 Finish updates to use JIRA gem
Code improvements, bug fixes, finish documentation and specs
2016-10-26 15:02:16 -02:00
Achilleas Pipinellis 38978fa53f Merge branch 'docs/refactor-reply-by-email' into 'master'
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
2016-10-11 13:27:23 +00:00
Fu Xu 74c8e091f4 add configurable email subject suffix 2016-10-03 18:07:28 +08:00
Achilleas Pipinellis dffd33252f Move reply by email docs to a new location
[ci skip]
2016-09-25 11:55:14 +02:00
Douglas Barbosa Alexandre d62656b081 Update default path for repository_downloads_path in gitlab.yml.example 2016-07-21 10:31:49 -03:00
Alejandro Rodríguez 86359ec854 Refactor repository paths handling to allow multiple git mount points 2016-06-29 22:30:31 -04:00
Kamil Trzcinski ffe8dbde9b Move keep to ArtifactsController 2016-06-13 11:03:30 +01:00
Kamil Trzcinski aea4041ce9 Allow to expire build artifacts 2016-06-13 11:01:19 +01:00
Achilleas Pipinellis 0e7abb4c28 Fix incorrect registry key value
Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/18441
2016-06-10 15:53:56 +02:00
Achilleas Pipinellis 26c768b42c Add proper config values for Registry in gitlab.yml 2016-05-22 14:54:29 -05:00
Kamil Trzcinski 89644edc4e Bring back path to registry settings 2016-05-16 17:15:38 -05:00
Kamil Trzcinski 5b3ac8c83f Bring back port to registry configuration 2016-05-16 09:48:45 -05:00
Kamil Trzcinski 4f1e0014a7 Simplify registry configuration 2016-05-14 14:03:41 -05:00
Kamil Trzcinski 1dea54c220 Remove unused parts 2016-05-09 20:35:01 +03:00
Kamil Trzcinski 0094d8f196 Rename `images` to `container_registry` 2016-05-09 20:29:57 +03:00
Kamil Trzcinski 71da2e0b56 Merge remote-tracking branch 'origin/master' into docker-registry 2016-05-09 20:21:02 +03:00
Artem Sidorenko fb5682e7cd Use the new admin settings for gravatar 2016-05-04 17:45:29 +02:00
Kamil Trzcinski 72611f9cfa Auth token 2016-04-29 16:45:00 +02:00
Jacob Vosmaer aacb485535 Merge branch 'admin-email-frequency' into 'master'
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
2016-04-28 11:07:42 +00:00
Stan Hu eede032345 Backport GitHub Enterprise import support from EE
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.
2016-04-26 21:00:55 -07:00
Jacob Vosmaer 2e072034a6 Send 'admin emails' weekly, not daily
Daily seems to be to spammy, so let's default to weekly instead.
2016-04-26 11:54:37 +02:00