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
7c200ee1
Commit
7c200ee1
authored
Jul 07, 2020
by
Sean Arnold
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Use status_name instead of human_status_name
parent
9a0073c7
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
4 deletions
+4
-4
app/helpers/todos_helper.rb
app/helpers/todos_helper.rb
+3
-3
app/models/alert_management/alert.rb
app/models/alert_management/alert.rb
+1
-1
No files found.
app/helpers/todos_helper.rb
View file @
7c200ee1
...
...
@@ -102,8 +102,8 @@ module TodosHelper
end
content_tag
(
:span
,
nil
,
class:
'target-status'
)
do
content_tag
(
:span
,
nil
,
class:
"status-box status-box-
#{
type
}
-
#{
todo
.
target
.
state
.
dasherize
}
"
)
do
todo
.
target
.
state
.
capitalize
content_tag
(
:span
,
nil
,
class:
"status-box status-box-
#{
type
}
-
#{
todo
.
target
.
state
.
to_s
.
dasherize
}
"
)
do
todo
.
target
.
state
.
to_s
.
capitalize
end
end
end
...
...
@@ -220,7 +220,7 @@ module TodosHelper
when
MergeRequest
,
Issue
%w(closed merged)
.
include?
(
todo
.
target
.
state
)
when
AlertManagement
::
Alert
%
w
(resolved)
.
include?
(
todo
.
target
.
state
)
%
i
(resolved)
.
include?
(
todo
.
target
.
state
)
else
false
end
...
...
app/models/alert_management/alert.rb
View file @
7c200ee1
...
...
@@ -127,7 +127,7 @@ module AlertManagement
scope
:counts_by_status
,
->
{
group
(
:status
).
count
}
scope
:counts_by_project_id
,
->
{
group
(
:project_id
).
count
}
alias_method
:state
,
:
human_
status_name
alias_method
:state
,
:status_name
def
self
.
sort_by_attribute
(
method
)
case
method
.
to_s
...
...
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