Commit graph

15 commits

Author SHA1 Message Date
GitLab Bot
a1ed241c82 Add latest changes from gitlab-org/gitlab@master 2021-02-03 21:09:17 +00:00
GitLab Bot
c3ad57034c Add latest changes from gitlab-org/gitlab@master 2020-01-13 09:08:03 +00:00
Jan Provaznik
41d52bbfe9 Add direct upload support for personal snippets 2019-08-23 11:19:14 +02: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
Stan Hu
7036f75f67 Use system paths for appearance logos
When object storage is enabled, the logos used to customize a GitLab
appearance causes the time-limited URLs to be used. We fix this
by forcing all of these URLs to use the /uploads/-/system prefix
so that they will always be proxied through GitLab.

Closes https://gitlab.com/gitlab-org/gitlab-ee/issues/6778
2018-12-25 08:22:34 -08:00
Alexis Reigel
ce6172e863
allow uploading favicon in appearance settings 2018-06-05 16:20:18 +02:00
Takuya Noguchi
2b6307f6ad Enable RuboCop Style/RegexpLiteral 2018-02-01 02:06:07 +09: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
Bob Van Landuyt
27a6aa4f51 Move system-uploads to -/system 2017-07-18 15:38:11 +02:00
DJ Mountney
1d1363e2bb Bring in security changes from the 9.2.5 release
Ran:
 - git format-patch v9.2.2..v9.2.5 --stdout > patchfile.patch
 - git checkout -b 9-2-5-security-patch origin/v9.2.2
 - git apply patchfile.patch
 - git commit
 - [Got the sha ref for the commit]
 - git checkout -b upstream-9-2-security master
 - git cherry-pick <SHA of the patchfile commit>
 - [Resolved conflicts]
 - git cherry-pick --continue
2017-06-07 21:16:20 -07: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
Jarka Kadlecova
43ff738641 Support uploaders for personal snippets comments 2017-05-02 15:22:24 +02:00
Dmitriy Zaporozhets
f223a41660
Split routes on multiple files
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-10-05 15:21:27 +03:00