diff options
| author | Ash McKenzie <amckenzie@gitlab.com> | 2019-08-07 02:42:21 +0000 |
|---|---|---|
| committer | Ash McKenzie <amckenzie@gitlab.com> | 2019-08-07 02:42:21 +0000 |
| commit | 4bbf94201085defb9bcbca3d577c2752f4e3b35b (patch) | |
| tree | c7ee78a5f64224569be50ae2534e10ce566fe6df /spec/features/projects/services/user_activates_issue_tracker_spec.rb | |
| parent | b67ed9c96720864b9ddae973b34f7456c9321789 (diff) | |
| parent | 467a411e8892ecd6a3be7cd2f6772665f2c63651 (diff) | |
| download | gitlab-ce-4bbf94201085defb9bcbca3d577c2752f4e3b35b.tar.gz | |
Merge branch '60024-remove-restclient-from-prom-client' into 'master'
Resolve "Use Gitlab::HTTP in PrometheusClient instead of RestClient"
Closes #60024
See merge request gitlab-org/gitlab-ce!31053
Diffstat (limited to 'spec/features/projects/services/user_activates_issue_tracker_spec.rb')
| -rw-r--r-- | spec/features/projects/services/user_activates_issue_tracker_spec.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/features/projects/services/user_activates_issue_tracker_spec.rb b/spec/features/projects/services/user_activates_issue_tracker_spec.rb index 5803500a4d2..5f3bb794b48 100644 --- a/spec/features/projects/services/user_activates_issue_tracker_spec.rb +++ b/spec/features/projects/services/user_activates_issue_tracker_spec.rb @@ -61,7 +61,7 @@ describe 'User activates issue tracker', :js do context 'when the connection test fails' do it 'activates the service' do - stub_request(:head, url).to_raise(HTTParty::Error) + stub_request(:head, url).to_raise(Gitlab::HTTP::Error) click_link(tracker) |