diff options
author | Arinde Eniola <eniolaarinde1@gmail.com> | 2016-04-26 12:22:52 +0100 |
---|---|---|
committer | Arinde Eniola <eniolaarinde1@gmail.com> | 2016-04-29 10:15:49 +0100 |
commit | ded3b02f3353708386d6960c5c146bf2a2de86db (patch) | |
tree | dff35fb04ff0565c09eeda4f4ca25b0bdccadb65 /app/views/projects/milestones | |
parent | 10f84f99cb663faae37139495f547bb68bd8aced (diff) | |
download | gitlab-ce-ded3b02f3353708386d6960c5c146bf2a2de86db.tar.gz |
Use a better message when milestone is newly createdchange_message_for_newly_created_milestone
make some changes for the checks to determine when the messages should be displayed
add item to changelog and also integration test
make some changes to the test
make some changes
Diffstat (limited to 'app/views/projects/milestones')
-rw-r--r-- | app/views/projects/milestones/show.html.haml | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/app/views/projects/milestones/show.html.haml b/app/views/projects/milestones/show.html.haml index be63875ab34..56543ccd062 100644 --- a/app/views/projects/milestones/show.html.haml +++ b/app/views/projects/milestones/show.html.haml @@ -42,9 +42,12 @@ = preserve do = markdown @milestone.description -- if @milestone.complete?(current_user) && @milestone.active? +- if @milestone.total_items_count(current_user).zero? .alert.alert-success.prepend-top-default - %span All issues for this milestone are closed. You may close milestone now. + %span Assign some issues to this milestone. +- elsif @milestone.complete?(current_user) && @milestone.active? + .alert.alert-success.prepend-top-default + %span All issues for this milestone are closed. You may close this milestone now. = render 'shared/milestones/summary', milestone: @milestone, project: @project = render 'shared/milestones/tabs', milestone: @milestone |