diff options
| author | Valery Sizov <vsv2711@gmail.com> | 2015-11-25 18:18:44 +0200 |
|---|---|---|
| committer | Valery Sizov <vsv2711@gmail.com> | 2015-11-25 18:18:44 +0200 |
| commit | 40ff1318d29884e4d17e7e450d8a7633e5ac36a9 (patch) | |
| tree | 80363a35c2bf62156678b351cbd0802021f9ba54 /app | |
| parent | 913b408c021d3a9e8b940f580e1e537ef6ed77fd (diff) | |
| download | gitlab-ce-40ff1318d29884e4d17e7e450d8a7633e5ac36a9.tar.gz | |
Rails update to 4.2.4
Diffstat (limited to 'app')
| -rw-r--r-- | app/models/sent_notification.rb | 5 | ||||
| -rw-r--r-- | app/workers/emails_on_push_worker.rb | 2 |
2 files changed, 3 insertions, 4 deletions
diff --git a/app/models/sent_notification.rb b/app/models/sent_notification.rb index 3eed5c16e45..d8fe65b06f6 100644 --- a/app/models/sent_notification.rb +++ b/app/models/sent_notification.rb @@ -17,9 +17,8 @@ class SentNotification < ActiveRecord::Base belongs_to :noteable, polymorphic: true belongs_to :recipient, class_name: "User" - validate :project, :recipient, :reply_key, presence: true - validate :reply_key, uniqueness: true - + validates :project, :recipient, :reply_key, presence: true + validates :reply_key, uniqueness: true validates :noteable_id, presence: true, unless: :for_commit? validates :commit_id, presence: true, if: :for_commit? validates :line_code, format: { with: /\A[a-z0-9]+_\d+_\d+\Z/ }, allow_blank: true diff --git a/app/workers/emails_on_push_worker.rb b/app/workers/emails_on_push_worker.rb index 916a99bb273..c4d8595d45d 100644 --- a/app/workers/emails_on_push_worker.rb +++ b/app/workers/emails_on_push_worker.rb @@ -53,7 +53,7 @@ class EmailsOnPushWorker reverse_compare: reverse_compare, send_from_committer_email: send_from_committer_email, disable_diffs: disable_diffs - ).deliver + ).deliver_now # These are input errors and won't be corrected even if Sidekiq retries rescue Net::SMTPFatalError, Net::SMTPSyntaxError => e logger.info("Failed to send e-mail for project '#{project.name_with_namespace}' to #{recipient}: #{e}") |