diff options
| author | Mayra Cabrera <mcabrera@gitlab.com> | 2019-06-03 17:40:38 +0000 |
|---|---|---|
| committer | Mayra Cabrera <mcabrera@gitlab.com> | 2019-06-03 17:40:38 +0000 |
| commit | 2cc7155b8aebd3d377a8877695e2d621839ed568 (patch) | |
| tree | 523d317b3c10eb85da18a32feb29dc9a6378dd9b | |
| parent | 6953b13c060fc6df56339692eb4acb8122193d03 (diff) | |
| parent | c44d17754f25714555014aa1de14dead9e0f3e21 (diff) | |
| download | gitlab-ce-2cc7155b8aebd3d377a8877695e2d621839ed568.tar.gz | |
Merge branch 'zj-bump-gitaly' into '11-11-stable-patch-1'
Stop two-step rebase from hanging when errors occur
See merge request gitlab-org/gitlab-ce!29060
| -rw-r--r-- | GITALY_SERVER_VERSION | 2 | ||||
| -rw-r--r-- | app/models/repository.rb | 2 | ||||
| -rw-r--r-- | changelogs/unreleased/dm-disable-two-step-rebase.yml | 5 | ||||
| -rw-r--r-- | changelogs/unreleased/zj-gitlab-ce-zj-bump-gitaly.yml | 5 |
4 files changed, 7 insertions, 7 deletions
diff --git a/GITALY_SERVER_VERSION b/GITALY_SERVER_VERSION index a50908ca3da..975492089e6 100644 --- a/GITALY_SERVER_VERSION +++ b/GITALY_SERVER_VERSION @@ -1 +1 @@ -1.42.0 +1.42.3 diff --git a/app/models/repository.rb b/app/models/repository.rb index 50bc2127495..be17b54ff12 100644 --- a/app/models/repository.rb +++ b/app/models/repository.rb @@ -1056,7 +1056,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 diff --git a/changelogs/unreleased/dm-disable-two-step-rebase.yml b/changelogs/unreleased/dm-disable-two-step-rebase.yml deleted file mode 100644 index 342d61a20d6..00000000000 --- a/changelogs/unreleased/dm-disable-two-step-rebase.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Disable two-step rebase which could cause rebases to hang -merge_request: 28778 -author: -type: other diff --git a/changelogs/unreleased/zj-gitlab-ce-zj-bump-gitaly.yml b/changelogs/unreleased/zj-gitlab-ce-zj-bump-gitaly.yml new file mode 100644 index 00000000000..24fadbe3814 --- /dev/null +++ b/changelogs/unreleased/zj-gitlab-ce-zj-bump-gitaly.yml @@ -0,0 +1,5 @@ +--- +title: Stop two-step rebase from hanging when errors occur +merge_request: 29068 +author: +type: fixed |