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
106,104 Commits 9,131 Branches 1,640 Tags 2 GiB
Commit Graph

54 Commits

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
Lin Jen-Shin c94db0c290 Use - as the prefix so we don't conflict with namespaces 
The decision was made around:
https://gitlab.com/gitlab-org/gitlab-ce/issues/26407#note_30624641
 2017-05-26 23:06:20 +08:00
Douwe Maan c27877cab5 Remove extra space 2017-05-24 16:56:16 -05:00
Douwe Maan 43b1750892 Revert "Remove changes that are not absolutely necessary" 
This reverts commit b0498c176f
 2017-05-24 20:59:26 +00:00