summaryrefslogtreecommitdiff
path: root/app/helpers/issues_helper.rb
diff options
context:
space:
mode:
authorRobert Speicher <robert@gitlab.com>2016-04-11 23:26:45 +0000
committerRobert Speicher <robert@gitlab.com>2016-04-11 23:26:45 +0000
commit0913204f9b1db46afca939c5f963e5dc12614641 (patch)
tree6054d99330213bc619307fc9e2c7edf0bb2b64e6 /app/helpers/issues_helper.rb
parent7998725e3c2557c04ceece028dd73a316a3a746c (diff)
parent8d5ad4e3c9973ed34742b543cc3a5466c32b9d5b (diff)
downloadgitlab-ce-0913204f9b1db46afca939c5f963e5dc12614641.tar.gz
Merge branch 'issue_1752' into 'master'
Fix milestone removal problem when editing issues fixes #1752 See merge request !3571
Diffstat (limited to 'app/helpers/issues_helper.rb')
-rw-r--r--app/helpers/issues_helper.rb1
1 files changed, 1 insertions, 0 deletions
diff --git a/app/helpers/issues_helper.rb b/app/helpers/issues_helper.rb
index bcf8639c829..4cb8adcebad 100644
--- a/app/helpers/issues_helper.rb
+++ b/app/helpers/issues_helper.rb
@@ -52,6 +52,7 @@ module IssuesHelper
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?
milestones.unshift(Milestone::None)
options_from_collection_for_select(milestones, 'id', 'title', object.milestone_id)