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
aa73c226
Commit
aa73c226
authored
Jan 22, 2021
by
Natalia Tepluhina
Committed by
David O'Regan
Jan 22, 2021
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Resolve "User "cannot merge" an issue
🤔
"
parent
26d31ce4
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
15 additions
and
3 deletions
+15
-3
app/assets/javascripts/lib/utils/common_utils.js
app/assets/javascripts/lib/utils/common_utils.js
+1
-0
app/assets/javascripts/sidebar/mount_sidebar.js
app/assets/javascripts/sidebar/mount_sidebar.js
+9
-3
changelogs/unreleased/299457-user-cannot-merge-an-issue.yml
changelogs/unreleased/299457-user-cannot-merge-an-issue.yml
+5
-0
No files found.
app/assets/javascripts/lib/utils/common_utils.js
View file @
aa73c226
...
@@ -45,6 +45,7 @@ export const checkPageAndAction = (page, action) => {
...
@@ -45,6 +45,7 @@ export const checkPageAndAction = (page, action) => {
export
const
isInIncidentPage
=
()
=>
checkPageAndAction
(
'
incidents
'
,
'
show
'
);
export
const
isInIncidentPage
=
()
=>
checkPageAndAction
(
'
incidents
'
,
'
show
'
);
export
const
isInIssuePage
=
()
=>
checkPageAndAction
(
'
issues
'
,
'
show
'
);
export
const
isInIssuePage
=
()
=>
checkPageAndAction
(
'
issues
'
,
'
show
'
);
export
const
isInDesignPage
=
()
=>
checkPageAndAction
(
'
issues
'
,
'
designs
'
);
export
const
isInMRPage
=
()
=>
checkPageAndAction
(
'
merge_requests
'
,
'
show
'
);
export
const
isInMRPage
=
()
=>
checkPageAndAction
(
'
merge_requests
'
,
'
show
'
);
export
const
isInEpicPage
=
()
=>
checkPageAndAction
(
'
epics
'
,
'
show
'
);
export
const
isInEpicPage
=
()
=>
checkPageAndAction
(
'
epics
'
,
'
show
'
);
...
...
app/assets/javascripts/sidebar/mount_sidebar.js
View file @
aa73c226
...
@@ -14,7 +14,12 @@ import SidebarSeverity from './components/severity/sidebar_severity.vue';
...
@@ -14,7 +14,12 @@ import SidebarSeverity from './components/severity/sidebar_severity.vue';
import
Translate
from
'
../vue_shared/translate
'
;
import
Translate
from
'
../vue_shared/translate
'
;
import
CopyEmailToClipboard
from
'
./components/copy_email_to_clipboard.vue
'
;
import
CopyEmailToClipboard
from
'
./components/copy_email_to_clipboard.vue
'
;
import
createDefaultClient
from
'
~/lib/graphql
'
;
import
createDefaultClient
from
'
~/lib/graphql
'
;
import
{
isInIssuePage
,
isInIncidentPage
,
parseBoolean
}
from
'
~/lib/utils/common_utils
'
;
import
{
isInIssuePage
,
isInDesignPage
,
isInIncidentPage
,
parseBoolean
,
}
from
'
~/lib/utils/common_utils
'
;
import
createFlash
from
'
~/flash
'
;
import
createFlash
from
'
~/flash
'
;
import
{
__
}
from
'
~/locale
'
;
import
{
__
}
from
'
~/locale
'
;
...
@@ -49,7 +54,8 @@ function mountAssigneesComponent(mediator) {
...
@@ -49,7 +54,8 @@ function mountAssigneesComponent(mediator) {
projectPath
:
fullPath
,
projectPath
:
fullPath
,
field
:
el
.
dataset
.
field
,
field
:
el
.
dataset
.
field
,
signedIn
:
el
.
hasAttribute
(
'
data-signed-in
'
),
signedIn
:
el
.
hasAttribute
(
'
data-signed-in
'
),
issuableType
:
isInIssuePage
()
||
isInIncidentPage
()
?
'
issue
'
:
'
merge_request
'
,
issuableType
:
isInIssuePage
()
||
isInIncidentPage
()
||
isInDesignPage
()
?
'
issue
'
:
'
merge_request
'
,
},
},
}),
}),
});
});
...
@@ -78,7 +84,7 @@ function mountReviewersComponent(mediator) {
...
@@ -78,7 +84,7 @@ function mountReviewersComponent(mediator) {
issuableIid
:
String
(
iid
),
issuableIid
:
String
(
iid
),
projectPath
:
fullPath
,
projectPath
:
fullPath
,
field
:
el
.
dataset
.
field
,
field
:
el
.
dataset
.
field
,
issuableType
:
isInIssuePage
()
?
'
issue
'
:
'
merge_request
'
,
issuableType
:
isInIssuePage
()
||
isInDesignPage
()
?
'
issue
'
:
'
merge_request
'
,
},
},
}),
}),
});
});
...
...
changelogs/unreleased/299457-user-cannot-merge-an-issue.yml
0 → 100644
View file @
aa73c226
---
title
:
'
Resolve
User
cannot
merge
an
issue'
merge_request
:
52311
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