diff options
| author | DJ Mountney <david@twkie.net> | 2017-06-07 20:32:38 -0700 |
|---|---|---|
| committer | DJ Mountney <david@twkie.net> | 2017-06-07 21:16:20 -0700 |
| commit | 1d1363e2bb8a0aee7e2849fd463ea415035710d9 (patch) | |
| tree | a134cee38c4b710209c326533c662d30ca25dbc8 /lib/gitlab/path_regex.rb | |
| parent | abc61f260074663e5711d3814d9b7d301d07a259 (diff) | |
| download | gitlab-ce-1d1363e2bb8a0aee7e2849fd463ea415035710d9.tar.gz | |
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
Diffstat (limited to 'lib/gitlab/path_regex.rb')
| -rw-r--r-- | lib/gitlab/path_regex.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/gitlab/path_regex.rb b/lib/gitlab/path_regex.rb index 9ff6829cd49..10eb99fb461 100644 --- a/lib/gitlab/path_regex.rb +++ b/lib/gitlab/path_regex.rb @@ -49,6 +49,7 @@ module Gitlab sent_notifications services snippets + system teams u unicorn_test |