Remove trailing whitespaces and trailing lines
This commit is contained in:
parent
7e0726b1da
commit
3bd06d55e0
80 changed files with 261 additions and 296 deletions
|
@ -1,8 +1,8 @@
|
|||
- if event.allowed?
|
||||
.event_feed
|
||||
- if event.issue?
|
||||
- if event.issue?
|
||||
= render "events/event_issue", :event => event
|
||||
- elsif event.merge_request?
|
||||
- elsif event.merge_request?
|
||||
= render "events/event_merge_request", :event => event
|
||||
- elsif event.push?
|
||||
= render "events/event_push", :event => event
|
||||
|
|
|
@ -1,10 +1,10 @@
|
|||
= image_tag gravatar_icon(event.author_email), :class => "avatar"
|
||||
%strong #{event.author_name}
|
||||
%strong #{event.author_name}
|
||||
%span.event_label= event.action_name
|
||||
issue
|
||||
issue
|
||||
= link_to project_issue_path(event.project, event.issue) do
|
||||
%strong= truncate event.issue_title
|
||||
at
|
||||
at
|
||||
%strong= link_to event.project.name, event.project
|
||||
%span.cgray
|
||||
= time_ago_in_words(event.created_at)
|
||||
|
|
|
@ -1,12 +1,12 @@
|
|||
- if event.action_name == "merged"
|
||||
.event_icon= image_tag "event_mr_merged.png"
|
||||
= image_tag gravatar_icon(event.author_email), :class => "avatar"
|
||||
%strong #{event.author_name}
|
||||
%strong #{event.author_name}
|
||||
%span.event_label= event.action_name
|
||||
merge request
|
||||
merge request
|
||||
= link_to project_merge_request_path(event.project, event.merge_request) do
|
||||
%strong= truncate event.merge_request_title
|
||||
at
|
||||
at
|
||||
%strong= link_to event.project.name, event.project
|
||||
%span.cgray
|
||||
= time_ago_in_words(event.created_at)
|
||||
|
|
|
@ -1,12 +1,12 @@
|
|||
%div
|
||||
.event_icon= image_tag "event_push.png"
|
||||
= image_tag gravatar_icon(event.author_email), :class => "avatar"
|
||||
%strong #{event.author_name}
|
||||
%strong #{event.author_name}
|
||||
%span.event_label= event.push_action_name
|
||||
= event.ref_type
|
||||
= link_to project_commits_path(event.project, :ref => event.ref_name) do
|
||||
%strong= event.ref_name
|
||||
at
|
||||
at
|
||||
%strong= link_to event.project.name, event.project
|
||||
%span.cgray
|
||||
= time_ago_in_words(event.created_at)
|
||||
|
@ -14,9 +14,9 @@
|
|||
|
||||
- if event.push_with_commits?
|
||||
- if event.commits_count > 1
|
||||
= link_to compare_project_commits_path(event.project, :from => event.parent_commit.id, :to => event.last_commit.id) do
|
||||
= link_to compare_project_commits_path(event.project, :from => event.parent_commit.id, :to => event.last_commit.id) do
|
||||
%strong #{event.parent_commit.id[0..7]}...#{event.last_commit.id[0..7]}
|
||||
- project = event.project
|
||||
- project = event.project
|
||||
%ul.unstyled.event_commits
|
||||
- if event.commits_count > 3
|
||||
- event.commits[0...2].each do |commit|
|
||||
|
@ -24,7 +24,6 @@
|
|||
%li
|
||||
%br
|
||||
\... and #{event.commits_count - 2} more commits
|
||||
- else
|
||||
- else
|
||||
- event.commits.each do |commit|
|
||||
= render "events/commit", :commit => commit, :project => project
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue