diff options
| author | Robert Speicher <rspeicher@gmail.com> | 2016-07-13 13:57:30 -0500 |
|---|---|---|
| committer | Robert Speicher <rspeicher@gmail.com> | 2016-07-13 13:57:30 -0500 |
| commit | 530f5158e297f3cde27f3566cfe13bad74ba3b50 (patch) | |
| tree | 270507d396bacdae8a4aa3489edfff0f47b718ca /lib/gitlab/checks/matching_merge_request.rb | |
| parent | 9b0ef1559f78e58b398e428763ff97dfdc53e186 (diff) | |
| download | gitlab-ce-530f5158e297f3cde27f3566cfe13bad74ba3b50.tar.gz | |
Revert "Merge branch '18193-developers-can-merge' into 'master'
"
This reverts commit 9ca633eb4c62231e4ddff5466c723cf8e2bdb25d, reversing
changes made to fb229bbf7970ba908962b837b270adf56f14098f.
Diffstat (limited to 'lib/gitlab/checks/matching_merge_request.rb')
| -rw-r--r-- | lib/gitlab/checks/matching_merge_request.rb | 18 |
1 files changed, 0 insertions, 18 deletions
diff --git a/lib/gitlab/checks/matching_merge_request.rb b/lib/gitlab/checks/matching_merge_request.rb deleted file mode 100644 index 849848515da..00000000000 --- a/lib/gitlab/checks/matching_merge_request.rb +++ /dev/null @@ -1,18 +0,0 @@ -module Gitlab - module Checks - class MatchingMergeRequest - def initialize(newrev, branch_name, project) - @newrev = newrev - @branch_name = branch_name - @project = project - end - - def match? - @project.merge_requests - .with_state(:locked) - .where(in_progress_merge_commit_sha: @newrev, target_branch: @branch_name) - .exists? - end - end - end -end |