diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2017-02-14 23:59:25 +0200 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2017-02-14 23:59:25 +0200 |
| commit | dcdab2ae1a73728847bdc94f681ad0a7f45666c5 (patch) | |
| tree | 05ca24a8f917b6d94275c01aa676c69a1c6a8fb0 /app | |
| parent | efc82ebf3f7378f848b65c0a45a4052316bfd6db (diff) | |
| parent | b4c00ae43dda8e32061539f3177a4294a706efc9 (diff) | |
| download | gitlab-ce-dcdab2ae1a73728847bdc94f681ad0a7f45666c5.tar.gz | |
Merge remote-tracking branch 'origin/master' into dz-nested-groups-improvements-3dz-nested-groups-improvements-3
Diffstat (limited to 'app')
| -rw-r--r-- | app/assets/javascripts/boards/filters/due_date_filters.js.es6 | 2 | ||||
| -rw-r--r-- | app/views/users/calendar_activities.html.haml | 14 |
2 files changed, 10 insertions, 6 deletions
diff --git a/app/assets/javascripts/boards/filters/due_date_filters.js.es6 b/app/assets/javascripts/boards/filters/due_date_filters.js.es6 index ac2966cef5d..03425bb145b 100644 --- a/app/assets/javascripts/boards/filters/due_date_filters.js.es6 +++ b/app/assets/javascripts/boards/filters/due_date_filters.js.es6 @@ -3,5 +3,5 @@ Vue.filter('due-date', (value) => { const date = new Date(value); - return dateFormat(date, 'mmm d, yyyy'); + return dateFormat(date, 'mmm d, yyyy', true); }); diff --git a/app/views/users/calendar_activities.html.haml b/app/views/users/calendar_activities.html.haml index dae147ca8be..4afd31f788b 100644 --- a/app/views/users/calendar_activities.html.haml +++ b/app/views/users/calendar_activities.html.haml @@ -10,13 +10,17 @@ %i.fa.fa-clock-o = event.created_at.to_s(:time) - if event.push? - #{event.action_name} #{event.ref_type} #{event.ref_name} + #{event.action_name} #{event.ref_type} + %strong + - commits_path = namespace_project_commits_path(event.project.namespace, event.project, event.ref_name) + = link_to_if event.project.repository.branch_exists?(event.ref_name), event.ref_name, commits_path - else = event_action_name(event) - - if event.note? - %strong= link_to event.note_target.to_reference, event_note_target_path(event) - - elsif event.target - %strong= link_to event.target.to_reference, [event.project.namespace.becomes(Namespace), event.project, event.target] + %strong + - if event.note? + = link_to event.note_target.to_reference, event_note_target_path(event) + - elsif event.target + = link_to event.target.to_reference, [event.project.namespace.becomes(Namespace), event.project, event.target] at %strong |