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
19da7a55
Commit
19da7a55
authored
Aug 24, 2017
by
Jarka Kadlecova
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix failure when issue author is nil
parent
610155e0
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
35 additions
and
12 deletions
+35
-12
app/views/projects/issues/show.html.haml
app/views/projects/issues/show.html.haml
+2
-1
app/views/shared/issuable/_close_reopen_button.html.haml
app/views/shared/issuable/_close_reopen_button.html.haml
+2
-1
app/views/shared/issuable/_close_reopen_report_toggle.html.haml
...ews/shared/issuable/_close_reopen_report_toggle.html.haml
+12
-10
changelogs/unreleased/36860-deleted-user-fix.yml
changelogs/unreleased/36860-deleted-user-fix.yml
+5
-0
spec/features/issues/issue_detail_spec.rb
spec/features/issues/issue_detail_spec.rb
+14
-0
No files found.
app/views/projects/issues/show.html.haml
View file @
19da7a55
...
@@ -32,7 +32,8 @@
...
@@ -32,7 +32,8 @@
%ul
%ul
-
if
can_update_issue
-
if
can_update_issue
%li
=
link_to
'Edit'
,
edit_project_issue_path
(
@project
,
@issue
)
%li
=
link_to
'Edit'
,
edit_project_issue_path
(
@project
,
@issue
)
-
unless
current_user
==
@issue
.
author
/ TODO: simplify condition back #36860
-
if
@issue
.
author
&&
current_user
!=
@issue
.
author
%li
=
link_to
'Report abuse'
,
new_abuse_report_path
(
user_id:
@issue
.
author
.
id
,
ref_url:
issue_url
(
@issue
))
%li
=
link_to
'Report abuse'
,
new_abuse_report_path
(
user_id:
@issue
.
author
.
id
,
ref_url:
issue_url
(
@issue
))
-
if
can_update_issue
-
if
can_update_issue
%li
=
link_to
'Close issue'
,
issue_path
(
@issue
,
issue:
{
state_event: :close
},
format:
'json'
),
class:
"btn-close
#{
issue_button_visibility
(
@issue
,
true
)
}
"
,
title:
'Close issue'
%li
=
link_to
'Close issue'
,
issue_path
(
@issue
,
issue:
{
state_event: :close
},
format:
'json'
),
class:
"btn-close
#{
issue_button_visibility
(
@issue
,
true
)
}
"
,
title:
'Close issue'
...
...
app/views/shared/issuable/_close_reopen_button.html.haml
View file @
19da7a55
...
@@ -9,6 +9,7 @@
...
@@ -9,6 +9,7 @@
class:
"hidden-xs hidden-sm btn btn-grouped btn-reopen
#{
issuable_button_visibility
(
issuable
,
false
)
}
"
,
title:
"Reopen
#{
display_issuable_type
}
"
class:
"hidden-xs hidden-sm btn btn-grouped btn-reopen
#{
issuable_button_visibility
(
issuable
,
false
)
}
"
,
title:
"Reopen
#{
display_issuable_type
}
"
-
elsif
can_update
&&
!
is_current_user
-
elsif
can_update
&&
!
is_current_user
=
render
'shared/issuable/close_reopen_report_toggle'
,
issuable:
issuable
=
render
'shared/issuable/close_reopen_report_toggle'
,
issuable:
issuable
-
else
-
elsif
issuable
.
author
/ TODO: change back to else #36860
=
link_to
'Report abuse'
,
new_abuse_report_path
(
user_id:
issuable
.
author
.
id
,
ref_url:
issuable_url
(
issuable
)),
=
link_to
'Report abuse'
,
new_abuse_report_path
(
user_id:
issuable
.
author
.
id
,
ref_url:
issuable_url
(
issuable
)),
class:
'hidden-xs hidden-sm btn btn-grouped btn-close-color'
,
title:
'Report abuse'
class:
'hidden-xs hidden-sm btn btn-grouped btn-close-color'
,
title:
'Report abuse'
app/views/shared/issuable/_close_reopen_report_toggle.html.haml
View file @
19da7a55
...
@@ -37,13 +37,15 @@
...
@@ -37,13 +37,15 @@
%li
.divider.droplab-item-ignore
%li
.divider.droplab-item-ignore
%li
.report-item
{
data:
{
text:
'Report abuse'
,
url:
new_abuse_report_path
(
user_id:
issuable
.
author
.
id
,
ref_url:
issuable_url
(
issuable
)),
/ TODO: remove condition #36860
button_class:
"#{button_class} btn-close-color"
,
toggle_class:
"#{toggle_class} btn-close-color"
,
method:
''
}
}
-
if
issuable
.
author
%button
.btn.btn-transparent
%li
.report-item
{
data:
{
text:
'Report abuse'
,
url:
new_abuse_report_path
(
user_id:
issuable
.
author
.
id
,
ref_url:
issuable_url
(
issuable
)),
=
icon
(
'check'
,
class:
'icon'
)
button_class:
"#{button_class} btn-close-color"
,
toggle_class:
"#{toggle_class} btn-close-color"
,
method:
''
}
}
.description
%button
.btn.btn-transparent
%strong
.title
Report abuse
=
icon
(
'check'
,
class:
'icon'
)
%p
.text
.description
Report
%strong
.title
Report abuse
=
display_issuable_type
.
pluralize
%p
.text
that are abusive, inappropriate or spam.
Report
=
display_issuable_type
.
pluralize
that are abusive, inappropriate or spam.
changelogs/unreleased/36860-deleted-user-fix.yml
0 → 100644
View file @
19da7a55
---
title
:
Fix failure when issue is authored by a deleted user
merge_request
:
13807
author
:
type
:
fixed
spec/features/issues/issue_detail_spec.rb
View file @
19da7a55
...
@@ -40,4 +40,18 @@ feature 'Issue Detail', :js do
...
@@ -40,4 +40,18 @@ feature 'Issue Detail', :js do
end
end
end
end
end
end
context
'when authored by a user who is later deleted'
do
before
do
issue
.
update_attribute
(
:author_id
,
nil
)
sign_in
(
user
)
visit
project_issue_path
(
project
,
issue
)
end
it
'shows the issue'
do
page
.
within
(
'.issuable-details'
)
do
expect
(
find
(
'h2'
)).
to
have_content
(
issue
.
title
)
end
end
end
end
end
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