diff options
| author | Alejandro RodrÃguez <alejorro70@gmail.com> | 2017-10-23 20:16:10 +0300 |
|---|---|---|
| committer | Alejandro RodrÃguez <alejorro70@gmail.com> | 2017-10-24 20:31:52 +0300 |
| commit | a64601b9298d4b79bfc5d4f782b4dcc79ff33b74 (patch) | |
| tree | ffeffae342bff5a8de96922d35d90c151bac546b /lib/gitlab/git_access.rb | |
| parent | 00c15cc27c33dd387069fce5777beb29d01f55ac (diff) | |
Move all rugged operation for ff_merge inside Gitlab::Git
We also delete some unused code related to the aforementioned feature.
Diffstat (limited to 'lib/gitlab/git_access.rb')
| -rw-r--r-- | lib/gitlab/git_access.rb | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/lib/gitlab/git_access.rb b/lib/gitlab/git_access.rb index 42b59c106e2..8998c4b1a83 100644 --- a/lib/gitlab/git_access.rb +++ b/lib/gitlab/git_access.rb @@ -215,10 +215,6 @@ module Gitlab ).exec end - def matching_merge_request?(newrev, branch_name) - Checks::MatchingMergeRequest.new(newrev, branch_name, project).match? - end - def deploy_key actor if deploy_key? end |