diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-10-18 21:06:21 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-10-18 21:06:21 +0300 |
| commit | 6d59e989185a7d2645792b713d1b5d95d46651fd (patch) | |
| tree | f89d869a6c557a3e6e0b9305290259ab1d6fb589 /app/models/concerns/stepable.rb | |
| parent | 5c521d1f9b1e389e2f9b2b5fccf3798159a10f8d (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/models/concerns/stepable.rb')
| -rw-r--r-- | app/models/concerns/stepable.rb | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/app/models/concerns/stepable.rb b/app/models/concerns/stepable.rb index d00a049a004..dea241c5dbe 100644 --- a/app/models/concerns/stepable.rb +++ b/app/models/concerns/stepable.rb @@ -11,15 +11,15 @@ module Stepable initial_result = {} steps.inject(initial_result) do |previous_result, callback| - result = method(callback).call + result = method(callback).call(previous_result) - if result[:status] == :error - result[:failed_step] = callback + if result[:status] != :success + result[:last_step] = callback break result end - previous_result.merge(result) + result end end |