diff options
| author | Kamil Trzcinski <ayufan@ayufan.eu> | 2017-12-08 11:50:45 +0100 |
|---|---|---|
| committer | Kamil Trzcinski <ayufan@ayufan.eu> | 2017-12-08 12:01:15 +0100 |
| commit | 865341acf881fc2e0e517acc164c69bcdda941f9 (patch) | |
| tree | 435e07e24a8ca7ab99cc06c8605b47c3f550b09b /lib | |
| parent | ad3be46b9fe7d6d42b30d257a923b0070f79da94 (diff) | |
| download | gitlab-ce-865341acf881fc2e0e517acc164c69bcdda941f9.tar.gz | |
Fix a bug of before_sha being inproperly evaluated to `checkout_sha`
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/gitlab/ci/pipeline/chain/command.rb | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/lib/gitlab/ci/pipeline/chain/command.rb b/lib/gitlab/ci/pipeline/chain/command.rb index f74235d8452..6eaa8a9f911 100644 --- a/lib/gitlab/ci/pipeline/chain/command.rb +++ b/lib/gitlab/ci/pipeline/chain/command.rb @@ -46,7 +46,7 @@ module Gitlab end def before_sha - checkout_sha || before_sha || Gitlab::Git::BLANK_SHA + before_sha || checkout_sha || Gitlab::Git::BLANK_SHA end def protected_ref? @@ -54,10 +54,6 @@ module Gitlab project.protected_for?(ref) end end - - def error(message) - pipeline.errors.add(:base, message) - end end end end |