diff options
| author | Jarka Kadlecova <jarka@gitlab.com> | 2016-12-30 22:49:59 +0300 |
|---|---|---|
| committer | Jarka Kadlecova <jarka@gitlab.com> | 2017-01-13 17:16:35 +0300 |
| commit | 557a0bf14c79c02c65196ff8f7a2251ecd77073c (patch) | |
| tree | 36cef1d85fbc5541ec15949d5ea42feb8444c6df /app/services/slash_commands | |
| parent | aa934c7469372cac7b8cd10b49761d90d8e367fa (diff) | |
Address MR comments
Diffstat (limited to 'app/services/slash_commands')
| -rw-r--r-- | app/services/slash_commands/interpret_service.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/app/services/slash_commands/interpret_service.rb b/app/services/slash_commands/interpret_service.rb index 14fad3ba120..d18844ac0e3 100644 --- a/app/services/slash_commands/interpret_service.rb +++ b/app/services/slash_commands/interpret_service.rb @@ -61,10 +61,10 @@ module SlashCommands desc 'Merge (when build succeeds)' condition do - last_diff_sha = params.to_h[:merge_request_diff_head_sha] + last_diff_sha = params && params[:merge_request_diff_head_sha] issuable.is_a?(MergeRequest) && - issuable.mergeable_with_slash_command?(current_user, autocomplete_precheck: !last_diff_sha, last_diff_sha: last_diff_sha) && - issuable.persisted? + issuable.persisted? && + issuable.mergeable_with_slash_command?(current_user, autocomplete_precheck: !last_diff_sha, last_diff_sha: last_diff_sha) end command :merge do @updates[:merge] = params[:merge_request_diff_head_sha] |