diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-17 00:09:21 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-17 00:09:21 +0300 |
| commit | 87af6f2e0590af0ed1bb3e5de1bb5d21855a94d2 (patch) | |
| tree | 2abe2661b10cf6281bc03855b3053a072c64fbbf /app/services/commits | |
| parent | c43ba2677f41ad0b5fc6f3af6baf4266c70dfcb3 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/services/commits')
| -rw-r--r-- | app/services/commits/cherry_pick_service.rb | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/app/services/commits/cherry_pick_service.rb b/app/services/commits/cherry_pick_service.rb index 91a18909e22..7e982bf7686 100644 --- a/app/services/commits/cherry_pick_service.rb +++ b/app/services/commits/cherry_pick_service.rb @@ -11,8 +11,6 @@ module Commits private def track_mr_picking(pick_sha) - return unless Feature.enabled?(:track_mr_picking, project) - merge_request = project.merge_requests.by_merge_commit_sha(@commit.sha).first return unless merge_request |