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
e3fafa7632
Merge commit 'f2f58a60b76acd479e37bdbc9246ec9f9b2bea82' into object-storage-ee-to-ce-backport
2018-02-28 20:36:07 +01:00
e0401df121
Merge commit '11c67e7c2f992299ff5918ce67995b73d1e0be6d' into object-storage-ee-to-ce-backport
2018-02-28 20:35:22 +01:00
bc76062774
Merge branch 'jej/lfs-object-storage' into 'master'
...
Can migrate LFS objects to S3 style object storage
Closes #2841
See merge request !2760
2018-02-28 20:29:37 +01:00
5a69b51bc8
Merge commit 'b39d0c318921bae2e3a11df9ee6828291dad9864' into object-storage-ee-to-ce-backport
2018-02-28 20:06:12 +01:00
b1f8d8a173
Merge commit '5b08d59f07fc53c1e34819fac20352119d5343e6' into object-storage-ee-to-ce-backport
2018-02-28 20:03:02 +01:00
52c3b8f312
Merge branch 'zj-object-store-artifacts' into 'master'
...
Object store for artifacts
Closes gitlab-ce#29203
See merge request !1762
2018-02-28 20:00:27 +01:00
ee68bd9771
Add DNS verification to Pages custom domains
2018-02-23 12:22:29 +00:00
Ahmad Hassan
Michael Tsyganov
Imre Farkas
Marin Jankovski
George Tsiolis
Zeger-Jan van de Weg
Dmitriy Zaporozhets
Tuomo Ala-Vannesluoma
Marcel Amirault
Nick Thomas
Samuele Kaplun
Shinya Maeda
Balasankar "Balu" C
Rémy Coutable
Stan Hu
Richard Hancock
Annabel Gray
Douwe Maan
Alessio Caiazza
Jacob Vosmaer (GitLab)
Tiago Botelho
Grzegorz Bizon
Kamil Trzciński
Micaël Bergeron
Sean McGivern