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
631c3d64
Commit
631c3d64
authored
Apr 04, 2019
by
Hiroyuki Sato
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove a "reopen merge request button" on a "merged" merge request
parent
47807774
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
12 additions
and
3 deletions
+12
-3
app/assets/javascripts/notes/components/comment_form.vue
app/assets/javascripts/notes/components/comment_form.vue
+6
-3
app/assets/javascripts/notes/constants.js
app/assets/javascripts/notes/constants.js
+1
-0
changelogs/unreleased/do-not-reopen-merged-mr.yml
changelogs/unreleased/do-not-reopen-merged-mr.yml
+5
-0
No files found.
app/assets/javascripts/notes/components/comment_form.vue
View file @
631c3d64
...
@@ -115,8 +115,11 @@ export default {
...
@@ -115,8 +115,11 @@ export default {
author
()
{
author
()
{
return
this
.
getUserData
;
return
this
.
getUserData
;
},
},
canUpdateIssue
()
{
canToggleIssueState
()
{
return
this
.
getNoteableData
.
current_user
.
can_update
;
return
(
this
.
getNoteableData
.
current_user
.
can_update
&&
this
.
getNoteableData
.
state
!==
constants
.
MERGED
);
},
},
endpoint
()
{
endpoint
()
{
return
this
.
getNoteableData
.
create_note_path
;
return
this
.
getNoteableData
.
create_note_path
;
...
@@ -415,7 +418,7 @@ append-right-10 comment-type-dropdown js-comment-type-dropdown droplab-dropdown"
...
@@ -415,7 +418,7 @@ append-right-10 comment-type-dropdown js-comment-type-dropdown droplab-dropdown"
</div>
</div>
<loading-button
<loading-button
v-if=
"can
UpdateIssu
e"
v-if=
"can
ToggleIssueStat
e"
:loading=
"isToggleStateButtonLoading"
:loading=
"isToggleStateButtonLoading"
:container-class=
"[
:container-class=
"[
actionButtonClassNames,
actionButtonClassNames,
...
...
app/assets/javascripts/notes/constants.js
View file @
631c3d64
...
@@ -7,6 +7,7 @@ export const COMMENT = 'comment';
...
@@ -7,6 +7,7 @@ export const COMMENT = 'comment';
export
const
OPENED
=
'
opened
'
;
export
const
OPENED
=
'
opened
'
;
export
const
REOPENED
=
'
reopened
'
;
export
const
REOPENED
=
'
reopened
'
;
export
const
CLOSED
=
'
closed
'
;
export
const
CLOSED
=
'
closed
'
;
export
const
MERGED
=
'
merged
'
;
export
const
EMOJI_THUMBSUP
=
'
thumbsup
'
;
export
const
EMOJI_THUMBSUP
=
'
thumbsup
'
;
export
const
EMOJI_THUMBSDOWN
=
'
thumbsdown
'
;
export
const
EMOJI_THUMBSDOWN
=
'
thumbsdown
'
;
export
const
ISSUE_NOTEABLE_TYPE
=
'
issue
'
;
export
const
ISSUE_NOTEABLE_TYPE
=
'
issue
'
;
...
...
changelogs/unreleased/do-not-reopen-merged-mr.yml
0 → 100644
View file @
631c3d64
---
title
:
Remove a "reopen merge request button" on a "merged" merge request
merge_request
:
26965
author
:
Hiroyuki Sato
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