diff options
| author | Douwe Maan <douwe@gitlab.com> | 2018-05-24 08:49:54 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2018-05-24 08:49:54 +0000 |
| commit | e97a87433b2f55b2f688771cbe47d627f49d4b44 (patch) | |
| tree | 68b698985cca79d2d9b1351ec186b356e5e3bec2 /spec/lib/gitlab/untrusted_regexp_spec.rb | |
| parent | 56d2d462271da802a0126fa588f7ae76ae18f09f (diff) | |
| parent | 13aa6f6740118743e47f24f01aa54fed30079f4d (diff) | |
| download | gitlab-ce-e97a87433b2f55b2f688771cbe47d627f49d4b44.tar.gz | |
Merge branch 'mr-conflict-notification' into 'master'
MR unmergeable notification
See merge request gitlab-org/gitlab-ce!18042
Diffstat (limited to 'spec/lib/gitlab/untrusted_regexp_spec.rb')
0 files changed, 0 insertions, 0 deletions