Merge branch 'master' into mm-fix-gravatar-url

2014-10-02 19:11:41 +02:00 · 2014-10-02 19:11:41 +02:00 · b1c0b7eb25
commit b1c0b7eb25
parent d181e898ac dd239b86d0
1 changed files with 8 additions and 1 deletions
--- a/lib/travis/api/app/endpoint/jobs.rb
+++ b/lib/travis/api/app/endpoint/jobs.rb
@ -12,7 +12,14 @@ class Travis::Api::App
      end

      get '/:id' do
-        respond_with service(:find_job, params)
+        job = service(:find_job, params).run
+        if job && job.repository
+          respond_with job
+        else
+          json = { error: { message: "The job(#{params[:id]}) couldn't be found" } }
+          status 404
+          respond_with json
+        end
      end

      post '/:id/cancel' do