diff options
| author | Brian Neel <brian@gitlab.com> | 2017-07-10 17:27:53 -0400 |
|---|---|---|
| committer | Brian Neel <brian@gitlab.com> | 2017-07-10 17:27:53 -0400 |
| commit | 2e062bae74563550b0324e5644ec8a5f5161e9e9 (patch) | |
| tree | d988de771b1e12714b0a99491222cbed8e8aa1de /app/models/merge_request.rb | |
| parent | 86dcba470ebc6093eedabe56d8b4acf4ed65c212 (diff) | |
| download | gitlab-ce-add-rubocop-gitlab-security.tar.gz | |
Whitelist security checks for gem 0.0.5add-rubocop-gitlab-security
Diffstat (limited to 'app/models/merge_request.rb')
| -rw-r--r-- | app/models/merge_request.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/merge_request.rb b/app/models/merge_request.rb index 808212c780c..cbd6f6a8d5d 100644 --- a/app/models/merge_request.rb +++ b/app/models/merge_request.rb @@ -172,7 +172,7 @@ class MergeRequest < ActiveRecord::Base target = unscoped.where(target_project_id: relation).select(:id) union = Gitlab::SQL::Union.new([source, target]) - where("merge_requests.id IN (#{union.to_sql})") + where("merge_requests.id IN (#{union.to_sql})") # rubocop:disable GitlabSecurity/SqlInjection end WIP_REGEX = /\A\s*(\[WIP\]\s*|WIP:\s*|WIP\s+)+\s*/i.freeze |