diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-04 06:09:13 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-04 06:09:13 +0000 |
| commit | cebee31a0483ef7f2cade3d6dde0a53a68e86cc6 (patch) | |
| tree | b818a3e84bde169e6b2a9c96d9b794b6b8708094 /app/models/repository.rb | |
| parent | 7ec2694360b4d4bd9a4b00ef5166a77c854d9d4f (diff) | |
| download | gitlab-ce-cebee31a0483ef7f2cade3d6dde0a53a68e86cc6.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/models/repository.rb')
| -rw-r--r-- | app/models/repository.rb | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/app/models/repository.rb b/app/models/repository.rb index c6573e0bad2..9807aed07a9 100644 --- a/app/models/repository.rb +++ b/app/models/repository.rb @@ -1091,10 +1091,6 @@ class Repository end def rebase(user, merge_request, skip_ci: false) - if Feature.disabled?(:two_step_rebase, default_enabled: true) - return rebase_deprecated(user, merge_request) - end - push_options = [] push_options << Gitlab::PushOptions::CI_SKIP if skip_ci |