Commit graph

3 commits

Author SHA1 Message Date
Robert Speicher
45fb1f9542 Change login_as uses to gitlab_sign_in 2017-06-19 18:59:01 -05: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
jurre
a0c48ec62b Move Admin Appearance spinach feature to rspec 2016-12-19 17:41:54 +01:00