diff options
| author | Rémy Coutable <remy@rymai.me> | 2017-02-13 13:24:38 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2017-02-13 13:24:38 +0000 |
| commit | 54c4e4d7066ffb8cc53e3849d7fa93c5e9ebe25e (patch) | |
| tree | 38ffd1643472e7b3b514e67d221732c25cc5aa42 | |
| parent | 42ad07c6801b37edc2b58e72446e34f553713be6 (diff) | |
| parent | 81eae63b7a4c601a8b64f8f1c1820ba8a4f40050 (diff) | |
| download | gitlab-ce-54c4e4d7066ffb8cc53e3849d7fa93c5e9ebe25e.tar.gz | |
Merge branch 'make-rubocop-happy-again' into 'master'
Use safe navigation operator to make rubocop happy
See merge request !9185
| -rw-r--r-- | app/models/environment.rb | 2 | ||||
| -rw-r--r-- | app/services/issues/create_service.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/models/environment.rb b/app/models/environment.rb index 803060b3979..1a21b5e52b5 100644 --- a/app/models/environment.rb +++ b/app/models/environment.rb @@ -126,7 +126,7 @@ class Environment < ActiveRecord::Base return unless available? stop! - stop_action.play(current_user) if stop_action + stop_action&.play(current_user) end def actions_for(environment) diff --git a/app/services/issues/create_service.rb b/app/services/issues/create_service.rb index c9168f74249..961605a1005 100644 --- a/app/services/issues/create_service.rb +++ b/app/services/issues/create_service.rb @@ -15,7 +15,7 @@ module Issues def before_create(issuable) if @recaptcha_verified spam_log = current_user.spam_logs.find_by(id: @spam_log_id, title: issuable.title) - spam_log.update!(recaptcha_verified: true) if spam_log + spam_log&.update!(recaptcha_verified: true) else issuable.spam = spam_service.check(@api) issuable.spam_log = spam_service.spam_log |