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
5f31626f
Commit
5f31626f
authored
Oct 16, 2015
by
Valery Sizov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix rebase onto master
parent
2d7be2d4
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
10 additions
and
2 deletions
+10
-2
CHANGELOG-EE
CHANGELOG-EE
+2
-0
app/models/merge_request.rb
app/models/merge_request.rb
+1
-1
app/views/projects/merge_requests/widget/open/_ff_accept.html.haml
.../projects/merge_requests/widget/open/_ff_accept.html.haml
+1
-1
spec/models/merge_request_spec.rb
spec/models/merge_request_spec.rb
+6
-0
No files found.
CHANGELOG-EE
View file @
5f31626f
v 8.1.0 (unreleased)
- added an issues template (Hannes Rosenögger)
- Fix "Rebase onto master"
v 8.1.0
- Add documentation for "Share project with group" API call
- Abiliy to disable 'Share with Group' feature (via UI and API)
...
...
app/models/merge_request.rb
View file @
5f31626f
...
...
@@ -514,7 +514,7 @@ class MergeRequest < ActiveRecord::Base
end
def
source_sha_parent
source_project
.
repository
.
commit
(
source_
sha
).
parents
.
first
.
sha
source_project
.
repository
.
commit
(
commits
.
last
.
sha
).
parents
.
first
.
sha
end
def
ff_merge_possible?
...
...
app/views/projects/merge_requests/widget/open/_ff_accept.html.haml
View file @
5f31626f
...
...
@@ -13,7 +13,7 @@
remote:
false
,
method: :post
,
html:
{
class:
'accept-mr-form js-requires-input'
}
do
|
f
|
=
hidden_field_tag
:authenticity_token
,
form_authenticity_token
.accept-merge-holder.clearfix.js-toggle-container
-
if
@merge_request
.
target_project
.
merge_requests_rebase_enabled
&&
can_rebase?
(
@merge_request
.
target_project
,
@merge_request
.
target
_branch
)
-
if
@merge_request
.
target_project
.
merge_requests_rebase_enabled
&&
can_rebase?
(
@merge_request
.
source_project
,
@merge_request
.
source
_branch
)
-
if
@merge_request
.
rebase_in_progress?
%h4
Rebase in progress... It can take a while. Reload at will.
-
else
...
...
spec/models/merge_request_spec.rb
View file @
5f31626f
...
...
@@ -211,6 +211,12 @@ describe MergeRequest do
end
end
describe
"#source_sha_parent"
do
it
"returns the sha of the parent commit of the first commit in the MR"
do
expect
(
subject
.
source_sha_parent
).
to
eq
(
"ae73cb07c9eeaf35924a10f713b364d32b2dd34f"
)
end
end
it_behaves_like
'an editable mentionable'
do
subject
{
create
(
:merge_request
)
}
...
...
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