Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Add SSE-C key configuration option for Amazon S3 remote backups | Pepijn Van Eeckhoudt | 2019-01-09 | 1 | -0/+4 |
| | |||||
* | Merge remote-tracking branch 'origin/master' into support-gitaly-tls | Ahmad Hassan | 2018-12-11 | 1 | -8/+11 |
|\ | |||||
| * | Support RSA and ECDSA algorithms in Omniauth JWT | Michael Tsyganov | 2018-12-05 | 1 | -8/+8 |
| | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
| * | Add config to disable impersonation | Imre Farkas | 2018-11-29 | 1 | -0/+3 |
| | | | | | | | | | | | | | | | | 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. | ||||
* | | Merge remote-tracking branch 'origin/master' into support-gitaly-tls | Ahmad Hassan | 2018-11-15 | 1 | -1/+5 |
|\ \ | |/ | |||||
| * | Merge branch 'dz-add-packages-to-yml' into 'master' | Marin Jankovski | 2018-11-06 | 1 | -0/+4 |
| |\ | | | | | | | | | | | | | Add packages section to CE config file See merge request gitlab-org/gitlab-ce!22151 | ||||
| | * | Add packages section to CE config filedz-add-packages-to-yml | Dmitriy Zaporozhets | 2018-10-05 | 1 | -0/+4 |
| | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
| * | | Fix typos in comments and specs | George Tsiolis | 2018-11-01 | 1 | -1/+1 |
| | | | |||||
* | | | Add documentation for tls gitaly | Ahmad Hassan | 2018-11-02 | 1 | -1/+1 |
|/ / | |||||
* | | Remove broken git storage for testing | Zeger-Jan van de Weg | 2018-10-23 | 1 | -3/+0 |
| | | | | | | | | | | | | | | | | | | | | | | 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 | ||||
* | | Make GitLab pages support access control | Tuomo Ala-Vannesluoma | 2018-10-05 | 1 | -0/+1 |
|/ | |||||
* | Fix grammar (setup to set-up) in code comments, spec, views, etc. | Marcel Amirault | 2018-09-17 | 1 | -2/+2 |
| | |||||
* | Enable omniauth by default | Nick Thomas | 2018-09-13 | 1 | -2/+2 |
| | |||||
* | Fix closing issue default pattern | Samuele Kaplun | 2018-09-06 | 1 | -1/+1 |
| | | | | | | * (Suf)fix #51085 :-) Signed-off-by: Samuele Kaplun <kaplun@protonmail.com> | ||||
* | Add ci_archive_traces_cron_worker configuration to gitlab.yml.example | Shinya Maeda | 2018-08-16 | 1 | -0/+3 |
| | |||||
* | Fix theme index to match reality | Balasankar "Balu" C | 2018-07-23 | 1 | -8/+8 |
| | |||||
* | Merge branch 'rjh/additional-options-for-s3-compatible-hosts' into 'master' | Rémy Coutable | 2018-07-09 | 1 | -0/+5 |
|\ | | | | | | | | | Add options to adjust signed url creation for Object Storage to use older signature if needed. See merge request gitlab-org/gitlab-ce!18719 | ||||
| * | Update gitlab.yml.example | Richard Hancock | 2018-06-07 | 1 | -0/+1 |
| | | |||||
| * | Correcting spelling mistake. | Richard Hancock | 2018-05-04 | 1 | -1/+1 |
| | | |||||
| * | Added options related to signed url creation to work with servcies that do ↵ | Richard J Hancock | 2018-05-03 | 1 | -0/+4 |
| | | | | | | | | not support V4 of the signature. | ||||
* | | Fix spelling: Uncommment -> Uncomment | Stan Hu | 2018-06-27 | 1 | -1/+1 |
| | | |||||
* | | Resolve "Introduce new navigation themes in GitLab 11.0" | Annabel Gray | 2018-06-07 | 1 | -3/+8 |
|/ | |||||
* | Merge branch 'add-jwt-strategy-to-gitlab-suite' into 'master' | Douwe Maan | 2018-04-30 | 1 | -2/+2 |
|\ | | | | | | | | | Ports omniauth-jwt gem onto GitLab OmniAuth Strategies suite See merge request gitlab-org/gitlab-ce!18580 | ||||
| * | Ports omniauth-jwt gem onto GitLab OmniAuth Strategies suite | Tiago Botelho | 2018-04-26 | 1 | -2/+2 |
| | | |||||
* | | Fix example config miss-alignment in uploads.object_store.connection | Alessio Caiazza | 2018-04-27 | 1 | -9/+9 |
| | | |||||
* | | Add gitlab-pages admin ping rake task | Jacob Vosmaer (GitLab) | 2018-04-27 | 1 | -0/+2 |
|/ | |||||
* | Merge branch 'direct-upload-of-uploads' into 'master' | Grzegorz Bizon | 2018-04-05 | 1 | -13/+15 |
|\ | | | | | | | | | Allow to store uploads by default on Object Storage See merge request gitlab-org/gitlab-ce!18156 | ||||
| * | Allow to store uploads by default on Object Storagedirect-upload-of-uploads | Kamil Trzciński | 2018-04-04 | 1 | -13/+15 |
| | | | | | | | | Introduce `direct_upload` option for `uploads` which is gonna set a default storage to Object Storage and use Unicorn to save data | ||||
* | | Add support for Sidekiq JSON logging | Stan Hu | 2018-04-04 | 1 | -0/+4 |
|/ | | | | Closes #20060 | ||||
* | Merge branch 'ac/lfs-direct-upload-ee-to-ce' into 'master' | Kamil Trzciński | 2018-03-28 | 1 | -3/+3 |
|\ | | | | | | | | | | | | | LFS direct upload port to CE Closes #44548 See merge request gitlab-org/gitlab-ce!17752 | ||||
| * | Port LFS direct_upload from EEac/lfs-direct-upload-ee-to-ce | Alessio Caiazza | 2018-03-27 | 1 | -3/+3 |
| | | |||||
* | | Merge branch '43512-add-support-for-omniauth-jwt-provider' into 'master' | Douwe Maan | 2018-03-27 | 1 | -1/+22 |
|\ \ | |/ |/| | | | | | | | | | Resolve "Add support for omniauth-jwt provider" Closes #43512 See merge request gitlab-org/gitlab-ce!17774 | ||||
| * | Adds JWT omnianuth integration | Tiago Botelho | 2018-03-20 | 1 | -1/+22 |
| | | |||||
* | | Backport ee-40781-os-to-ce | Micaël Bergeron | 2018-03-22 | 1 | -14/+12 |
| | | |||||
* | | Add proxy_download to perform proxied sending of all files | Micaël Bergeron | 2018-03-09 | 1 | -0/+3 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into ↵object-storage-ee-to-ce-backport | Kamil Trzciński | 2018-02-28 | 1 | -0/+4 |
|\ \ | |/ | | | | | object-storage-ee-to-ce-backport | ||||
| * | Add DNS verification to Pages custom domains | Nick Thomas | 2018-02-23 | 1 | -0/+4 |
| | | |||||
* | | Merge commit '7e424eb852716495073881710e8a8851b4a4cd5a' into ↵ | Kamil Trzciński | 2018-02-28 | 1 | -0/+3 |
|\ \ | |/ | | | | | object-storage-ee-to-ce-backport | ||||
| * | Added ldap config setting to lower case usernames | Francisco Javier López | 2018-02-05 | 1 | -0/+3 |
| | | |||||
* | | Merge commit '8af23def1d6' into object-storage-ee-to-ce-backport | Kamil Trzciński | 2018-02-28 | 1 | -6/+6 |
|\ \ | |||||
| * | | Revert "Merge branch '3867-port-to-ce' into 'master'" | Kamil Trzciński | 2018-02-28 | 1 | -8/+0 |
| |/ | | | | | | | | | This reverts commit 54a575f1bbba44573ab92dc58a4242f1ee734c5d, reversing changes made to c63af942e5baf7849a94fa99da8494bcba28e3f8. | ||||
| * | port of 594e6a0a625^..f74c90f68c6 | Micaël Bergeron | 2018-02-01 | 1 | -0/+8 |
| | | |||||
| * | Port some non-EE-specific config/ changes to CE42420-follow-up-from-resolve-asset-was-not-declared-to-be-precompiled-in-production-favicon-green-ico | Rémy Coutable | 2018-01-25 | 1 | -3/+3 |
| | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
| * | Default to HTTPS for all Gravatar URLsdefault-to-https-for-gravatar-urls | Achilleas Pipinellis | 2018-01-25 | 1 | -3/+5 |
| | | | | | | | | | | If using gravatar.com, both plain_url and ssl_url in settings are now served via HTTPS. Make this the default. | ||||
* | | Merge branch '4163-move-uploads-to-object-storage' into 'master' | Sean McGivern | 2018-02-28 | 1 | -0/+29 |
| | | | | | | | | | | | | | | | | Move uploads to object storage Closes #4163 See merge request gitlab-org/gitlab-ee!3867 | ||||
* | | Merge commit '4b92efd90cedaa0aff218d11fdce279701128bea' into ↵ | Kamil Trzciński | 2018-02-28 | 1 | -0/+1 |
|\ \ | |/ | | | | | object-storage-ee-to-ce-backport | ||||
| * | Make sure user email is read only when synced with LDAP | Douwe Maan | 2017-12-15 | 1 | -0/+1 |
| | | |||||
* | | Merge branch 'zj-auto-upload-job-artifacts' into 'master' | Kamil Trzciński | 2018-02-28 | 1 | -0/+1 |
| | | | | | | | | | | | | Transfer job archives after creation See merge request gitlab-org/gitlab-ee!3646 | ||||
* | | Merge branch 'zj-multiple-artifacts-ee' into 'master' | Grzegorz Bizon | 2018-02-28 | 1 | -0/+1 |
| | | | | | | | | | | | | Multiple artifacts ee See merge request gitlab-org/gitlab-ee!3276 | ||||
* | | Merge commit '7fabc892f251740dbd9a4755baede662e6854870' into ↵ | Kamil Trzciński | 2018-02-28 | 1 | -2/+4 |
|\ \ | |/ | | | | | object-storage-ee-to-ce-backport |