Commit Graph

495 Commits

Author SHA1 Message Date
GitLab Bot 39fa7d1eeb Add latest changes from gitlab-org/gitlab@master 2020-03-27 12:07:43 +00:00
GitLab Bot 1363ca12f1 Add latest changes from gitlab-org/gitlab@master 2020-03-18 12:09:13 +00:00
GitLab Bot dd4bee69b7 Add latest changes from gitlab-org/gitlab@master 2020-03-12 21:09:45 +00:00
GitLab Bot a210c43e0a Add latest changes from gitlab-org/gitlab@master 2020-03-11 15:09:37 +00:00
GitLab Bot 219eead23f Add latest changes from gitlab-org/gitlab@master 2020-03-10 18:08:17 +00:00
GitLab Bot 9c1fa86a6a Add latest changes from gitlab-org/gitlab@master 2020-03-01 09:07:42 +00:00
GitLab Bot e144369009 Add latest changes from gitlab-org/gitlab@master 2020-02-14 00:09:07 +00:00
GitLab Bot e4dffdfe36 Add latest changes from gitlab-org/gitlab@master 2020-02-13 18:09:00 +00:00
GitLab Bot e43077ab47 Add latest changes from gitlab-org/gitlab@master 2020-02-07 15:09:52 +00:00
GitLab Bot 79cbe31b18 Add latest changes from gitlab-org/gitlab@master 2020-02-05 03:08:49 +00:00
GitLab Bot c8f773a859 Add latest changes from gitlab-org/gitlab@master 2020-01-30 21:08:47 +00:00
GitLab Bot be3e24ea3c Add latest changes from gitlab-org/gitlab@master 2020-01-22 12:08:40 +00:00
GitLab Bot 9044365a91 Add latest changes from gitlab-org/gitlab@master 2020-01-15 15:08:32 +00:00
GitLab Bot a5ab3467a7 Add latest changes from gitlab-org/gitlab@master 2020-01-13 15:07:53 +00:00
GitLab Bot 045c0f9554 Add latest changes from gitlab-org/gitlab@master 2020-01-06 12:07:56 +00:00
GitLab Bot d10a462fed Add latest changes from gitlab-org/gitlab@master 2019-12-16 12:07:43 +00:00
GitLab Bot cfc792b9ca Add latest changes from gitlab-org/gitlab@master 2019-12-10 07:53:40 +00:00
GitLab Bot 68d3f33d51 Add latest changes from gitlab-org/gitlab@master 2019-11-26 15:06:50 +00:00
GitLab Bot 90a06a20be Add latest changes from gitlab-org/gitlab@master 2019-11-07 15:06:33 +00:00
GitLab Bot aa542224bb Add latest changes from gitlab-org/gitlab@master 2019-11-04 15:07:36 +00:00
GitLab Bot 8078bd185f Add latest changes from gitlab-org/gitlab@master 2019-11-01 00:06:02 +00:00
GitLab Bot 0f0a8be306 Add latest changes from gitlab-org/gitlab@master 2019-10-30 21:07:58 +00:00
GitLab Bot 00c78fb814 Add latest changes from gitlab-org/gitlab@master 2019-10-16 15:06:17 +00:00
GitLab Bot 77a7772c3b Add latest changes from gitlab-org/gitlab@master 2019-10-08 09:06:09 +00:00
GitLab Bot 535d167d40 Add latest changes from gitlab-org/gitlab@master 2019-10-04 06:06:05 +00:00
GitLab Bot d2798d607e Add latest changes from gitlab-org/gitlab@master 2019-09-16 12:06:26 +00:00
Sebastián Arcila Valenzuela ca2123429e Backport of ee/15773: Allow SmartCard authentication to use SAN extensions 2019-09-12 00:50:17 +00:00
Stan Hu 6ecdd49cf9 Enable JSON logs for Sidekiq by default
JSON logs include arguments by default, and they're easier to
parse/filter.
2019-09-09 14:43:18 -07:00
Krasimir Angelov 477ba2b346 Add skeleton Pages internal API
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.
2019-09-06 16:06:25 +12:00
Winnie Hellmann 305159ff32 Add note to gitlab.yml about Service Desk requirement 2019-09-04 14:23:08 +00:00
Valery Sizov 751adb7941 Add Notification secret into gitlab.yml.template 2019-09-03 23:08:19 +00:00
dodocat 6e2032f24e Update docs and comments about saml with allow_bypass_two_factor
allow_bypass_two_factor configration dose not work with saml provider
2019-08-27 03:46:32 +00:00
Heinrich Lee Yu 92005fb70f Enable CSP in gitlab.yml.example
This enables CSP in dev and CI
2019-08-22 11:10:33 -07:00
J0WI 47c3abdfd0 Fix typo in Content Security Policy example 2019-08-22 14:18:10 +00:00
Diego Louzán 0dcb9d21ef feat: SMIME signed notification emails
- 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
2019-08-20 16:13:32 +02:00
Stan Hu 5fbbd3dd6e
Add support for Content-Security-Policy
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.
2019-08-07 12:37:31 +10:00
Valery Sizov f519a4b72f Backport of https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/3809
Introducing Docker Registry replication
2019-08-01 20:38:07 +03:00
Valery Sizov 1902d9cc74 Backport of https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/14597
This is the first part of Docker Registry replication
    for secondary Geo node.
2019-07-24 17:56:48 +03:00
Reuben Pereira 0d84010d1c Don't use transactions and exceptions
Instead return error objects.
2019-07-16 19:20:43 +00:00
Robert Speicher db04a18d7d
CE-EE parity for shared config files
This copies over EE-specific changes to shared configuration files in
CE.
2019-07-09 12:13:21 -05:00
Takuya Noguchi af5da7564e Replace 'JIRA' with 'Jira'
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>
2019-06-28 13:25:56 +00:00
Yorick Peterse 0e41564762
Backport gitlab.yml.example from EE
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.
2019-06-20 14:51:49 +02:00
Jan Provaznik a5adc6a024 Add Puma sampler
This sampler gathers Puma-specific metrics which can be used by
Prometheus then.
2019-05-29 12:27:44 +00:00
Krasimir Angelov 8a8caff4ef Expain usage of `artifacts_server` in `gitlab.yml`
Add comment to clarify intended usage of `artifacts_server`.

Related to https://gitlab.com/gitlab-org/gitlab-ce/issues/49475.
2019-05-10 10:57:20 +12:00
Gosia Ksionek a4cf01f32e Remove from providers with icon
Remove puts

Remove puts
2019-05-07 13:51:34 +00:00
Douglas Barbosa Alexandre 6627efd6b4
Allow Sentry client-side DSN to be passed on gitlab.yml 2019-05-01 15:23:11 -03:00
Roger Meier aebb2f7025 feat: allow Sentry configuration to be passed on gitlab.yml 2019-04-30 18:10:57 +02:00
Dmitriy Zaporozhets 67b2e04f24 Add doc link to omnibus for changing gitlab.yml 2019-04-10 12:09:25 +00:00
Nick Thomas 0e831b0b69
Allow external diffs to be used conditionally
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.
2019-03-27 16:51:33 +00:00
Patrick Bajao 26dadbc9c4 Integrate Gitlab::Keys with Gitlab::Shell
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.
2019-03-19 11:16:21 +00:00