diff options
| author | Fatih Acet <acetfatih@gmail.com> | 2016-06-08 19:40:32 +0300 |
|---|---|---|
| committer | Fatih Acet <acetfatih@gmail.com> | 2016-06-09 00:04:46 +0300 |
| commit | 58456e26f5149eb60a401f7f400effe994c59360 (patch) | |
| tree | 1170285a9a667466c4ec67848cadc94d24fa8edd | |
| parent | 329f6cb9b4ef2a7d0063f7c192f87f6f296d8a84 (diff) | |
| download | gitlab-ce-58456e26f5149eb60a401f7f400effe994c59360.tar.gz | |
Fixes for MR comments.
| -rw-r--r-- | app/assets/javascripts/milestone_select.js.coffee | 4 | ||||
| -rw-r--r-- | app/helpers/milestones_helper.rb | 2 | ||||
| -rw-r--r-- | app/views/projects/milestones/show.html.haml | 2 | ||||
| -rw-r--r-- | app/views/shared/issuable/_sidebar.html.haml | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/app/assets/javascripts/milestone_select.js.coffee b/app/assets/javascripts/milestone_select.js.coffee index df6ba3167db..648e1f3bde0 100644 --- a/app/assets/javascripts/milestone_select.js.coffee +++ b/app/assets/javascripts/milestone_select.js.coffee @@ -25,7 +25,7 @@ class @MilestoneSelect if issueUpdateURL milestoneLinkTemplate = _.template( '<a href="/<%= namespace %>/<%= path %>/milestones/<%= iid %>"> - <span class="has-tooltip" data-container="body" data-title="<%= remaining %>"> + <span class="has-tooltip" data-container="body" title="<%= remaining %>"> <%= _.escape(title) %> </span> </a>' @@ -34,7 +34,7 @@ class @MilestoneSelect milestoneLinkNoneTemplate = '<div class="light">None</div>' collapsedSidebarLabelTemplate = _.template( - '<span class="has-tooltip" data-container="body" data-title="<%= remaining %>" data-placement="left"> + '<span class="has-tooltip" data-container="body" title="<%= remaining %>" data-placement="left"> <%= _.escape(title) %> </span>' ) diff --git a/app/helpers/milestones_helper.rb b/app/helpers/milestones_helper.rb index e28ca13ec23..b3e6e468ecd 100644 --- a/app/helpers/milestones_helper.rb +++ b/app/helpers/milestones_helper.rb @@ -56,7 +56,7 @@ module MilestonesHelper def milestone_remaining_days(milestone) if milestone.expired? - content_tag(:strong, 'Past Due') + content_tag(:strong, 'Past due') elsif milestone.due_date days = milestone.remaining_days content = content_tag(:strong, days) diff --git a/app/views/projects/milestones/show.html.haml b/app/views/projects/milestones/show.html.haml index 58b1f8f664f..fe3dde8b251 100644 --- a/app/views/projects/milestones/show.html.haml +++ b/app/views/projects/milestones/show.html.haml @@ -6,7 +6,7 @@ - if @milestone.closed? Closed - elsif @milestone.expired? - Past Due + Past due - else Open %span.identifier diff --git a/app/views/shared/issuable/_sidebar.html.haml b/app/views/shared/issuable/_sidebar.html.haml index 8993261d22a..d2b0d956d07 100644 --- a/app/views/shared/issuable/_sidebar.html.haml +++ b/app/views/shared/issuable/_sidebar.html.haml @@ -53,7 +53,7 @@ .value.bold.hide-collapsed - if issuable.milestone = link_to namespace_project_milestone_path(@project.namespace, @project, issuable.milestone) do - %span.has-tooltip{ "title" => milestone_remaining_days(issuable.milestone), data: {container: 'body', html: 1 } } + %span.has-tooltip{title: milestone_remaining_days(issuable.milestone), data: {container: 'body', html: 1}} = issuable.milestone.title - else .light None |