Commit Graph

15 Commits

Author SHA1 Message Date
GitLab Bot be4b3134a2 Add latest changes from gitlab-org/gitlab@master 2021-05-04 15:10:36 +00:00
GitLab Bot c46b011d3f Add latest changes from gitlab-org/gitlab@master 2021-03-23 15:09:28 +00:00
GitLab Bot 71da5de44f Add latest changes from gitlab-org/gitlab@master 2020-08-05 15:09:59 +00:00
Patrick Bajao ac841c37cb Bring back Gitlab::UntrustedRegexp.with_fallback
It's still being called in PushRule model.

Also still present in 11-9-stable-ee branch.
2019-04-03 15:31:56 +08:00
Kamil Trzciński b22287f00f Make CI refs matching to to use UntrustedRegexp
This makes ref validation to use always `UntrustedRegexp`.
This also splits the existing RubySyntax into separate
class.
2019-03-15 14:38:28 +01:00
gfyoung c858f70d07 Enable frozen string for lib/gitlab/*.rb 2018-10-22 07:00:50 +00:00
Grzegorz Bizon af9b0bfbae Simplify untrusted regexp factory method 2018-05-18 10:14:10 +02:00
Grzegorz Bizon 0ce63efe96 Add extended /regexp/ scheme support to untrusted regexp 2018-05-17 12:29:47 +02:00
Grzegorz Bizon bbba6d7e62 Merge branch 'master' into feature/gb/add-regexp-variables-expression
* master: (76 commits)

Conflicts:
	lib/gitlab/untrusted_regexp.rb
2018-05-15 12:01:07 +02:00
Grzegorz Bizon da5c28a422 Backport EE-specific untrusted regexp implementation 2018-05-14 10:43:45 +02:00
Grzegorz Bizon 6d0c10b1b7 Make it possible to compare untrusted regexps 2018-05-11 13:28:51 +02:00
Nick Thomas 61f948baed Upgrade the re2 gem to 1.1.0 2017-07-24 11:03:37 +01:00
Nick Thomas 4bda5b502d Short-circuit build coverage extraction for empty regexes 2017-07-22 07:12:19 +01:00
Sean McGivern 8348141434 Merge branch 'fix-re2-infinite-loop-nick' into 'security-9-3'
Fix an infinite loop in Gitlab:UntrustedRegexp

See merge request !2146
2017-07-21 13:13:07 +01:00
Douwe Maan ba60d4f6e4 Merge branch '24570-use-re2-for-user-supplied-regexp-9-3' into 'security-9-3'
24570 use re2 for user supplied regexp 9 3

See merge request !2129
2017-07-19 22:28:41 -05:00