c5e4f06c59
Add latest changes from gitlab-org/gitlab@master
2021-04-29 15:10:07 +00:00
0805030d63
Add latest changes from gitlab-org/gitlab@master
2021-04-28 12:10:09 +00:00
9ea69b43c3
Add latest changes from gitlab-org/gitlab@master
2021-04-09 15:09:10 +00:00
9bc5f183df
Add latest changes from gitlab-org/gitlab@master
2021-04-07 21:09:01 +00:00
ebed39e3ce
Add latest changes from gitlab-org/gitlab@master
2021-04-06 12:09:21 +00:00
fee1014807
Add latest changes from gitlab-org/gitlab@master
2021-04-02 18:09:20 +00:00
d5d47b45dd
Add latest changes from gitlab-org/gitlab@master
2021-03-04 12:11:11 +00:00
7131f9028d
Add latest changes from gitlab-org/gitlab@master
2021-02-18 21:10:43 +00:00
6cffe9ea21
Add latest changes from gitlab-org/gitlab@master
2021-02-10 15:11:19 +00:00
3f64903c39
Add latest changes from gitlab-org/gitlab@master
2021-02-03 03:09:33 +00:00
bdf5d637da
Add latest changes from gitlab-org/gitlab@master
2021-02-02 12:10:15 +00:00
442a79b733
Add latest changes from gitlab-org/gitlab@master
2021-01-19 12:10:46 +00:00
e227f48234
Add latest changes from gitlab-org/gitlab@master
2021-01-07 12:10:24 +00:00
f2c27c6f97
Add latest changes from gitlab-org/gitlab@master
2021-01-06 12:10:58 +00:00
a060caf3db
Add latest changes from gitlab-org/gitlab@master
2021-01-05 09:10:15 +00:00
6c46be4823
Add latest changes from gitlab-org/gitlab@master
2020-12-17 03:10:36 +00:00
cba8ff6440
Add latest changes from gitlab-org/gitlab@master
2020-12-10 18:10:16 +00:00
3e06afc4cd
Add latest changes from gitlab-org/gitlab@master
2020-12-10 12:09:43 +00:00
77914793a3
Add latest changes from gitlab-org/gitlab@master
2020-12-09 00:09:42 +00:00
2ddcd634fc
Add latest changes from gitlab-org/gitlab@master
2020-11-30 21:09:16 +00:00
b8817e66c3
Add latest changes from gitlab-org/gitlab@master
2020-11-25 18:09:53 +00:00
b9033ad415
Add latest changes from gitlab-org/gitlab@master
2020-11-16 21:09:02 +00:00
a268b09416
Add latest changes from gitlab-org/gitlab@master
2020-11-06 15:09:14 +00:00
8a902a9508
Add latest changes from gitlab-org/gitlab@master
2020-10-22 03:08:25 +00:00
b58ab6c33c
Add latest changes from gitlab-org/gitlab@master
2020-10-16 18:09:04 +00:00
16515bdfcb
Add latest changes from gitlab-org/gitlab@master
2020-10-13 15:08:53 +00:00
1850d48925
Add latest changes from gitlab-org/gitlab@master
2020-10-07 18:08:34 +00:00
12ce3cc57c
Add latest changes from gitlab-org/gitlab@master
2020-09-24 18:09:51 +00:00
708ee0bcb2
Add latest changes from gitlab-org/gitlab@master
2020-09-17 18:10:12 +00:00
a66475b6be
Add latest changes from gitlab-org/gitlab@master
2020-09-11 21:08:44 +00:00
6b5f961bef
Add latest changes from gitlab-org/gitlab@master
2020-09-11 09:08:44 +00:00
c596046be9
Add latest changes from gitlab-org/gitlab@master
2020-09-10 18:08:54 +00:00
537882ad40
Add latest changes from gitlab-org/gitlab@master
2020-09-10 00:08:32 +00:00
9e68395a98
Add latest changes from gitlab-org/gitlab@master
2020-08-21 12:10:22 +00:00
b5452c76b5
Add latest changes from gitlab-org/gitlab@master
2020-08-20 00:10:11 +00:00
88ad172d04
Add latest changes from gitlab-org/gitlab@master
2020-08-05 09:10:01 +00:00
e69e3f1eb6
Add latest changes from gitlab-org/gitlab@master
2020-07-15 15:09:21 +00:00
0a319374e7
Add latest changes from gitlab-org/gitlab@master
2020-07-08 06:09:13 +00:00
a93bf027c2
Add latest changes from gitlab-org/gitlab@master
2020-07-07 15:08:49 +00:00
e173695d9b
Add latest changes from gitlab-org/gitlab@master
2020-07-03 21:09:31 +00:00
b922b2f47a
Add latest changes from gitlab-org/gitlab@master
2020-07-03 12:08:53 +00:00
a66a37ceff
Add latest changes from gitlab-org/gitlab@master
2020-07-01 09:09:30 +00:00
c61d90dbfa
Add latest changes from gitlab-org/gitlab@master
2020-06-17 15:08:36 +00:00
a64fb464b4
Add latest changes from gitlab-org/gitlab@master
2020-06-11 09:08:16 +00:00
f6905d2ed2
Add latest changes from gitlab-org/gitlab@master
2020-06-10 18:09:15 +00:00
c2879da99d
Add latest changes from gitlab-org/gitlab@master
2020-06-10 06:08:18 +00:00
d9f331328a
Add latest changes from gitlab-org/gitlab@master
2020-06-09 09:08:20 +00:00
9c3e48166e
Add latest changes from gitlab-org/gitlab@master
2020-05-28 03:08:08 +00:00
8dc1e72e2b
Add latest changes from gitlab-org/gitlab@master
2020-05-13 00:07:50 +00:00
d8803c7e40
Add latest changes from gitlab-org/gitlab@master
2020-05-07 09:09:51 +00:00
879876325f
Add latest changes from gitlab-org/gitlab@master
2020-05-03 21:09:39 +00:00
e33f87ac0f
Add latest changes from gitlab-org/gitlab@master
2020-04-21 15:21:10 +00:00
39fa7d1eeb
Add latest changes from gitlab-org/gitlab@master
2020-03-27 12:07:43 +00:00
1363ca12f1
Add latest changes from gitlab-org/gitlab@master
2020-03-18 12:09:13 +00:00
dd4bee69b7
Add latest changes from gitlab-org/gitlab@master
2020-03-12 21:09:45 +00:00
a210c43e0a
Add latest changes from gitlab-org/gitlab@master
2020-03-11 15:09:37 +00:00
219eead23f
Add latest changes from gitlab-org/gitlab@master
2020-03-10 18:08:17 +00:00
9c1fa86a6a
Add latest changes from gitlab-org/gitlab@master
2020-03-01 09:07:42 +00:00
e144369009
Add latest changes from gitlab-org/gitlab@master
2020-02-14 00:09:07 +00:00
e4dffdfe36
Add latest changes from gitlab-org/gitlab@master
2020-02-13 18:09:00 +00:00
e43077ab47
Add latest changes from gitlab-org/gitlab@master
2020-02-07 15:09:52 +00:00
79cbe31b18
Add latest changes from gitlab-org/gitlab@master
2020-02-05 03:08:49 +00:00
c8f773a859
Add latest changes from gitlab-org/gitlab@master
2020-01-30 21:08:47 +00:00
be3e24ea3c
Add latest changes from gitlab-org/gitlab@master
2020-01-22 12:08:40 +00:00
9044365a91
Add latest changes from gitlab-org/gitlab@master
2020-01-15 15:08:32 +00:00
a5ab3467a7
Add latest changes from gitlab-org/gitlab@master
2020-01-13 15:07:53 +00:00
045c0f9554
Add latest changes from gitlab-org/gitlab@master
2020-01-06 12:07:56 +00:00
d10a462fed
Add latest changes from gitlab-org/gitlab@master
2019-12-16 12:07:43 +00:00
cfc792b9ca
Add latest changes from gitlab-org/gitlab@master
2019-12-10 07:53:40 +00:00
68d3f33d51
Add latest changes from gitlab-org/gitlab@master
2019-11-26 15:06:50 +00:00
90a06a20be
Add latest changes from gitlab-org/gitlab@master
2019-11-07 15:06:33 +00:00
aa542224bb
Add latest changes from gitlab-org/gitlab@master
2019-11-04 15:07:36 +00:00
8078bd185f
Add latest changes from gitlab-org/gitlab@master
2019-11-01 00:06:02 +00:00
0f0a8be306
Add latest changes from gitlab-org/gitlab@master
2019-10-30 21:07:58 +00:00
00c78fb814
Add latest changes from gitlab-org/gitlab@master
2019-10-16 15:06:17 +00:00
77a7772c3b
Add latest changes from gitlab-org/gitlab@master
2019-10-08 09:06:09 +00:00
535d167d40
Add latest changes from gitlab-org/gitlab@master
2019-10-04 06:06:05 +00:00
d2798d607e
Add latest changes from gitlab-org/gitlab@master
2019-09-16 12:06:26 +00:00
ca2123429e
Backport of ee/15773: Allow SmartCard authentication to use SAN extensions
2019-09-12 00:50:17 +00:00
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
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
305159ff32
Add note to gitlab.yml about Service Desk requirement
2019-09-04 14:23:08 +00:00
751adb7941
Add Notification secret into gitlab.yml.template
2019-09-03 23:08:19 +00:00
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
92005fb70f
Enable CSP in gitlab.yml.example
...
This enables CSP in dev and CI
2019-08-22 11:10:33 -07:00
47c3abdfd0
Fix typo in Content Security Policy example
2019-08-22 14:18:10 +00:00
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
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
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
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
0d84010d1c
Don't use transactions and exceptions
...
Instead return error objects.
2019-07-16 19:20:43 +00:00
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
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
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
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
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
a4cf01f32e
Remove from providers with icon
...
Remove puts
Remove puts
2019-05-07 13:51:34 +00:00
6627efd6b4
Allow Sentry client-side DSN to be passed on gitlab.yml
2019-05-01 15:23:11 -03:00
aebb2f7025
feat: allow Sentry configuration to be passed on gitlab.yml
2019-04-30 18:10:57 +02:00
67b2e04f24
Add doc link to omnibus for changing gitlab.yml
2019-04-10 12:09:25 +00:00
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
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
c4c4f3f393
Update packages comment in gitlab.yml.example [ci skip]
2019-03-07 15:37:10 +00:00
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
078f11a6b9
Prepare test suite for switch to Gitaly-embedded Git hooks
2019-02-27 10:58:21 +00:00
f9e41d0d85
Allow MR diffs to be placed into an object store
2019-02-05 14:12:48 +00:00
1b3ffdf250
Add SSE-C key configuration option for Amazon S3 remote backups
2019-01-09 16:39:20 +00:00
dfc54352c0
Merge remote-tracking branch 'origin/master' into support-gitaly-tls
2018-12-11 16:48:26 +02:00
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
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
73b3da73d6
Merge remote-tracking branch 'origin/master' into support-gitaly-tls
2018-11-15 16:19:09 +02:00
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
ebc174e968
Add documentation for tls gitaly
2018-11-02 10:37:46 +02:00
733ae94921
Fix typos in comments and specs
2018-11-01 08:59:20 +02:00
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
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
c84b60b164
Make GitLab pages support access control
2018-10-05 13:41:11 +00:00
6876c7afa8
Fix grammar (setup to set-up) in code comments, spec, views, etc.
2018-09-17 09:17:33 +00:00
b4dc492123
Enable omniauth by default
2018-09-13 13:44:04 +01:00
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
79e6535a67
Add ci_archive_traces_cron_worker configuration to gitlab.yml.example
2018-08-16 14:25:44 +00:00
71a24a82bf
Fix theme index to match reality
2018-07-23 12:35:32 +05:30
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
e4cb3ce654
Fix spelling: Uncommment -> Uncomment
2018-06-27 20:30:57 +00:00
e5553ce6f0
Update gitlab.yml.example
2018-06-07 14:07:57 +00:00
164dbc6b77
Resolve "Introduce new navigation themes in GitLab 11.0"
2018-06-07 07:37:02 +00:00
efcd52e29c
Correcting spelling mistake.
2018-05-04 12:48:16 +00:00
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
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
5794b1caf6
Fix example config miss-alignment in uploads.object_store.connection
2018-04-27 16:15:45 +02:00
7da1b4cbf1
Add gitlab-pages admin ping rake task
2018-04-27 11:01:54 +00:00
699ecad78c
Ports omniauth-jwt gem onto GitLab OmniAuth Strategies suite
2018-04-26 10:13:29 +01:00
21488c7422
Merge branch 'direct-upload-of-uploads' into 'master'
...
Allow to store uploads by default on Object Storage
See merge request gitlab-org/gitlab-ce!18156
2018-04-05 11:10:55 +00:00
9dde7df247
Allow to store uploads by default on Object Storage
...
Introduce `direct_upload` option for `uploads` which is gonna set a default storage to Object Storage and use Unicorn to save data
2018-04-04 23:13:45 +02:00
6415ac9e99
Add support for Sidekiq JSON logging
...
Closes #20060
2018-04-04 05:04:00 -07:00
949d1b37e7
Merge branch 'ac/lfs-direct-upload-ee-to-ce' into 'master'
...
LFS direct upload port to CE
Closes #44548
See merge request gitlab-org/gitlab-ce!17752
2018-03-28 07:57:29 +00:00
678af224a2
Merge branch '43512-add-support-for-omniauth-jwt-provider' into 'master'
...
Resolve "Add support for omniauth-jwt provider"
Closes #43512
See merge request gitlab-org/gitlab-ce!17774
2018-03-27 09:06:12 +00:00
04c5e637f8
Port LFS direct_upload from EE
2018-03-27 10:32:48 +02:00
44f37504fb
Backport ee-40781-os-to-ce
2018-03-22 08:49:04 -04:00
fe82ef0c01
Adds JWT omnianuth integration
2018-03-20 13:03:15 +00:00
fc6587f1f2
Add proxy_download to perform proxied sending of all files
2018-03-09 09:16:06 -05:00
a2f375e8f7
Merge remote-tracking branch 'origin/master' into object-storage-ee-to-ce-backport
2018-02-28 21:28:43 +01:00
79a5e7fb53
Merge commit '7e424eb852716495073881710e8a8851b4a4cd5a' into object-storage-ee-to-ce-backport
2018-02-28 21:14:25 +01:00
729391fbfc
Merge commit '8af23def1d6' into object-storage-ee-to-ce-backport
2018-02-28 21:11:53 +01:00
8af23def1d
Revert "Merge branch '3867-port-to-ce' into 'master'"
...
This reverts commit 54a575f1bbc63af942e5
2018-02-28 21:09:34 +01:00
a7dae52e9d
Merge branch '4163-move-uploads-to-object-storage' into 'master'
...
Move uploads to object storage
Closes #4163
See merge request gitlab-org/gitlab-ee!3867
2018-02-28 20:58:15 +01:00
45d2c31643
Merge commit '4b92efd90cedaa0aff218d11fdce279701128bea' into object-storage-ee-to-ce-backport
2018-02-28 20:46:53 +01:00
87f11d2cf5
Merge branch 'zj-auto-upload-job-artifacts' into 'master'
...
Transfer job archives after creation
See merge request gitlab-org/gitlab-ee!3646
2018-02-28 20:45:07 +01:00
6ca02a4150
Merge branch 'zj-multiple-artifacts-ee' into 'master'
...
Multiple artifacts ee
See merge request gitlab-org/gitlab-ee!3276
2018-02-28 20:44:09 +01:00
965dc28691
Merge commit '7fabc892f251740dbd9a4755baede662e6854870' into object-storage-ee-to-ce-backport
2018-02-28 20:36:55 +01:00
GitLab Bot
Sebastián Arcila Valenzuela
Stan Hu
Krasimir Angelov
Winnie Hellmann
Valery Sizov
dodocat
Heinrich Lee Yu
J0WI
Diego Louzán
Reuben Pereira
Robert Speicher
Takuya Noguchi
Yorick Peterse
Jan Provaznik
Gosia Ksionek
Douglas Barbosa Alexandre
Roger Meier
Dmitriy Zaporozhets
Nick Thomas
Patrick Bajao
Drew Blessing
Jacob Vosmaer
Pepijn Van Eeckhoudt
Ahmad Hassan
Michael Tsyganov
Imre Farkas
Marin Jankovski
George Tsiolis
Zeger-Jan van de Weg
Tuomo Ala-Vannesluoma
Marcel Amirault
Samuele Kaplun
Shinya Maeda
Balasankar "Balu" C
Rémy Coutable
Richard Hancock
Annabel Gray
Douwe Maan
Alessio Caiazza
Tiago Botelho
Grzegorz Bizon
Kamil Trzciński
Micaël Bergeron
Sean McGivern