Adopt simplest fix

3 files changed, 2 insertions, 10 deletions

diff --git a/app/models/commit_status.rb b/app/models/commit_status.rb
index 06507345fe8..3ad065f0af5 100644
--- a/app/models/commit_status.rb
+++ b/app/models/commit_status.rb
@@ -109,7 +109,7 @@ class CommitStatus < ActiveRecord::Base
 
     before_transition any => :failed do |commit_status, transition|
       failure_reason = transition.args.first
-      commit_status.failure_reason = failure_reason
+      commit_status.failure_reason = failure_reasons[failure_reason]
     end
 
     after_transition do |commit_status, transition|
diff --git a/lib/api/helpers/runner.rb b/lib/api/helpers/runner.rb
index e94893d163a..45d0343bc89 100644
--- a/lib/api/helpers/runner.rb
+++ b/lib/api/helpers/runner.rb
@@ -66,14 +66,6 @@ module API
         header 'Job-Status', job.status
         forbidden!(reason)
       end
-
-      def failure_reason
-        unless params[:failure_reason] && CommitStatus.failure_reasons.key?(params[:failure_reason])
-          return :unknown_failure
-        end
-
-        params[:failure_reason]
-      end
     end
   end
 end
diff --git a/lib/api/runner.rb b/lib/api/runner.rb
index e76989e7228..2f15f3a7d76 100644
--- a/lib/api/runner.rb
+++ b/lib/api/runner.rb
@@ -158,7 +158,7 @@ module API
         when 'success'
           job.success!
         when 'failed'
-          job.drop!(failure_reason)
+          job.drop!(params[:failure_reason] || :unknown_failure)
         end
       end