Commit graph

17 commits

Author SHA1 Message Date
GitLab Bot
bdca097916 Add latest changes from gitlab-org/gitlab@master 2020-08-11 03:11:00 +00:00
GitLab Bot
4c5468b408 Add latest changes from gitlab-org/gitlab@master 2020-06-24 15:08:50 +00:00
GitLab Bot
2fd92f2dc7 Add latest changes from gitlab-org/gitlab@master 2020-03-04 21:07:54 +00:00
GitLab Bot
e723867717 Add latest changes from gitlab-org/gitlab@master 2019-12-17 18:07:48 +00:00
GitLab Bot
94be244a9f Add latest changes from gitlab-org/gitlab@master 2019-10-15 03:06:19 +00:00
Stan Hu
3b924c1346 Fix order-dependent spec failure in appearance_spec.rb
When file_mover_spec.rb ran, it would initialize fog-aws with
`Fog::AWS::Storage::Real` service instead of `Fog::AWS::Storage::Mock`
because `Fog.mock!` was not called. Ensure that we use
`stub_uploads_object_storage` to prevent that from happening.

Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/64083
2019-07-03 11:27:16 -07:00
Oswaldo Ferreira
114dd97642 Support object storage at FileMover class 2019-06-30 18:00:00 -03:00
Oswaldo Ferreira
44e1915d4f Persist tmp snippet uploads
It persist temporary personal snippets under
user/:id namespaces temporarily while creating
a upload record to track it. If an user gets removed
while it's still a tmp upload, it also gets removed.
If the tmp upload is sent, the upload gets moved to
personal_snippets/:id as before. The upload record
also gets updated to the new model type as well.
2019-06-17 11:25:40 -03:00
Mark Chao
d72b1cd0b5 Check snippet attached file to be moved is within designated directory
Previously one could move any temp/ sub folder around.
2019-02-21 16:44:44 +08:00
Mark Chao
a9291f15ea Align spec with actual usage
Currently we pass temp file path to FileMover
2019-02-13 16:50:31 +08:00
Robert Speicher
6d165c740c Make all uses of fixture_file_upload use relative paths 2018-06-07 09:54:41 -05:00
Micaël Bergeron
c0047fc473 personal snippets will now comply with background_upload 2018-03-26 08:33:53 -04: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
Bob Van Landuyt
180de2d201 Make sure uploads for personal snippets are correctly rendered 2017-08-11 18:15:02 +02:00
Sean McGivern
88df076fae Merge branch '33359-pers-snippet-files-location' into 'security-9-3'
Use uploads/system directory for personal snippets

See merge request !2123
2017-07-19 22:28:27 -05:00
Jarka Kadlecova
2e311d9d1a Support uploads for newly created personal snippets 2017-06-07 07:52:41 +02:00
Jarka Kadlecova
4464c22d6d Support descriptions for snippets 2017-05-31 07:17:03 +02:00