diff options
| author | Douwe Maan <douwe@gitlab.com> | 2017-03-01 23:30:51 +0300 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2017-03-01 23:30:51 +0300 |
| commit | 7e2ad5d47a1d95281e2a217538dae67107a584c2 (patch) | |
| tree | e86d3395d583d3bee5804aa09656a3e2db5e7d8b /app/services/slash_commands | |
| parent | a87815fbc07359d83918e1ff61961af174f76fe0 (diff) | |
| parent | a0101ebf84ed397899df8f3a017d2b25dc45db57 (diff) | |
Merge branch 'fix/mwbs-to-mwps' into 'master'
Rename MWBS to MWPS
Closes #24707
See merge request !9335
Diffstat (limited to 'app/services/slash_commands')
| -rw-r--r-- | app/services/slash_commands/interpret_service.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/services/slash_commands/interpret_service.rb b/app/services/slash_commands/interpret_service.rb index c39a2c4cf1e..595653ea58a 100644 --- a/app/services/slash_commands/interpret_service.rb +++ b/app/services/slash_commands/interpret_service.rb @@ -59,7 +59,7 @@ module SlashCommands @updates[:state_event] = 'reopen' end - desc 'Merge (when build succeeds)' + desc 'Merge (when the pipeline succeeds)' condition do last_diff_sha = params && params[:merge_request_diff_head_sha] issuable.is_a?(MergeRequest) && |