Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
4d137421
Commit
4d137421
authored
Jun 03, 2019
by
GitLab Bot
Browse files
Options
Browse Files
Download
Plain Diff
Automatic merge of gitlab-org/gitlab-ce master
parents
6a919505
88a12332
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
12 additions
and
7 deletions
+12
-7
GITALY_SERVER_VERSION
GITALY_SERVER_VERSION
+1
-1
app/models/repository.rb
app/models/repository.rb
+1
-1
changelogs/unreleased/dm-disable-two-step-rebase.yml
changelogs/unreleased/dm-disable-two-step-rebase.yml
+0
-5
changelogs/unreleased/security-60143-address-xss-issue-in-wiki-links.yml
...leased/security-60143-address-xss-issue-in-wiki-links.yml
+5
-0
changelogs/unreleased/zj-gitlab-ce-zj-bump-gitaly.yml
changelogs/unreleased/zj-gitlab-ce-zj-bump-gitaly.yml
+5
-0
No files found.
GITALY_SERVER_VERSION
View file @
4d137421
1.4
3
.0
1.4
4
.0
app/models/repository.rb
View file @
4d137421
...
...
@@ -1077,7 +1077,7 @@ class Repository
end
def
rebase
(
user
,
merge_request
)
if
Feature
.
disabled?
(
:two_step_rebase
,
default_enabled:
fals
e
)
if
Feature
.
disabled?
(
:two_step_rebase
,
default_enabled:
tru
e
)
return
rebase_deprecated
(
user
,
merge_request
)
end
...
...
changelogs/unreleased/dm-disable-two-step-rebase.yml
deleted
100644 → 0
View file @
6a919505
---
title
:
Disable two-step rebase which could cause rebases to hang
merge_request
:
28778
author
:
type
:
other
changelogs/unreleased/security-60143-address-xss-issue-in-wiki-links.yml
0 → 100644
View file @
4d137421
---
title
:
Filter relative links in wiki for XSS
merge_request
:
author
:
type
:
security
changelogs/unreleased/zj-gitlab-ce-zj-bump-gitaly.yml
0 → 100644
View file @
4d137421
---
title
:
Stop two-step rebase from hanging when errors occur
merge_request
:
29068
author
:
type
:
fixed
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment