Merge branch 'remove-unused-code-issueshelper' into 'master'
Remove unused methods from `IssuesHelper` and `IssuablesHelper` See merge request !13793
This commit is contained in:
commit
970af9964e
|
@ -296,14 +296,6 @@ module IssuablesHelper
|
|||
cookies[:collapsed_gutter] == 'true'
|
||||
end
|
||||
|
||||
def issuable_state_scope(issuable)
|
||||
if issuable.respond_to?(:merged?) && issuable.merged?
|
||||
:merged
|
||||
else
|
||||
issuable.open? ? :opened : :closed
|
||||
end
|
||||
end
|
||||
|
||||
def issuable_templates(issuable)
|
||||
@issuable_templates ||=
|
||||
case issuable
|
||||
|
|
|
@ -47,13 +47,6 @@ module IssuesHelper
|
|||
end
|
||||
end
|
||||
|
||||
def bulk_update_milestone_options
|
||||
milestones = @project.milestones.active.reorder(due_date: :asc, title: :asc).to_a
|
||||
milestones.unshift(Milestone::None)
|
||||
|
||||
options_from_collection_for_select(milestones, 'id', 'title', params[:milestone_id])
|
||||
end
|
||||
|
||||
def milestone_options(object)
|
||||
milestones = object.project.milestones.active.reorder(due_date: :asc, title: :asc).to_a
|
||||
milestones.unshift(object.milestone) if object.milestone.present? && object.milestone.closed?
|
||||
|
@ -93,14 +86,6 @@ module IssuesHelper
|
|||
return 'hidden' if issue.closed? == closed
|
||||
end
|
||||
|
||||
def merge_requests_sentence(merge_requests)
|
||||
# Sorting based on the `!123` or `group/project!123` reference will sort
|
||||
# local merge requests first.
|
||||
merge_requests.map do |merge_request|
|
||||
merge_request.to_reference(@project)
|
||||
end.sort.to_sentence(last_word_connector: ', or ')
|
||||
end
|
||||
|
||||
def confidential_icon(issue)
|
||||
icon('eye-slash') if issue.confidential?
|
||||
end
|
||||
|
@ -148,18 +133,6 @@ module IssuesHelper
|
|||
end.to_h
|
||||
end
|
||||
|
||||
def due_date_options
|
||||
options = [
|
||||
Issue::AnyDueDate,
|
||||
Issue::NoDueDate,
|
||||
Issue::DueThisWeek,
|
||||
Issue::DueThisMonth,
|
||||
Issue::Overdue
|
||||
]
|
||||
|
||||
options_from_collection_for_select(options, 'name', 'title', params[:due_date])
|
||||
end
|
||||
|
||||
def link_to_discussions_to_resolve(merge_request, single_discussion = nil)
|
||||
link_text = merge_request.to_reference
|
||||
link_text += " (discussion #{single_discussion.first_note.id})" if single_discussion
|
||||
|
|
|
@ -58,16 +58,6 @@ describe IssuesHelper do
|
|||
end
|
||||
end
|
||||
|
||||
describe "merge_requests_sentence" do
|
||||
subject { merge_requests_sentence(merge_requests)}
|
||||
let(:merge_requests) do
|
||||
[build(:merge_request, iid: 1), build(:merge_request, iid: 2),
|
||||
build(:merge_request, iid: 3)]
|
||||
end
|
||||
|
||||
it { is_expected.to eq("!1, !2, or !3") }
|
||||
end
|
||||
|
||||
describe '#award_user_list' do
|
||||
it "returns a comma-separated list of the first X users" do
|
||||
user = build_stubbed(:user, name: 'Joe')
|
||||
|
|
Loading…
Reference in New Issue