diff options
| author | Rémy Coutable <remy@rymai.me> | 2016-01-13 19:46:38 +0100 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2016-01-13 19:46:38 +0100 |
| commit | 33ea09bdf9c05c60438f03ac1fe94b52615cd05e (patch) | |
| tree | 93e4f76b5f03f6c5d24c0ee5aef849acc9bfa253 /app/helpers | |
| parent | 0c10aee59677e2dadfef6538a74fe1e28fcdd37e (diff) | |
| parent | 1202355703b9357e85fffa308a25c86576f7bfa0 (diff) | |
| download | gitlab-ce-33ea09bdf9c05c60438f03ac1fe94b52615cd05e.tar.gz | |
Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into fix/private-references
Diffstat (limited to 'app/helpers')
| -rw-r--r-- | app/helpers/application_helper.rb | 4 | ||||
| -rw-r--r-- | app/helpers/notes_helper.rb | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 2b9bad9c9ea..436fbcd4138 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -205,7 +205,7 @@ module ApplicationHelper def time_ago_with_tooltip(time, placement: 'top', html_class: 'time_ago', skip_js: false) element = content_tag :time, time.to_s, class: "#{html_class} js-timeago js-timeago-pending", - datetime: time.getutc.iso8601, + datetime: time.to_time.getutc.iso8601, title: time.in_time_zone.to_s(:medium), data: { toggle: 'tooltip', placement: placement, container: 'body' } @@ -266,7 +266,7 @@ module ApplicationHelper state: params[:state], scope: params[:scope], label_name: params[:label_name], - milestone_id: params[:milestone_id], + milestone_title: params[:milestone_title], assignee_id: params[:assignee_id], author_id: params[:author_id], sort: params[:sort], diff --git a/app/helpers/notes_helper.rb b/app/helpers/notes_helper.rb index 5f0c921413a..53c543c28c5 100644 --- a/app/helpers/notes_helper.rb +++ b/app/helpers/notes_helper.rb @@ -67,7 +67,7 @@ module NotesHelper line_type: line_type } - button_tag class: 'btn reply-btn js-discussion-reply-button', + button_tag class: 'btn btn-nr reply-btn js-discussion-reply-button', data: data, title: 'Add a reply' do link_text = icon('comment') link_text << ' Reply' |