diff options
| author | Vinnie Okada <vokada@mrvinn.com> | 2015-03-21 18:03:35 +0300 |
|---|---|---|
| committer | Vinnie Okada <vokada@mrvinn.com> | 2015-03-21 18:03:35 +0300 |
| commit | f5e65e2e508269ff7c18318526ba01f8e7d83951 (patch) | |
| tree | dd834b066dc51de87139d69ea042e0bdfd69334d /app/models/project_services/bamboo_service.rb | |
| parent | cc29ce491786d631586c3b0d0da310b8b790a673 (diff) | |
| parent | 6cf189f0a92772b9174f913e7c74a4889d54e9a6 (diff) | |
Merge branch 'master' into markdown-tags
Merge updated CHANGELOG entries
Diffstat (limited to 'app/models/project_services/bamboo_service.rb')
| -rw-r--r-- | app/models/project_services/bamboo_service.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/models/project_services/bamboo_service.rb b/app/models/project_services/bamboo_service.rb index 0100f1e4a10..f968afe9fa8 100644 --- a/app/models/project_services/bamboo_service.rb +++ b/app/models/project_services/bamboo_service.rb @@ -93,7 +93,7 @@ class BambooService < CiService end end - def build_page(sha) + def build_page(sha, ref) build_info(sha) if @response.nil? || !@response.code if @response.code != 200 || @response['results']['results']['size'] == '0' @@ -106,7 +106,7 @@ class BambooService < CiService end end - def commit_status(sha) + def commit_status(sha, ref) build_info(sha) if @response.nil? || !@response.code return :error unless @response.code == 200 || @response.code == 404 |