kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss

Fork 0

Commit graph

Author	SHA1	Message	Date
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
Robert Speicher	a8c62dfe5c	Minor refactoring of Uploaders - Moves a duplicate `file_storage?` definition into the common `GitlabUploader` ancestor. - Get the `uploads` base directory from a class method rather than hard-coding it where it's needed. This will be used in a subsequent MR to store Uploads in the database. - Improves the specs for uploaders.	2017-02-24 16:41:27 -05:00
Jacob Vosmaer	6731ab5d76	Add Gitlab::Middleware::Multipart	2016-12-15 12:26:36 +01:00

Author

SHA1

Message

Date

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

Robert Speicher

a8c62dfe5c

Minor refactoring of Uploaders

- Moves a duplicate `file_storage?` definition into the common
  `GitlabUploader` ancestor.
- Get the `uploads` base directory from a class method rather than
  hard-coding it where it's needed. This will be used in a subsequent MR
  to store Uploads in the database.
- Improves the specs for uploaders.

2017-02-24 16:41:27 -05:00

Jacob Vosmaer

6731ab5d76

Add Gitlab::Middleware::Multipart

2016-12-15 12:26:36 +01:00

3 commits