Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/spec
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-02-13 09:09:07 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2020-02-13 09:09:07 +0300
commit31a49d924418aa9983ae30be28e6e304a30939e1 (patch)
treec346584e3bf6a40938bb0531e1cbe436e0b8b32d /spec
parent56a7627af0b4cc9fa9869bff88c8a3c81ca931c6 (diff)
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec')
-rw-r--r--spec/services/projects/operations/update_service_spec.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/spec/services/projects/operations/update_service_spec.rb b/spec/services/projects/operations/update_service_spec.rb
index 792036273d6..182906a3337 100644
--- a/spec/services/projects/operations/update_service_spec.rb
+++ b/spec/services/projects/operations/update_service_spec.rb
@@ -304,7 +304,6 @@ describe Projects::Operations::UpdateService do
"title" => nil,
"active" => true,
"properties" => { "api_url" => "http://example.prometheus.com", "manual_configuration" => "0" },
- "instance" => false,
"push_events" => true,
"issues_events" => true,
"merge_requests_events" => true,
@@ -320,7 +319,8 @@ describe Projects::Operations::UpdateService do
"confidential_note_events" => true,
"deployment_events" => false,
"description" => nil,
- "comment_on_event_enabled" => true
+ "comment_on_event_enabled" => true,
+ "template" => false
}
end
let(:params) do