BigW Consortium Gitlab
Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gitlab-ce
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Forest Godfrey
gitlab-ce
Commits
e0e153d2
Unverified
Commit
e0e153d2
authored
Sep 14, 2017
by
Luke "Jared" Bennett
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Dont allow diff commenting if MR locked
parent
09a4030c
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
2 deletions
+3
-2
diff.js
app/assets/javascripts/diff.js
+2
-1
show.html.haml
app/views/projects/merge_requests/show.html.haml
+1
-1
No files found.
app/assets/javascripts/diff.js
View file @
e0e153d2
...
...
@@ -17,7 +17,8 @@ class Diff {
}
});
FilesCommentButton
.
init
(
$diffFile
);
const
tab
=
document
.
getElementById
(
'diffs'
);
if
(
tab
&&
tab
.
dataset
.
isLocked
===
'false'
)
FilesCommentButton
.
init
(
$diffFile
);
$diffFile
.
each
((
index
,
file
)
=>
new
gl
.
ImageFile
(
file
));
...
...
app/views/projects/merge_requests/show.html.haml
View file @
e0e153d2
...
...
@@ -80,7 +80,7 @@
#pipelines
.pipelines.tab-pane
-
if
@pipelines
.
any?
=
render
'projects/commit/pipelines_list'
,
disable_initialization:
true
,
endpoint:
pipelines_project_merge_request_path
(
@project
,
@merge_request
)
#diffs
.diffs.tab-pane
#diffs
.diffs.tab-pane
{
data:
{
"is-locked"
=>
@merge_request
.
discussion_locked?
.
to_s
}
}
-# This tab is always loaded via AJAX
.mr-loading-status
...
...
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