diff options
| author | James Lopez <james@jameslopez.es> | 2016-03-21 18:52:55 +0100 |
|---|---|---|
| committer | James Lopez <james@jameslopez.es> | 2016-03-21 18:52:55 +0100 |
| commit | cae864a12e3c99d642fb812fff3941e9f5271f95 (patch) | |
| tree | fce4b24fc294e9566a56027dcb327805d6a01ae7 /app/views/events | |
| parent | 4196ee0661d705c81ca49294926bfaa28d725119 (diff) | |
| parent | 2bcbc7c6db934d56448c4c261861e62982b9b573 (diff) | |
| download | gitlab-ce-cae864a12e3c99d642fb812fff3941e9f5271f95.tar.gz | |
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into fix/safe-import-url
Diffstat (limited to 'app/views/events')
| -rw-r--r-- | app/views/events/_commit.html.haml | 2 | ||||
| -rw-r--r-- | app/views/events/_event.html.haml | 2 | ||||
| -rw-r--r-- | app/views/events/_event_last_push.html.haml | 2 | ||||
| -rw-r--r-- | app/views/events/event/_push.html.haml | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/app/views/events/_commit.html.haml b/app/views/events/_commit.html.haml index 4ba8b84fd92..dce4081288c 100644 --- a/app/views/events/_commit.html.haml +++ b/app/views/events/_commit.html.haml @@ -1,5 +1,5 @@ %li.commit .commit-row-title - = link_to truncate_sha(commit[:id]), namespace_project_commit_path(project.namespace, project, commit[:id]), class: "commit_short_id", alt: '' + = link_to truncate_sha(commit[:id]), namespace_project_commit_path(project.namespace, project, commit[:id]), class: "commit_short_id", alt: '', title: truncate_sha(commit[:id]) · = markdown event_commit_title(commit[:message]), project: project, pipeline: :single_line diff --git a/app/views/events/_event.html.haml b/app/views/events/_event.html.haml index 36fb2d51629..2d9d9dd6342 100644 --- a/app/views/events/_event.html.haml +++ b/app/views/events/_event.html.haml @@ -1,4 +1,4 @@ -- if event.proper? +- if event.proper?(current_user) .event-item{class: "#{event.body? ? "event-block" : "event-inline" }"} .event-item-timestamp #{time_ago_with_tooltip(event.created_at)} diff --git a/app/views/events/_event_last_push.html.haml b/app/views/events/_event_last_push.html.haml index abea86b026a..5753158c24d 100644 --- a/app/views/events/_event_last_push.html.haml +++ b/app/views/events/_event_last_push.html.haml @@ -3,7 +3,7 @@ .event-last-push .event-last-push-text %span You pushed to - = link_to namespace_project_commits_path(event.project.namespace, event.project, event.ref_name) do + = link_to namespace_project_commits_path(event.project.namespace, event.project, event.ref_name), title: h(event.project.name) do %strong= event.ref_name %span at %strong= link_to_project event.project diff --git a/app/views/events/event/_push.html.haml b/app/views/events/event/_push.html.haml index 8bed5cdb9cc..235bd46107e 100644 --- a/app/views/events/event/_push.html.haml +++ b/app/views/events/event/_push.html.haml @@ -5,7 +5,7 @@ %strong= event.ref_name - else %strong - = link_to event.ref_name, namespace_project_commits_path(event.project.namespace, event.project, event.ref_name) + = link_to event.ref_name, namespace_project_commits_path(event.project.namespace, event.project, event.ref_name), title: h(event.target_title) at = link_to_project event.project |