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
0
Merge Requests
0
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
Boxiang Sun
gitlab-ce
Commits
e4eba908
Commit
e4eba908
authored
Jun 29, 2017
by
Douwe Maan
Committed by
micael.bergeron
Dec 07, 2017
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Allow commenting on individual commits inside an MR
parent
17542a78
Changes
23
Hide whitespace changes
Inline
Side-by-side
Showing
23 changed files
with
186 additions
and
66 deletions
+186
-66
app/assets/javascripts/diff_notes/diff_notes_bundle.js
app/assets/javascripts/diff_notes/diff_notes_bundle.js
+2
-1
app/assets/javascripts/diff_notes/services/resolve.js
app/assets/javascripts/diff_notes/services/resolve.js
+1
-1
app/controllers/projects/commit_controller.rb
app/controllers/projects/commit_controller.rb
+17
-0
app/controllers/projects/merge_requests/diffs_controller.rb
app/controllers/projects/merge_requests/diffs_controller.rb
+27
-14
app/helpers/commits_helper.rb
app/helpers/commits_helper.rb
+8
-0
app/models/concerns/discussion_on_diff.rb
app/models/concerns/discussion_on_diff.rb
+4
-0
app/models/diff_discussion.rb
app/models/diff_discussion.rb
+5
-1
app/models/diff_note.rb
app/models/diff_note.rb
+7
-0
app/models/discussion.rb
app/models/discussion.rb
+1
-0
app/models/note.rb
app/models/note.rb
+5
-1
app/services/system_note_service.rb
app/services/system_note_service.rb
+12
-3
app/views/discussions/_discussion.html.haml
app/views/discussions/_discussion.html.haml
+11
-3
app/views/projects/commit/_commit_box.html.haml
app/views/projects/commit/_commit_box.html.haml
+11
-1
app/views/projects/commit/show.html.haml
app/views/projects/commit/show.html.haml
+3
-0
app/views/projects/commits/_commit.html.haml
app/views/projects/commits/_commit.html.haml
+19
-7
app/views/projects/commits/_commits.html.haml
app/views/projects/commits/_commits.html.haml
+5
-2
app/views/projects/merge_requests/_commits.html.haml
app/views/projects/merge_requests/_commits.html.haml
+1
-1
app/views/projects/merge_requests/diffs/_commit_widget.html.haml
...ws/projects/merge_requests/diffs/_commit_widget.html.haml
+5
-0
app/views/projects/merge_requests/diffs/_different_base.html.haml
...s/projects/merge_requests/diffs/_different_base.html.haml
+11
-0
app/views/projects/merge_requests/diffs/_diffs.html.haml
app/views/projects/merge_requests/diffs/_diffs.html.haml
+10
-5
app/views/projects/merge_requests/diffs/_not_all_comments_displayed.html.haml
...erge_requests/diffs/_not_all_comments_displayed.html.haml
+19
-0
app/views/projects/merge_requests/diffs/_version_controls.html.haml
...projects/merge_requests/diffs/_version_controls.html.haml
+1
-25
app/views/projects/merge_requests/show.html.haml
app/views/projects/merge_requests/show.html.haml
+1
-1
No files found.
app/assets/javascripts/diff_notes/diff_notes_bundle.js
View file @
e4eba908
...
...
@@ -16,7 +16,8 @@ import './components/diff_note_avatars';
import
'
./components/new_issue_for_discussion
'
;
$
(()
=>
{
const
projectPath
=
document
.
querySelector
(
'
.merge-request
'
).
dataset
.
projectPath
;
const
projectPathHolder
=
document
.
querySelector
(
'
.merge-request
'
)
||
document
.
querySelector
(
'
.commit-box
'
)
const
projectPath
=
projectPathHolder
.
dataset
.
projectPath
;
const
COMPONENT_SELECTOR
=
'
resolve-btn, resolve-discussion-btn, jump-to-discussion, comment-and-resolve-btn, new-issue-for-discussion-btn
'
;
window
.
gl
=
window
.
gl
||
{};
...
...
app/assets/javascripts/diff_notes/services/resolve.js
View file @
e4eba908
...
...
@@ -43,7 +43,7 @@ class ResolveServiceClass {
discussion
.
resolveAllNotes
(
resolvedBy
);
}
gl
.
mrWidget
.
checkStatus
();
if
(
gl
.
mrWidget
)
gl
.
mrWidget
.
checkStatus
();
discussion
.
updateHeadline
(
data
);
})
.
catch
(()
=>
new
Flash
(
'
An error occurred when trying to resolve a discussion. Please try again.
'
));
...
...
app/controllers/projects/commit_controller.rb
View file @
e4eba908
...
...
@@ -134,6 +134,23 @@ class Projects::CommitController < Projects::ApplicationController
@grouped_diff_discussions
=
commit
.
grouped_diff_discussions
@discussions
=
commit
.
discussions
if
merge_request_iid
=
params
[
:merge_request_iid
]
@merge_request
=
MergeRequestsFinder
.
new
(
current_user
,
project_id:
@project
.
id
).
find_by
(
iid:
merge_request_iid
)
if
@merge_request
@new_diff_note_attrs
.
merge!
(
noteable_type:
'MergeRequest'
,
noteable_id:
@merge_request
.
id
)
merge_request_commit_notes
=
@merge_request
.
notes
.
where
(
commit_id:
@commit
.
id
).
inc_relations_for_view
merge_request_commit_diff_discussions
=
merge_request_commit_notes
.
grouped_diff_discussions
(
@commit
.
diff_refs
)
@grouped_diff_discussions
.
merge!
(
merge_request_commit_diff_discussions
)
do
|
line_code
,
left
,
right
|
left
+
right
end
end
end
@notes
=
(
@grouped_diff_discussions
.
values
.
flatten
+
@discussions
).
flat_map
(
&
:notes
)
@notes
=
prepare_notes_for_rendering
(
@notes
,
@commit
)
end
...
...
app/controllers/projects/merge_requests/diffs_controller.rb
View file @
e4eba908
...
...
@@ -20,18 +20,33 @@ class Projects::MergeRequests::DiffsController < Projects::MergeRequests::Applic
private
def
define_diff_vars
@merge_request_diffs
=
@merge_request
.
merge_request_diffs
.
viewable
.
select_without_diff
.
order_id_desc
if
commit_id
=
params
[
:commit_id
].
presence
@commit
=
@merge_request
.
target_project
.
commit
(
commit_id
)
@compare
=
@commit
else
@compare
=
find_merge_request_diff_compare
end
return
render_404
unless
@compare
@diffs
=
@compare
.
diffs
(
diff_options
)
end
def
find_merge_request_diff_compare
@merge_request_diff
=
if
params
[
:diff_id
]
@merge_request
.
merge_request_diffs
.
viewable
.
find
(
params
[
:diff_id
]
)
if
diff_id
=
params
[
:diff_id
].
presence
@merge_request
.
merge_request_diffs
.
viewable
.
find
_by
(
id:
diff_id
)
else
@merge_request
.
merge_request_diff
end
@merge_request_diffs
=
@merge_request
.
merge_request_diffs
.
viewable
.
order_id_desc
return
unless
@merge_request_diff
@comparable_diffs
=
@merge_request_diffs
.
select
{
|
diff
|
diff
.
id
<
@merge_request_diff
.
id
}
if
params
[
:start_sha
].
present?
@start_sha
=
params
[
:start_sha
]
if
@start_sha
=
params
[
:start_sha
].
presence
@start_version
=
@comparable_diffs
.
find
{
|
diff
|
diff
.
head_commit_sha
==
@start_sha
}
unless
@start_version
...
...
@@ -40,20 +55,18 @@ class Projects::MergeRequests::DiffsController < Projects::MergeRequests::Applic
end
end
@compare
=
if
@start_sha
@merge_request_diff
.
compare_with
(
@start_sha
)
else
@merge_request_diff
end
@diffs
=
@compare
.
diffs
(
diff_options
)
if
@start_sha
@merge_request_diff
.
compare_with
(
@start_sha
)
else
@merge_request_diff
end
end
def
define_diff_comment_vars
@new_diff_note_attrs
=
{
noteable_type:
'MergeRequest'
,
noteable_id:
@merge_request
.
id
noteable_id:
@merge_request
.
id
,
commit_id:
@commit
&
.
id
}
@diff_notes_disabled
=
false
...
...
app/helpers/commits_helper.rb
View file @
e4eba908
...
...
@@ -228,4 +228,12 @@ module CommitsHelper
[
commits
,
0
]
end
end
def
commit_path
(
project
,
commit
,
merge_request:
nil
)
if
merge_request
&
.
persisted?
diffs_namespace_project_merge_request_path
(
project
.
namespace
,
project
,
merge_request
,
commit_id:
commit
.
id
)
else
namespace_project_commit_path
(
project
.
namespace
,
project
,
commit
.
id
)
end
end
end
app/models/concerns/discussion_on_diff.rb
View file @
e4eba908
...
...
@@ -32,6 +32,10 @@ module DiscussionOnDiff
first_note
.
position
.
new_path
end
def
on_merge_request_commit?
for_merge_request?
&&
commit_id
.
present?
end
# Returns an array of at most 16 highlighted lines above a diff note
def
truncated_diff_lines
(
highlight:
true
)
lines
=
highlight
?
highlighted_diff_lines
:
diff_lines
...
...
app/models/diff_discussion.rb
View file @
e4eba908
...
...
@@ -24,7 +24,11 @@ class DiffDiscussion < Discussion
return
unless
for_merge_request?
return
{}
if
active?
noteable
.
version_params_for
(
position
.
diff_refs
)
if
on_merge_request_commit?
{
commit_id:
commit_id
}
else
noteable
.
version_params_for
(
position
.
diff_refs
)
end
end
def
reply_attributes
...
...
app/models/diff_note.rb
View file @
e4eba908
...
...
@@ -17,6 +17,7 @@ class DiffNote < Note
validates
:noteable_type
,
inclusion:
{
in:
NOTEABLE_TYPES
}
validate
:positions_complete
validate
:verify_supported
validate
:diff_refs_match_commit
,
if: :for_commit?
before_validation
:set_original_position
,
on: :create
before_validation
:update_position
,
on: :create
,
if: :on_text?
...
...
@@ -135,6 +136,12 @@ class DiffNote < Note
errors
.
add
(
:position
,
"is invalid"
)
end
def
diff_refs_match_commit
return
if
self
.
original_position
.
diff_refs
==
self
.
commit
.
diff_refs
errors
.
add
(
:commit_id
,
'does not match the diff refs'
)
end
def
keep_around_commits
project
.
repository
.
keep_around
(
self
.
original_position
.
base_sha
)
project
.
repository
.
keep_around
(
self
.
original_position
.
start_sha
)
...
...
app/models/discussion.rb
View file @
e4eba908
...
...
@@ -11,6 +11,7 @@ class Discussion
:author
,
:noteable
,
:commit_id
,
:for_commit?
,
:for_merge_request?
,
...
...
app/models/note.rb
View file @
e4eba908
...
...
@@ -230,10 +230,14 @@ class Note < ActiveRecord::Base
for_personal_snippet?
end
def
commit
project
.
commit
(
commit_id
)
if
commit_id
.
present?
end
# override to return commits, which are not active record
def
noteable
if
for_commit?
@commit
||=
project
.
commit
(
commit_id
)
@commit
||=
commit
else
super
end
...
...
app/services/system_note_service.rb
View file @
e4eba908
...
...
@@ -23,7 +23,7 @@ module SystemNoteService
body
=
"added
#{
commits_text
}
\n\n
"
body
<<
existing_commit_summary
(
noteable
,
existing_commits
,
oldrev
)
body
<<
new_commit_summary
(
new_commits
).
join
(
"
\n
"
)
body
<<
new_commit_summary
(
n
oteable
,
n
ew_commits
).
join
(
"
\n
"
)
body
<<
"
\n\n
[Compare with previous version](
#{
diff_comparison_url
(
noteable
,
project
,
oldrev
)
}
)"
create_note
(
NoteSummary
.
new
(
noteable
,
project
,
author
,
body
,
action:
'commit'
,
commit_count:
total_count
))
...
...
@@ -486,9 +486,9 @@ module SystemNoteService
# new_commits - Array of new Commit objects
#
# Returns an Array of Strings
def
new_commit_summary
(
new_commits
)
def
new_commit_summary
(
merge_request
,
new_commits
)
new_commits
.
collect
do
|
commit
|
"*
#{
commit
.
short_id
}
-
#{
escape_html
(
commit
.
title
)
}
"
"*
[
#{
commit
.
short_id
}
](
#{
merge_request_commit_url
(
merge_request
,
commit
)
}
)
-
#{
escape_html
(
commit
.
title
)
}
"
end
end
...
...
@@ -668,4 +668,13 @@ module SystemNoteService
start_sha:
oldrev
)
end
def
merge_request_commit_url
(
merge_request
,
commit
)
url_helpers
.
diffs_namespace_project_merge_request_url
(
project
.
namespace
,
project
,
merge_request
.
iid
,
commit_id:
commit
.
id
)
end
end
app/views/discussions/_discussion.html.haml
View file @
e4eba908
...
...
@@ -32,9 +32,17 @@
-
elsif
discussion
.
diff_discussion?
on
=
conditional_link_to
url
.
present?
,
url
do
-
unless
discussion
.
active?
an old version of
the diff
-
if
discussion
.
on_merge_request_commit?
-
unless
discussion
.
active?
an outdated change in
commit
%span
.commit-sha
=
Commit
.
truncate_sha
(
discussion
.
commit_id
)
-
else
-
unless
discussion
.
active?
an old version of
the diff
=
time_ago_with_tooltip
(
discussion
.
created_at
,
placement:
"bottom"
,
html_class:
"note-created-ago"
)
=
render
"discussions/headline"
,
discussion:
discussion
...
...
app/views/projects/commit/_commit_box.html.haml
View file @
e4eba908
...
...
@@ -47,7 +47,7 @@
%li
=
link_to
s_
(
"DownloadCommit|Email Patches"
),
project_commit_path
(
@project
,
@commit
,
format: :patch
)
%li
=
link_to
s_
(
"DownloadCommit|Plain Diff"
),
project_commit_path
(
@project
,
@commit
,
format: :diff
)
.commit-box
.commit-box
{
data:
{
project_path:
project_path
(
@project
)
}
}
%h3
.commit-title
=
markdown
(
@commit
.
title
,
pipeline: :single_line
,
author:
@commit
.
author
)
-
if
@commit
.
description
.
present?
...
...
@@ -80,3 +80,13 @@
-
if
last_pipeline
.
duration
in
=
time_interval_in_words
last_pipeline
.
duration
-
if
@merge_request
.well-segment
=
icon
(
'info-circle fw'
)
This commit is part of merge request
=
succeed
'.'
do
=
link_to
@merge_request
.
to_reference
,
namespace_project_merge_request_path
(
@project
.
namespace
,
@project
,
@merge_request
)
Comments created here will be created in the context of that merge request.
app/views/projects/commit/show.html.haml
View file @
e4eba908
...
...
@@ -6,6 +6,9 @@
-
@content_class
=
limited_container_width
-
page_title
"
#{
@commit
.
title
}
(
#{
@commit
.
short_id
}
)"
,
"Commits"
-
page_description
@commit
.
description
-
content_for
:page_specific_javascripts
do
=
page_specific_javascript_bundle_tag
(
'common_vue'
)
=
page_specific_javascript_bundle_tag
(
'diff_notes'
)
.container-fluid
{
class:
[
limited_container_width
,
container_class
]
}
=
render
"commit_box"
...
...
app/views/projects/commits/_commit.html.haml
View file @
e4eba908
-
ref
=
local_assigns
.
fetch
(
:ref
)
-
cache_key
=
[
project
.
full_path
,
commit
.
id
,
current_application_settings
,
@path
.
presence
,
current_controller?
(
:commits
),
I18n
.
locale
]
-
view_details
=
local_assigns
.
fetch
(
:view_details
,
false
)
-
merge_request
=
local_assigns
.
fetch
(
:merge_request
,
nil
)
-
project
=
local_assigns
.
fetch
(
:project
)
{
merge_request
&
.
project
}
-
ref
=
local_assigns
.
fetch
(
:ref
)
{
merge_request
&
.
source_branch
}
-
link
=
commit_path
(
project
,
commit
,
merge_request:
merge_request
)
-
if
@note_counts
-
note_count
=
@note_counts
.
fetch
(
commit
.
id
,
0
)
-
else
-
notes
=
commit
.
notes
-
note_count
=
notes
.
user
.
count
-
cache_key
=
[
project
.
full_path
,
commit
.
id
,
current_application_settings
,
note_count
,
@path
.
presence
,
current_controller?
(
:commits
),
merge_request
,
I18n
.
locale
]
-
cache_key
.
push
(
commit
.
status
(
ref
))
if
commit
.
status
(
ref
)
=
cache
(
cache_key
,
expires_in:
1
.
day
)
do
...
...
@@ -11,7 +21,7 @@
.commit-detail
.commit-content
=
link_to_markdown_field
(
commit
,
:title
,
project_commit_path
(
project
,
commit
.
id
)
,
class:
"commit-row-message item-title"
)
=
link_to_markdown_field
(
commit
,
:title
,
link
,
class:
"commit-row-message item-title"
)
%span
.commit-row-message.visible-xs-inline
·
=
commit
.
short_id
...
...
@@ -31,8 +41,7 @@
-
commit_text
=
_
(
'%{commit_author_link} committed %{commit_timeago}'
)
%
{
commit_author_link:
commit_author_link
,
commit_timeago:
commit_timeago
}
#{
commit_text
.
html_safe
}
.commit-actions.hidden-xs
.commit-actions.flex-row.hidden-xs
-
if
request
.
xhr?
=
render
partial:
'projects/commit/signature'
,
object:
commit
.
signature
-
else
...
...
@@ -41,6 +50,9 @@
-
if
commit
.
status
(
ref
)
=
render_commit_status
(
commit
,
ref:
ref
)
=
link_to
commit
.
short_id
,
project_commit_path
(
project
,
commit
)
,
class:
"commit-sha btn btn-transparent btn-link"
=
link_to
commit
.
short_id
,
link
,
class:
"commit-sha btn btn-transparent btn-link"
=
clipboard_button
(
text:
commit
.
id
,
title:
_
(
"Copy commit SHA to clipboard"
))
=
link_to_browse_code
(
project
,
commit
)
-
if
view_details
&&
merge_request
=
link_to
"View details"
,
namespace_project_commit_path
(
project
.
namespace
,
project
,
commit
.
id
,
merge_request_iid:
merge_request
.
iid
),
class:
"btn btn-default"
app/views/projects/commits/_commits.html.haml
View file @
e4eba908
-
ref
=
local_assigns
.
fetch
(
:ref
)
-
merge_request
=
local_assigns
.
fetch
(
:merge_request
,
nil
)
-
project
=
local_assigns
.
fetch
(
:project
)
{
merge_request
&
.
project
}
-
ref
=
local_assigns
.
fetch
(
:ref
)
{
merge_request
&
.
source_branch
}
-
commits
,
hidden
=
limited_commits
(
@commits
)
-
commits
.
chunk
{
|
c
|
c
.
committed_date
.
in_time_zone
.
to_date
}.
each
do
|
day
,
commits
|
...
...
@@ -8,7 +11,7 @@
%li
.commits-row
{
data:
{
day:
day
}
}
%ul
.content-list.commit-list.flex-list
=
render
partial:
'projects/commits/commit'
,
collection:
commits
,
locals:
{
project:
project
,
ref:
ref
}
=
render
partial:
'projects/commits/commit'
,
collection:
commits
,
locals:
{
project:
project
,
ref:
ref
,
merge_request:
merge_request
}
-
if
hidden
>
0
%li
.alert.alert-warning
...
...
app/views/projects/merge_requests/_commits.html.haml
View file @
e4eba908
...
...
@@ -5,4 +5,4 @@
=
custom_icon
(
'illustration_no_commits'
)
-
else
%ol
#commits-list
.list-unstyled
=
render
"projects/commits/commits"
,
project:
@merge_request
.
source_project
,
ref:
@merge_request
.
source_branch
=
render
"projects/commits/commits"
,
merge_request:
@merge_request
app/views/projects/merge_requests/diffs/_commit_widget.html.haml
0 → 100644
View file @
e4eba908
-
if
@commit
.info-well.hidden-xs.prepend-top-default
.well-segment
%ul
.blob-commit-info
=
render
'projects/commits/commit'
,
commit:
@commit
,
merge_request:
@merge_request
,
view_details:
true
app/views/projects/merge_requests/diffs/_different_base.html.haml
0 → 100644
View file @
e4eba908
-
if
@merge_request_diff
&&
different_base?
(
@start_version
,
@merge_request_diff
)
.mr-version-controls
.content-block
=
icon
(
'info-circle'
)
Selected versions have different base commits.
Changes will include
=
link_to
namespace_project_compare_path
(
@project
.
namespace
,
@project
,
from:
@start_version
.
base_commit_sha
,
to:
@merge_request_diff
.
base_commit_sha
)
do
new commits
from
=
succeed
'.'
do
%code
=
@merge_request
.
target_branch
app/views/projects/merge_requests/diffs/_diffs.html.haml
View file @
e4eba908
-
if
@merge_request_diff
.
collected?
||
@merge_request_diff
.
overflow?
=
render
'projects/merge_requests/diffs/versions'
=
render
"projects/diffs/diffs"
,
diffs:
@diffs
,
environment:
@environment
,
merge_request:
true
-
elsif
@merge_request_diff
.
empty?
=
render
'projects/merge_requests/diffs/version_controls'
=
render
'projects/merge_requests/diffs/different_base'
=
render
'projects/merge_requests/diffs/not_all_comments_displayed'
=
render
'projects/merge_requests/diffs/commit_widget'
-
if
@merge_request_diff
&
.
empty?
.nothing-here-block
=
image_tag
'illustrations/merge_request_changes_empty.svg'
%p
...
...
@@ -9,5 +11,8 @@
%strong
=
@merge_request
.
source_branch
into
%strong
=
@merge_request
.
target_branch
%p
=
link_to
'Create commit'
,
project_new_blob_path
(
@project
,
@merge_request
.
source_branch
),
class:
'btn btn-save'
-
else
-
diff_viewable
=
@merge_request_diff
?
@merge_request_diff
.
collected?
||
@merge_request_diff
.
overflow?
:
true
-
if
diff_viewable
=
render
"projects/diffs/diffs"
,
diffs:
@diffs
,
environment:
@environment
,
merge_request:
true
app/views/projects/merge_requests/diffs/_not_all_comments_displayed.html.haml
0 → 100644
View file @
e4eba908
-
if
@commit
||
@start_version
||
(
@merge_request_diff
&&
!
@merge_request_diff
.
latest?
)
.mr-version-controls
.content-block.comments-disabled-notif
=
icon
(
'info-circle'
)
Not all comments are displayed because you're
=
succeed
'.'
do
-
if
@commit
viewing only the changes in commit
=
link_to
@commit
.
short_id
,
diffs_namespace_project_merge_request_path
(
@project
.
namespace
,
@project
,
@merge_request
,
commit_id:
@commit
.
id
),
class:
"commit-sha"
-
elsif
@start_version
comparing two versions of the diff
-
else
viewing an old version of the diff
.pull-right
=
link_to
diffs_namespace_project_merge_request_path
(
@project
.
namespace
,
@project
,
@merge_request
),
class:
'btn btn-sm'
do
Show latest version
=
"of the diff"
if
@commit
app/views/projects/merge_requests/diffs/_versions.html.haml
→
app/views/projects/merge_requests/diffs/_version
_control
s.html.haml
View file @
e4eba908
-
if
@merge_request_diffs
.
size
>
1
-
if
@merge_request_diff
&&
@merge_request_diff
s
.
size
>
1
.mr-version-controls
.mr-version-menus-container.content-block
Changes between
...
...
@@ -71,27 +71,3 @@
(base)
%div
%strong
.commit-sha
=
short_sha
(
@merge_request_diff
.
base_commit_sha
)
-
if
different_base?
(
@start_version
,
@merge_request_diff
)
.content-block
=
icon
(
'info-circle'
)
Selected versions have different base commits.
Changes will include
=
link_to
project_compare_path
(
@project
,
from:
@start_version
.
base_commit_sha
,
to:
@merge_request_diff
.
base_commit_sha
)
do
new commits
from
=
succeed
'.'
do
%code
=
@merge_request
.
target_branch
-
if
@start_version
||
!
@merge_request_diff
.
latest?
.comments-disabled-notif.content-block
=
icon
(
'info-circle'
)
Not all comments are displayed because you're
-
if
@start_version
comparing two versions
-
else
viewing an old version
of the diff.
.pull-right
=
link_to
'Show latest version'
,
diffs_project_merge_request_path
(
@project
,
@merge_request
),
class:
'btn btn-sm'
app/views/projects/merge_requests/show.html.haml
View file @
e4eba908
...
...
@@ -8,7 +8,7 @@
=
webpack_bundle_tag
(
'common_vue'
)
=
webpack_bundle_tag
(
'diff_notes'
)
.merge-request
{
'data-mr-action'
:
"#{j params[:tab].presence || 'show'}"
,
'data-url'
=>
merge_request_path
(
@merge_request
,
format: :json
),
'data-project-path'
=>
project_path
(
@merge_request
.
project
)
}
.merge-request
{
data:
{
mr_action:
j
(
params
[
:tab
].
presence
||
'show'
),
url:
merge_request_path
(
@merge_request
,
format: :json
),
project_path:
project_path
(
@merge_request
.
project
)
}
}
=
render
"projects/merge_requests/mr_title"
.merge-request-details.issuable-details
{
data:
{
id:
@merge_request
.
project
.
id
}
}
...
...
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