summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhil Hughes <me@iamphill.com>2016-04-06 13:58:44 +0100
committerPhil Hughes <me@iamphill.com>2016-04-11 17:20:47 +0100
commitb87cc5f224428a332b63f3ac7832ea7d882b37b3 (patch)
tree16536379496325e10bea266554cb0573de59b6bf
parent60fd4188a540368776738896b1e10683b7fa9e65 (diff)
downloadgitlab-ce-b87cc5f224428a332b63f3ac7832ea7d882b37b3.tar.gz
Preparing build status
-rw-r--r--app/controllers/projects/merge_requests_controller.rb2
1 files changed, 2 insertions, 0 deletions
diff --git a/app/controllers/projects/merge_requests_controller.rb b/app/controllers/projects/merge_requests_controller.rb
index ae613f5e093..9addcdf3f91 100644
--- a/app/controllers/projects/merge_requests_controller.rb
+++ b/app/controllers/projects/merge_requests_controller.rb
@@ -237,6 +237,8 @@ class Projects::MergeRequestsController < Projects::ApplicationController
end
end
+ status = "preparing" if status == nil
+
response = {
title: merge_request.title,
sha: merge_request.last_commit_short_sha,