root
/
gitlab-ce
mirror of https://gitlab.com/free-releases/gitlab-ce.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity
72,140 Commits 9,131 Branches 1,640 Tags 2 GiB
Commit Graph

415 Commits

Author SHA1 Message Date
Grzegorz Bizon 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
Kamil Trzciński 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
Stan Hu 6415ac9e99 Add support for Sidekiq JSON logging 
Closes #20060
 2018-04-04 05:04:00 -07:00
Kamil Trzciński 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
Douwe Maan 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
Alessio Caiazza 04c5e637f8
Port LFS direct_upload from EE 2018-03-27 10:32:48 +02:00
Micaël Bergeron 44f37504fb Backport ee-40781-os-to-ce 2018-03-22 08:49:04 -04:00
Tiago Botelho fe82ef0c01 Adds JWT omnianuth integration 2018-03-20 13:03:15 +00:00
Micaël Bergeron fc6587f1f2 Add proxy_download to perform proxied sending of all files 2018-03-09 09:16:06 -05:00
Kamil Trzciński a2f375e8f7 Merge remote-tracking branch 'origin/master' into object-storage-ee-to-ce-backport 2018-02-28 21:28:43 +01:00
Kamil Trzciński 79a5e7fb53 Merge commit '7e424eb852716495073881710e8a8851b4a4cd5a' into object-storage-ee-to-ce-backport 2018-02-28 21:14:25 +01:00
Kamil Trzciński 729391fbfc Merge commit '8af23def1d6' into object-storage-ee-to-ce-backport 2018-02-28 21:11:53 +01:00
Kamil Trzciński 8af23def1d Revert "Merge branch '3867-port-to-ce' into 'master'" 
This reverts commit 54a575f1bb, reversing
changes made to c63af942e5.
 2018-02-28 21:09:34 +01:00
Sean McGivern 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
Kamil Trzciński 45d2c31643 Merge commit '4b92efd90cedaa0aff218d11fdce279701128bea' into object-storage-ee-to-ce-backport 2018-02-28 20:46:53 +01:00
Kamil Trzciński 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
Grzegorz Bizon 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
Kamil Trzciński 965dc28691 Merge commit '7fabc892f251740dbd9a4755baede662e6854870' into object-storage-ee-to-ce-backport 2018-02-28 20:36:55 +01:00
Kamil Trzciński e3fafa7632 Merge commit 'f2f58a60b76acd479e37bdbc9246ec9f9b2bea82' into object-storage-ee-to-ce-backport 2018-02-28 20:36:07 +01:00
Kamil Trzciński e0401df121 Merge commit '11c67e7c2f992299ff5918ce67995b73d1e0be6d' into object-storage-ee-to-ce-backport 2018-02-28 20:35:22 +01:00
Douwe Maan 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
Kamil Trzciński 5a69b51bc8 Merge commit 'b39d0c318921bae2e3a11df9ee6828291dad9864' into object-storage-ee-to-ce-backport 2018-02-28 20:06:12 +01:00
Kamil Trzciński b1f8d8a173 Merge commit '5b08d59f07fc53c1e34819fac20352119d5343e6' into object-storage-ee-to-ce-backport 2018-02-28 20:03:02 +01:00
Grzegorz Bizon 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
Nick Thomas ee68bd9771
Add DNS verification to Pages custom domains 2018-02-23 12:22:29 +00:00
Francisco Javier López cd461400eb Added ldap config setting to lower case usernames 2018-02-05 22:35:34 +00:00
Micaël Bergeron 2057a6acde port of 594e6a0a625^..f74c90f68c6 2018-02-01 12:14:46 -05:00
Rémy Coutable 78faa6e370
Port some non-EE-specific config/ changes to CE 
Signed-off-by: Rémy Coutable <remy@rymai.me>
 2018-01-25 14:14:53 +01:00
Achilleas Pipinellis 85940d766a
Default to HTTPS for all Gravatar URLs 
If using gravatar.com, both plain_url and ssl_url in settings are now
served via HTTPS. Make this the default.
 2018-01-25 10:00:46 +01:00
Douwe Maan 481b8a71f8 Make sure user email is read only when synced with LDAP 2017-12-15 12:48:48 +01:00
Kamil Trzcinski cc750539ec Use tmp/test/artifacts for files 2017-12-03 12:04:48 +01:00
Nick Thomas afd5911557
Set the default gitlab-shell timeout to 3 hours 2017-11-21 17:32:37 +00:00
Kim "BKC" Carlbäcker 85c52f619a Fix invalid Gitaly ClientPath config 2017-11-02 18:38:41 +01:00
Bob Van Landuyt 619021fd7a Read circuitbreaker settings from `Gitlab::CurrentSettings` 
Instead of from the configuration file
 2017-10-17 11:50:32 +02:00
Nick Thomas ce87f42dc9 Merge branch '34102-online-view-of-artifacts-fe' into 'master' 
Add external link for online artifacts

Closes #34102

See merge request gitlab-org/gitlab-ce!14399
 2017-10-05 15:03:17 +00:00
Eric Eastwood decf044369 Merge branch 'master' into 34102-online-view-of-artifacts-fe 2017-10-04 10:56:03 -05:00
Jacob Vosmaer 147e2b21be Let fetch_ref pull from Gitaly instead of from disk 2017-10-04 12:57:41 +02:00
Zeger-Jan van de Weg ca0e39048f
Backend for HTML serving with GitLab Pages 2017-10-02 16:25:52 +02:00
Guilherme Vieira 4e4a29ad75 Add "implements" to the default issue closing message regex 2017-10-02 12:02:38 +00:00
Daniel Voogsgerd f4c45417fe Removed two legacy config options 
Removed the max_size and timeout options from the git config in
gitlab.yml.
 2017-09-21 22:04:49 -04:00
Annabel Dunstone Gray 9b177bb7c9 Revert "Merge branch 'revert-f2421b2b' into 'master'" 
This reverts merge request !14148
 2017-09-11 15:44:42 +00:00
Rubén Dávila 52a2423e37 Revert "Merge branch '35012-navigation-add-option-to-change-navigation-color-palette' into 'master'" 
This reverts merge request !13619
 2017-09-08 14:48:44 +00:00
Annabel Dunstone Gray 7b567597ee Fix specs; start on light theme 2017-09-06 12:57:30 -05:00
Annabel Dunstone Gray c3ac731152 Add blue theme 2017-09-06 12:54:09 -05:00
Annabel Dunstone Gray 3c815f97d3 Add functionality for two themes 2017-09-06 12:54:09 -05:00
Rubén Dávila 6c49a62800 Restore some changes from !9199 2017-09-06 12:54:09 -05:00
Alexander Keramidas 4df54f2607 Profile updates from providers 2017-09-06 16:38:52 +03:00
Bob Van Landuyt d3ca6c0f25 Increase the timeout before aborting a storage access attempt 
There are peaks of IO-wait time, most of them stay below 30 seconds.
 2017-09-04 14:03:41 +02:00
Michael Kozono dd3e7ff036 Default LDAP config verify_certificates to true 2017-08-30 11:27:01 -07:00
Bob Van Landuyt 93d56eb2a5 Use better higher threshold settings for storage access in tests 
`failure_count_threshold`: We should never need this, but we don't
want to block access in tests because of this.

`failure_wait_time`: Setting it to 0 now allows each storage attempt

`storage_timeout`: Try a bit longer to access storage on CI in case
the slow machines take a bit longer to spin up the process to perfom
the check
 2017-08-16 14:15:50 +02:00