diff options
author | Kamil Trzcinski <ayufan@ayufan.eu> | 2015-12-11 18:01:57 +0100 |
---|---|---|
committer | Kamil Trzcinski <ayufan@ayufan.eu> | 2015-12-11 18:01:57 +0100 |
commit | 8b4cdc50fca816b4f56f8579e17c4dba836ec797 (patch) | |
tree | 484209e0159975e5f234216d19df3dac10b2f82a | |
parent | 71e6a93db979165073161f0dc13d3bfe7a461e4a (diff) | |
download | gitlab-ce-8b4cdc50fca816b4f56f8579e17c4dba836ec797.tar.gz |
Fix indentation and BuildsEmailServiceci-services-migrate
-rw-r--r-- | app/models/project_services/builds_email_service.rb | 3 | ||||
-rw-r--r-- | app/models/service.rb | 8 |
2 files changed, 5 insertions, 6 deletions
diff --git a/app/models/project_services/builds_email_service.rb b/app/models/project_services/builds_email_service.rb index b8bd48aca69..8247c79fc33 100644 --- a/app/models/project_services/builds_email_service.rb +++ b/app/models/project_services/builds_email_service.rb @@ -79,8 +79,7 @@ class BuildsEmailService < Service end def all_recipients(data) - all_recipients = [] - all_recipients <<= recipients.split(',') + all_recipients = recipients.split(',') if add_pusher? && data[:user][:email] all_recipients << "#{data[:user][:email]}" diff --git a/app/models/service.rb b/app/models/service.rb index 195c4690e8f..4159e367d8c 100644 --- a/app/models/service.rb +++ b/app/models/service.rb @@ -143,10 +143,10 @@ class Service < ActiveRecord::Base args.each do |arg| class_eval %{ - def #{arg}? - ActiveRecord::ConnectionAdapters::Column::TRUE_VALUES.include?(#{arg}) - end - } + def #{arg}? + ActiveRecord::ConnectionAdapters::Column::TRUE_VALUES.include?(#{arg}) + end + } end end |