Commit Graph

467 Commits

Author SHA1 Message Date
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
Dmitriy Zaporozhets c4c4f3f393 Update packages comment in gitlab.yml.example [ci skip] 2019-03-07 15:37:10 +00:00
Drew Blessing f6350faca1 Allow raw `tls_options` to be passed in LDAP configuration
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.
2019-03-04 10:27:43 -06:00
Jacob Vosmaer 078f11a6b9 Prepare test suite for switch to Gitaly-embedded Git hooks 2019-02-27 10:58:21 +00:00
Nick Thomas f9e41d0d85
Allow MR diffs to be placed into an object store 2019-02-05 14:12:48 +00:00
Pepijn Van Eeckhoudt 1b3ffdf250 Add SSE-C key configuration option for Amazon S3 remote backups 2019-01-09 16:39:20 +00:00
Ahmad Hassan dfc54352c0 Merge remote-tracking branch 'origin/master' into support-gitaly-tls 2018-12-11 16:48:26 +02:00
Michael Tsyganov a009381380
Support RSA and ECDSA algorithms in Omniauth JWT
Signed-off-by: Rémy Coutable <remy@rymai.me>
2018-12-05 18:17:40 +01:00
Imre Farkas bd3a484032
Add config to disable impersonation
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.
2018-11-29 09:37:16 +01:00
Ahmad Hassan 73b3da73d6 Merge remote-tracking branch 'origin/master' into support-gitaly-tls 2018-11-15 16:19:09 +02:00
Marin Jankovski d79828ec5a Merge branch 'dz-add-packages-to-yml' into 'master'
Add packages section to CE config file

See merge request gitlab-org/gitlab-ce!22151
2018-11-06 15:05:44 +00:00
Ahmad Hassan ebc174e968 Add documentation for tls gitaly 2018-11-02 10:37:46 +02:00
George Tsiolis 733ae94921 Fix typos in comments and specs 2018-11-01 08:59:20 +02:00
Zeger-Jan van de Weg 08cdf65b9e
Remove broken git storage for testing
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
2018-10-23 10:36:47 +02:00
Dmitriy Zaporozhets 9a13c250af
Add packages section to CE config file
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2018-10-05 17:34:05 +02:00
Tuomo Ala-Vannesluoma c84b60b164 Make GitLab pages support access control 2018-10-05 13:41:11 +00:00
Marcel Amirault 6876c7afa8 Fix grammar (setup to set-up) in code comments, spec, views, etc. 2018-09-17 09:17:33 +00:00
Nick Thomas b4dc492123
Enable omniauth by default 2018-09-13 13:44:04 +01:00
Samuele Kaplun c6cfc369db Fix closing issue default pattern
* (Suf)fix #51085 :-)

Signed-off-by: Samuele Kaplun <kaplun@protonmail.com>
2018-09-06 16:00:12 +02:00
Shinya Maeda 79e6535a67 Add ci_archive_traces_cron_worker configuration to gitlab.yml.example 2018-08-16 14:25:44 +00:00
Balasankar "Balu" C 71a24a82bf
Fix theme index to match reality 2018-07-23 12:35:32 +05:30
Rémy Coutable 70b3fde640 Merge branch 'rjh/additional-options-for-s3-compatible-hosts' into 'master'
Add options to adjust signed url creation for Object Storage to use older signature if needed.

See merge request gitlab-org/gitlab-ce!18719
2018-07-09 07:16:43 +00:00
Stan Hu e4cb3ce654 Fix spelling: Uncommment -> Uncomment 2018-06-27 20:30:57 +00:00
Richard Hancock e5553ce6f0 Update gitlab.yml.example 2018-06-07 14:07:57 +00:00
Annabel Gray 164dbc6b77 Resolve "Introduce new navigation themes in GitLab 11.0" 2018-06-07 07:37:02 +00:00
Richard Hancock efcd52e29c Correcting spelling mistake. 2018-05-04 12:48:16 +00:00
Richard J Hancock d16bc63582
Added options related to signed url creation to work with servcies that do not support V4 of the signature. 2018-05-03 10:09:40 -05:00
Douwe Maan fa7b98d508 Merge branch 'add-jwt-strategy-to-gitlab-suite' into 'master'
Ports omniauth-jwt gem onto GitLab OmniAuth Strategies suite

See merge request gitlab-org/gitlab-ce!18580
2018-04-30 08:52:55 +00:00
Alessio Caiazza 5794b1caf6
Fix example config miss-alignment in uploads.object_store.connection 2018-04-27 16:15:45 +02:00