diff options
| author | Douwe Maan <douwe@gitlab.com> | 2019-06-03 17:18:29 +0000 |
|---|---|---|
| committer | Mayra Cabrera <mcabrera@gitlab.com> | 2019-06-03 17:18:29 +0000 |
| commit | 872b624af1029e3de475373042146af70cb05a5b (patch) | |
| tree | 856282e06ee29f4e31e375c090c01f300bde826e /app/models/repository.rb | |
| parent | a2c767b9f8e22398daa19e62597f2663aadf457d (diff) | |
| download | gitlab-ce-872b624af1029e3de475373042146af70cb05a5b.tar.gz | |
Bump Gitaly version to 1.44.0
This change makes sure Gitaly includes a fix to make rebase work again
properly.
Part of: https://gitlab.com/gitlab-org/gitlab-ce/issues/62353
Diffstat (limited to 'app/models/repository.rb')
| -rw-r--r-- | app/models/repository.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/repository.rb b/app/models/repository.rb index d43f991bb3e..e05d3dd58ac 100644 --- a/app/models/repository.rb +++ b/app/models/repository.rb @@ -1077,7 +1077,7 @@ class Repository end def rebase(user, merge_request) - if Feature.disabled?(:two_step_rebase, default_enabled: false) + if Feature.disabled?(:two_step_rebase, default_enabled: true) return rebase_deprecated(user, merge_request) end |