Merge branch 'master' into pawel/connect_to_prometheus_through_proxy-30480

* master: (242 commits)
  Validate user namespace before saving so that errors persist on model
  Reset Project's column information in spec/lib/gitlab/background_migration/populate_merge_request_metrics_with_events_data_spec.rb
  Explicitly set cwd in Sidekiq memory killer instead of depending on getcwd
  Downgrade google-protobuf
  Close low level rugged repository in project cache worker
  File upload UI obeys LFS filters
  Resolve "Add a link to documentation on how to get external ip in the Kubernetes cluster details page"
  Upgrade GitLab Workhorse to v3.6.0
  Add sorting options for /users API (admin only)
  improvements from feedback
  [ci-skip] add changelog
  remove file after `Upload#destroy`
  Fix a hardcoded pipeline ID in a spinach step
  Override group sidebar links
  Replace "cluster" with "Kubernetes cluster"
  Reorder async/sync tasks in BuildFinishedWorker to read traces efficiently
  Fix tests for Drop filename enforcement
  Revert using expand_fixture_path in factory
  Revert "Add FixtureHelpers for FactoryGirl"
  Refactor :trace to :trace_live in spec
  ...

2 files changed, 3 insertions, 3 deletions

diff --git a/spec/models/project_services/jira_service_spec.rb b/spec/models/project_services/jira_service_spec.rb
index 1eaaadf56c5..748c366efca 100644
--- a/spec/models/project_services/jira_service_spec.rb
+++ b/spec/models/project_services/jira_service_spec.rb
@@ -205,7 +205,7 @@ describe JiraService do
       @jira_service.close_issue(merge_request, ExternalIssue.new("JIRA-123", project))
 
       expect(WebMock).to have_requested(:post, @comment_url).with(
-        body: /#{custom_base_url}\/#{project.full_path}\/commit\/#{merge_request.diff_head_sha}/
+        body: %r{#{custom_base_url}/#{project.full_path}/commit/#{merge_request.diff_head_sha}}
       ).once
     end
 
@@ -220,7 +220,7 @@ describe JiraService do
       @jira_service.close_issue(merge_request, ExternalIssue.new("JIRA-123", project))
 
       expect(WebMock).to have_requested(:post, @comment_url).with(
-        body: /#{Gitlab.config.gitlab.url}\/#{project.full_path}\/commit\/#{merge_request.diff_head_sha}/
+        body: %r{#{Gitlab.config.gitlab.url}/#{project.full_path}/commit/#{merge_request.diff_head_sha}}
       ).once
     end
 
diff --git a/spec/models/project_services/kubernetes_service_spec.rb b/spec/models/project_services/kubernetes_service_spec.rb
index 6980ba335b8..622d8844a72 100644
--- a/spec/models/project_services/kubernetes_service_spec.rb
+++ b/spec/models/project_services/kubernetes_service_spec.rb
@@ -408,7 +408,7 @@ describe KubernetesService, :use_clean_rails_memory_store_caching do
 
     context 'if the services is active' do
       it 'should return a message' do
-        expect(kubernetes_service.deprecation_message).to match(/Your cluster information on this page is still editable/)
+        expect(kubernetes_service.deprecation_message).to match(/Your Kubernetes cluster information on this page is still editable/)
       end
     end