diff options
author | Shinya Maeda <shinya@gitlab.com> | 2018-07-04 13:17:54 +0900 |
---|---|---|
committer | Shinya Maeda <shinya@gitlab.com> | 2018-07-04 13:17:54 +0900 |
commit | f11aa51eeaa7a8175a9075ba95038c675ef9a8a6 (patch) | |
tree | 922e35c954457ca50d4ed19e8cebe85656cec44a /app/models | |
parent | 93a964d449ad29e94e785209d7ecde217a8e9b25 (diff) | |
parent | 4c1a2a9b9977f68a05512ed1ff378ee0a2368aca (diff) | |
download | gitlab-ce-f11aa51eeaa7a8175a9075ba95038c675ef9a8a6.tar.gz |
Merge branch 'master' into build-chunks-on-object-storage
Diffstat (limited to 'app/models')
-rw-r--r-- | app/models/hooks/web_hook_log.rb | 5 | ||||
-rw-r--r-- | app/models/project_services/bamboo_service.rb | 22 |
2 files changed, 17 insertions, 10 deletions
diff --git a/app/models/hooks/web_hook_log.rb b/app/models/hooks/web_hook_log.rb index e72c125fb69..59a1f2aed69 100644 --- a/app/models/hooks/web_hook_log.rb +++ b/app/models/hooks/web_hook_log.rb @@ -7,6 +7,11 @@ class WebHookLog < ActiveRecord::Base validates :web_hook, presence: true + def self.recent + where('created_at >= ?', 2.days.ago.beginning_of_day) + .order(created_at: :desc) + end + def success? response_status =~ /^2/ end diff --git a/app/models/project_services/bamboo_service.rb b/app/models/project_services/bamboo_service.rb index 7f4c47a6d14..edc5c00d9c4 100644 --- a/app/models/project_services/bamboo_service.rb +++ b/app/models/project_services/bamboo_service.rb @@ -67,11 +67,11 @@ class BambooService < CiService def execute(data) return unless supported_events.include?(data[:object_kind]) - get_path("updateAndBuild.action?buildKey=#{build_key}") + get_path("updateAndBuild.action", { buildKey: build_key }) end def calculate_reactive_cache(sha, ref) - response = get_path("rest/api/latest/result?label=#{sha}") + response = get_path("rest/api/latest/result/byChangeset/#{sha}") { build_page: read_build_page(response), commit_status: read_commit_status(response) } end @@ -113,18 +113,20 @@ class BambooService < CiService URI.join("#{bamboo_url}/", path).to_s end - def get_path(path) + def get_path(path, query_params = {}) url = build_url(path) if username.blank? && password.blank? - Gitlab::HTTP.get(url, verify: false) + Gitlab::HTTP.get(url, verify: false, query: query_params) else - url << '&os_authType=basic' - Gitlab::HTTP.get(url, verify: false, - basic_auth: { - username: username, - password: password - }) + query_params[:os_authType] = 'basic' + Gitlab::HTTP.get(url, + verify: false, + query: query_params, + basic_auth: { + username: username, + password: password + }) end end end |