diff options
| author | Mayra Cabrera <mcabrera@gitlab.com> | 2019-06-03 17:18:29 +0000 |
|---|---|---|
| committer | Mayra Cabrera <mcabrera@gitlab.com> | 2019-06-03 17:18:29 +0000 |
| commit | 57fa8c75c0b6d5b62abe099bc30832156392812e (patch) | |
| tree | 856282e06ee29f4e31e375c090c01f300bde826e | |
| parent | a2c767b9f8e22398daa19e62597f2663aadf457d (diff) | |
| parent | 872b624af1029e3de475373042146af70cb05a5b (diff) | |
| download | gitlab-ce-57fa8c75c0b6d5b62abe099bc30832156392812e.tar.gz | |
Merge branch 'zj-bump-gitaly-master' into 'master'
Stop two-step rebase from hanging when errors occur
Closes #62353
See merge request gitlab-org/gitlab-ce!29068
| -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 b978278f05f..372cf402c73 100644 --- a/GITALY_SERVER_VERSION +++ b/GITALY_SERVER_VERSION @@ -1 +1 @@ -1.43.0 +1.44.0 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 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 |