Finish backports and fix specs
This commit is contained in:
parent
563c7de58e
commit
f9fbae2e27
3 changed files with 14 additions and 4 deletions
|
@ -6,7 +6,8 @@ const Api = {
|
|||
namespacesPath: '/api/:version/namespaces.json',
|
||||
groupProjectsPath: '/api/:version/groups/:id/projects.json',
|
||||
projectsPath: '/api/:version/projects.json',
|
||||
labelsPath: '/:namespace_path/:project_path/labels',
|
||||
projectLabelsPath: '/:namespace_path/:project_path/labels',
|
||||
groupLabelsPath: '/groups/:namespace_path/labels',
|
||||
licensePath: '/api/:version/templates/licenses/:key',
|
||||
gitignorePath: '/api/:version/templates/gitignores/:key',
|
||||
gitlabCiYmlPath: '/api/:version/templates/gitlab_ci_ymls/:key',
|
||||
|
@ -74,7 +75,16 @@ const Api = {
|
|||
},
|
||||
|
||||
newLabel(namespacePath, projectPath, data, callback) {
|
||||
const url = Api.buildUrl(Api.labelsPath);
|
||||
let url;
|
||||
|
||||
if (projectPath) {
|
||||
url = Api.buildUrl(Api.projectLabelsPath)
|
||||
.replace(':namespace_path', namespacePath)
|
||||
.replace(':project_path', projectPath);
|
||||
} else {
|
||||
url = Api.buildUrl(Api.groupLabelsPath).replace(':namespace_path', namespacePath);
|
||||
}
|
||||
|
||||
return $.ajax({
|
||||
url,
|
||||
type: 'POST',
|
||||
|
|
|
@ -64,7 +64,7 @@ gl.issueBoards.IssueCardInner = Vue.extend({
|
|||
return this.issue.assignees.length > this.numberOverLimit;
|
||||
},
|
||||
cardUrl() {
|
||||
return `${this.issueLinkBase}/${this.issue.id}`;
|
||||
return `${this.issueLinkBase}/${this.issue.iid}`;
|
||||
},
|
||||
issueId() {
|
||||
if (this.issue.iid) {
|
||||
|
|
|
@ -61,7 +61,7 @@ module Boards
|
|||
end
|
||||
|
||||
def project
|
||||
@project ||= Project.find(issue_params[:project_id])
|
||||
board_parent
|
||||
end
|
||||
|
||||
def move_params
|
||||
|
|
Loading…
Reference in a new issue