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
f9fbae2e
Commit
f9fbae2e
authored
Sep 06, 2017
by
Felipe Artur
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Finish backports and fix specs
parent
563c7de5
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
14 additions
and
4 deletions
+14
-4
app/assets/javascripts/api.js
app/assets/javascripts/api.js
+12
-2
app/assets/javascripts/boards/components/issue_card_inner.js
app/assets/javascripts/boards/components/issue_card_inner.js
+1
-1
app/controllers/boards/issues_controller.rb
app/controllers/boards/issues_controller.rb
+1
-1
No files found.
app/assets/javascripts/api.js
View file @
f9fbae2e
...
@@ -6,7 +6,8 @@ const Api = {
...
@@ -6,7 +6,8 @@ const Api = {
namespacesPath
:
'
/api/:version/namespaces.json
'
,
namespacesPath
:
'
/api/:version/namespaces.json
'
,
groupProjectsPath
:
'
/api/:version/groups/:id/projects.json
'
,
groupProjectsPath
:
'
/api/:version/groups/:id/projects.json
'
,
projectsPath
:
'
/api/:version/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
'
,
licensePath
:
'
/api/:version/templates/licenses/:key
'
,
gitignorePath
:
'
/api/:version/templates/gitignores/:key
'
,
gitignorePath
:
'
/api/:version/templates/gitignores/:key
'
,
gitlabCiYmlPath
:
'
/api/:version/templates/gitlab_ci_ymls/:key
'
,
gitlabCiYmlPath
:
'
/api/:version/templates/gitlab_ci_ymls/:key
'
,
...
@@ -74,7 +75,16 @@ const Api = {
...
@@ -74,7 +75,16 @@ const Api = {
},
},
newLabel
(
namespacePath
,
projectPath
,
data
,
callback
)
{
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
({
return
$
.
ajax
({
url
,
url
,
type
:
'
POST
'
,
type
:
'
POST
'
,
...
...
app/assets/javascripts/boards/components/issue_card_inner.js
View file @
f9fbae2e
...
@@ -64,7 +64,7 @@ gl.issueBoards.IssueCardInner = Vue.extend({
...
@@ -64,7 +64,7 @@ gl.issueBoards.IssueCardInner = Vue.extend({
return
this
.
issue
.
assignees
.
length
>
this
.
numberOverLimit
;
return
this
.
issue
.
assignees
.
length
>
this
.
numberOverLimit
;
},
},
cardUrl
()
{
cardUrl
()
{
return
`
${
this
.
issueLinkBase
}
/
${
this
.
issue
.
id
}
`
;
return
`
${
this
.
issueLinkBase
}
/
${
this
.
issue
.
i
i
d
}
`
;
},
},
issueId
()
{
issueId
()
{
if
(
this
.
issue
.
iid
)
{
if
(
this
.
issue
.
iid
)
{
...
...
app/controllers/boards/issues_controller.rb
View file @
f9fbae2e
...
@@ -61,7 +61,7 @@ module Boards
...
@@ -61,7 +61,7 @@ module Boards
end
end
def
project
def
project
@project
||=
Project
.
find
(
issue_params
[
:project_id
])
board_parent
end
end
def
move_params
def
move_params
...
...
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