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
0
Merge Requests
0
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
Boxiang Sun
gitlab-ce
Commits
a61fa9ae
Commit
a61fa9ae
authored
Apr 16, 2018
by
Clement Ho
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix bad card renames from scoping issue board card selectors
parent
6384aeda
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
7 additions
and
7 deletions
+7
-7
app/views/projects/issues/show.html.haml
app/views/projects/issues/show.html.haml
+1
-1
app/views/projects/merge_requests/show.html.haml
app/views/projects/merge_requests/show.html.haml
+1
-1
spec/models/issue_spec.rb
spec/models/issue_spec.rb
+2
-2
spec/models/merge_request_spec.rb
spec/models/merge_request_spec.rb
+2
-2
spec/presenters/conversational_development_index/metric_presenter_spec.rb
...conversational_development_index/metric_presenter_spec.rb
+1
-1
No files found.
app/views/projects/issues/show.html.haml
View file @
a61fa9ae
...
@@ -3,7 +3,7 @@
...
@@ -3,7 +3,7 @@
-
breadcrumb_title
@issue
.
to_reference
-
breadcrumb_title
@issue
.
to_reference
-
page_title
"
#{
@issue
.
title
}
(
#{
@issue
.
to_reference
}
)"
,
"Issues"
-
page_title
"
#{
@issue
.
title
}
(
#{
@issue
.
to_reference
}
)"
,
"Issues"
-
page_description
@issue
.
description
-
page_description
@issue
.
description
-
page_card_attributes
@issue
.
board
-
card_attributes
-
page_card_attributes
@issue
.
card_attributes
-
can_update_issue
=
can?
(
current_user
,
:update_issue
,
@issue
)
-
can_update_issue
=
can?
(
current_user
,
:update_issue
,
@issue
)
-
can_report_spam
=
@issue
.
submittable_as_spam_by?
(
current_user
)
-
can_report_spam
=
@issue
.
submittable_as_spam_by?
(
current_user
)
...
...
app/views/projects/merge_requests/show.html.haml
View file @
a61fa9ae
...
@@ -4,7 +4,7 @@
...
@@ -4,7 +4,7 @@
-
breadcrumb_title
@merge_request
.
to_reference
-
breadcrumb_title
@merge_request
.
to_reference
-
page_title
"
#{
@merge_request
.
title
}
(
#{
@merge_request
.
to_reference
}
)"
,
"Merge Requests"
-
page_title
"
#{
@merge_request
.
title
}
(
#{
@merge_request
.
to_reference
}
)"
,
"Merge Requests"
-
page_description
@merge_request
.
description
-
page_description
@merge_request
.
description
-
page_card_attributes
@merge_request
.
board
-
card_attributes
-
page_card_attributes
@merge_request
.
card_attributes
.merge-request
{
data:
{
mr_action:
j
(
params
[
:tab
].
presence
||
'show'
),
url:
merge_request_path
(
@merge_request
,
format: :json
),
project_path:
project_path
(
@merge_request
.
project
)
}
}
.merge-request
{
data:
{
mr_action:
j
(
params
[
:tab
].
presence
||
'show'
),
url:
merge_request_path
(
@merge_request
,
format: :json
),
project_path:
project_path
(
@merge_request
.
project
)
}
}
=
render
"projects/merge_requests/mr_title"
=
render
"projects/merge_requests/mr_title"
...
...
spec/models/issue_spec.rb
View file @
a61fa9ae
...
@@ -70,7 +70,7 @@ describe Issue do
...
@@ -70,7 +70,7 @@ describe Issue do
allow
(
subject
).
to
receive
(
:author
).
and_return
(
double
(
name:
'Robert'
))
allow
(
subject
).
to
receive
(
:author
).
and_return
(
double
(
name:
'Robert'
))
allow
(
subject
).
to
receive
(
:assignees
).
and_return
([])
allow
(
subject
).
to
receive
(
:assignees
).
and_return
([])
expect
(
subject
.
board
-
card_attributes
)
expect
(
subject
.
card_attributes
)
.
to
eq
({
'Author'
=>
'Robert'
,
'Assignee'
=>
''
})
.
to
eq
({
'Author'
=>
'Robert'
,
'Assignee'
=>
''
})
end
end
...
@@ -78,7 +78,7 @@ describe Issue do
...
@@ -78,7 +78,7 @@ describe Issue do
allow
(
subject
).
to
receive
(
:author
).
and_return
(
double
(
name:
'Robert'
))
allow
(
subject
).
to
receive
(
:author
).
and_return
(
double
(
name:
'Robert'
))
allow
(
subject
).
to
receive
(
:assignees
).
and_return
([
double
(
name:
'Douwe'
)])
allow
(
subject
).
to
receive
(
:assignees
).
and_return
([
double
(
name:
'Douwe'
)])
expect
(
subject
.
board
-
card_attributes
)
expect
(
subject
.
card_attributes
)
.
to
eq
({
'Author'
=>
'Robert'
,
'Assignee'
=>
'Douwe'
})
.
to
eq
({
'Author'
=>
'Robert'
,
'Assignee'
=>
'Douwe'
})
end
end
end
end
...
...
spec/models/merge_request_spec.rb
View file @
a61fa9ae
...
@@ -191,7 +191,7 @@ describe MergeRequest do
...
@@ -191,7 +191,7 @@ describe MergeRequest do
allow
(
subject
).
to
receive
(
:author
).
and_return
(
double
(
name:
'Robert'
))
allow
(
subject
).
to
receive
(
:author
).
and_return
(
double
(
name:
'Robert'
))
allow
(
subject
).
to
receive
(
:assignee
).
and_return
(
nil
)
allow
(
subject
).
to
receive
(
:assignee
).
and_return
(
nil
)
expect
(
subject
.
board
-
card_attributes
)
expect
(
subject
.
card_attributes
)
.
to
eq
({
'Author'
=>
'Robert'
,
'Assignee'
=>
nil
})
.
to
eq
({
'Author'
=>
'Robert'
,
'Assignee'
=>
nil
})
end
end
...
@@ -199,7 +199,7 @@ describe MergeRequest do
...
@@ -199,7 +199,7 @@ describe MergeRequest do
allow
(
subject
).
to
receive
(
:author
).
and_return
(
double
(
name:
'Robert'
))
allow
(
subject
).
to
receive
(
:author
).
and_return
(
double
(
name:
'Robert'
))
allow
(
subject
).
to
receive
(
:assignee
).
and_return
(
double
(
name:
'Douwe'
))
allow
(
subject
).
to
receive
(
:assignee
).
and_return
(
double
(
name:
'Douwe'
))
expect
(
subject
.
board
-
card_attributes
)
expect
(
subject
.
card_attributes
)
.
to
eq
({
'Author'
=>
'Robert'
,
'Assignee'
=>
'Douwe'
})
.
to
eq
({
'Author'
=>
'Robert'
,
'Assignee'
=>
'Douwe'
})
end
end
end
end
...
...
spec/presenters/conversational_development_index/metric_presenter_spec.rb
View file @
a61fa9ae
...
@@ -6,7 +6,7 @@ describe ConversationalDevelopmentIndex::MetricPresenter do
...
@@ -6,7 +6,7 @@ describe ConversationalDevelopmentIndex::MetricPresenter do
describe
'#cards'
do
describe
'#cards'
do
it
'includes instance score, leader score and percentage score'
do
it
'includes instance score, leader score and percentage score'
do
issues_card
=
subject
.
board
-
cards
.
first
issues_card
=
subject
.
cards
.
first
expect
(
issues_card
.
instance_score
).
to
eq
(
1.234
)
expect
(
issues_card
.
instance_score
).
to
eq
(
1.234
)
expect
(
issues_card
.
leader_score
).
to
eq
(
9.256
)
expect
(
issues_card
.
leader_score
).
to
eq
(
9.256
)
...
...
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