Skip to content
This repository was archived by the owner on May 12, 2018. It is now read-only.

Commit 6128bdc

Browse files
committed
Fix email urls, more clear form message
Signed-off-by: Dmitriy Zaporozhets <[email protected]>
1 parent a0126cf commit 6128bdc

File tree

6 files changed

+9
-113
lines changed

6 files changed

+9
-113
lines changed

app/views/notify/build_fail_email.html.haml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
Status: #{@build.status}
88
%p
99
Commit: #{@build.short_sha}
10-
%p
10+
%p
1111
Author: #{@build.git_author_name}
1212

13-
%p
14-
Url: #{link_to(project_build_path(@build.project, @build), @build.short_sha)}
13+
%p
14+
Url: #{link_to(project_build_url(@build.project, @build), @build.short_sha)}

app/views/notify/build_fail_email.text.erb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,4 @@ Status: <%= @build.status %>
44
Commit: <%= @build.short_sha %>
55
Author: <%= @build.git_author_name %>
66

7-
Url: <%= project_build_path(@build.project, @build) %>
7+
Url: <%= project_build_url(@build.project, @build) %>

app/views/notify/build_success_email.html.haml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
Status: #{@build.status}
88
%p
99
Commit: #{@build.short_sha}
10-
%p
10+
%p
1111
Author: #{@build.git_author_name}
1212

13-
%p
14-
Url: #{link_to(project_build_path(@build.project, @build), @build.short_sha)}
13+
%p
14+
Url: #{link_to(project_build_url(@build.project, @build), @build.short_sha)}

app/views/notify/build_success_email.text.erb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,4 @@ Status: <%= @build.status %>
44
Commit: <%= @build.short_sha %>
55
Author: <%= @build.git_author_name %>
66

7-
Url: <%= project_build_path(@build.project, @build) %>
7+
Url: <%= project_build_url(@build.project, @build) %>

app/views/projects/_form.html.haml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@
7070
.field
7171
= f.label :email_all_broken_builds do
7272
= f.check_box :email_all_broken_builds
73-
%span Send notification on all broken builds
73+
%span Send notification only for broken builds
7474

7575
%br
7676
%fieldset

spec/observers/build_observer_spec.rb

Lines changed: 0 additions & 104 deletions
This file was deleted.

0 commit comments

Comments
 (0)