summaryrefslogtreecommitdiff
path: root/app/helpers
diff options
context:
space:
mode:
authorPhil Hughes <me@iamphill.com>2016-07-17 17:43:06 +0100
committerPhil Hughes <me@iamphill.com>2016-07-20 10:48:02 +0100
commiteb49e28ca0145fa7df6ef1077ae97e90ce39fc6b (patch)
tree5a81f88a69d7806156d34499c77ef0088ba69c36 /app/helpers
parent02ce5fba8d7aa94d5fb53bd717e77c93c6bd61b7 (diff)
downloadgitlab-ce-eb49e28ca0145fa7df6ef1077ae97e90ce39fc6b.tar.gz
Fixed milestone dropdown tests
Diffstat (limited to 'app/helpers')
-rw-r--r--app/helpers/milestones_helper.rb6
1 files changed, 6 insertions, 0 deletions
diff --git a/app/helpers/milestones_helper.rb b/app/helpers/milestones_helper.rb
index 6ea83e5dc03..05caf91240f 100644
--- a/app/helpers/milestones_helper.rb
+++ b/app/helpers/milestones_helper.rb
@@ -55,6 +55,12 @@ module MilestonesHelper
end
end
+ def milestone_dropdown_selected_text
+ project = @target_project || @project || @projects
+
+ Milestone.of_projects(project).where(title: params[:milestone_title]).first().try(:name)
+ end
+
def milestone_remaining_days(milestone)
if milestone.expired?
content_tag(:strong, 'Past due')