diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-19 12:08:59 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-19 12:08:59 +0300 |
| commit | c1fc5da123a1fe670e32740669a9d5e59eff38f5 (patch) | |
| tree | 9e872d4057232aed3e5e0304cdfa04db74ba8464 /lib | |
| parent | 82a708b9f0adca259062555d16a9720f9955993b (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/gitlab/ci/templates/Jobs/Test.gitlab-ci.yml | 10 | ||||
| -rw-r--r-- | lib/gitlab/jira/http_client.rb | 7 |
2 files changed, 12 insertions, 5 deletions
diff --git a/lib/gitlab/ci/templates/Jobs/Test.gitlab-ci.yml b/lib/gitlab/ci/templates/Jobs/Test.gitlab-ci.yml index a8e6d263666..a0ddd273552 100644 --- a/lib/gitlab/ci/templates/Jobs/Test.gitlab-ci.yml +++ b/lib/gitlab/ci/templates/Jobs/Test.gitlab-ci.yml @@ -15,7 +15,9 @@ test: - export DATABASE_URL="postgres://${POSTGRES_USER}:${POSTGRES_PASSWORD}@${DB_HOST}:5432/${POSTGRES_DB}" - cp -R . /tmp/app - /bin/herokuish buildpack test - rules: - - if: '$TEST_DISABLED' - when: never - - if: '$CI_COMMIT_TAG || $CI_COMMIT_BRANCH' + only: + - branches + - tags + except: + variables: + - $TEST_DISABLED diff --git a/lib/gitlab/jira/http_client.rb b/lib/gitlab/jira/http_client.rb index c09d8170d17..2479b9089c2 100644 --- a/lib/gitlab/jira/http_client.rb +++ b/lib/gitlab/jira/http_client.rb @@ -12,7 +12,12 @@ module Gitlab def request(*args) result = make_request(*args) - raise JIRA::HTTPError.new(result.response) unless result.response.is_a?(Net::HTTPSuccess) + unless result.response.is_a?(Net::HTTPSuccess) + Gitlab::ErrorTracking.track_and_raise_exception( + JIRA::HTTPError.new(result.response), + response_body: result.body + ) + end result end |