summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSean McGivern <sean@mcgivern.me.uk>2017-10-30 08:53:27 +0000
committerSean McGivern <sean@mcgivern.me.uk>2017-10-30 08:53:27 +0000
commit192049a61039220bb62e88d1d173d0aeaa555297 (patch)
tree9cc7c903d3f8230e7f089c10c2e4d6976cc065be
parentf03700f5e429a86934e7cd2fa958da75b722db49 (diff)
parent7dbf114f595f8ff3ff41339d81d41b7722b97d2a (diff)
downloadgitlab-ce-192049a61039220bb62e88d1d173d0aeaa555297.tar.gz
Merge branch 'bvl-fix-system-hook-project-visibility' into 'master'
Use the correct project visibility in system hooks Closes #39496 See merge request gitlab-org/gitlab-ce!15065
-rw-r--r--app/services/system_hooks_service.rb2
-rw-r--r--changelogs/unreleased/bvl-fix-system-hook-project-visibility.yml5
-rw-r--r--spec/services/system_hooks_service_spec.rb6
3 files changed, 12 insertions, 1 deletions
diff --git a/app/services/system_hooks_service.rb b/app/services/system_hooks_service.rb
index a1c2f8d0180..5d275967821 100644
--- a/app/services/system_hooks_service.rb
+++ b/app/services/system_hooks_service.rb
@@ -83,7 +83,7 @@ class SystemHooksService
project_id: model.id,
owner_name: owner.name,
owner_email: owner.respond_to?(:email) ? owner.email : "",
- project_visibility: Project.visibility_levels.key(model.visibility_level_value).downcase
+ project_visibility: model.visibility.downcase
}
end
diff --git a/changelogs/unreleased/bvl-fix-system-hook-project-visibility.yml b/changelogs/unreleased/bvl-fix-system-hook-project-visibility.yml
new file mode 100644
index 00000000000..a17ed51c9b8
--- /dev/null
+++ b/changelogs/unreleased/bvl-fix-system-hook-project-visibility.yml
@@ -0,0 +1,5 @@
+---
+title: Use the correct visibility attribute for projects in system hooks
+merge_request: 15065
+author:
+type: fixed
diff --git a/spec/services/system_hooks_service_spec.rb b/spec/services/system_hooks_service_spec.rb
index 8b5d9187785..8f7aea533dc 100644
--- a/spec/services/system_hooks_service_spec.rb
+++ b/spec/services/system_hooks_service_spec.rb
@@ -63,6 +63,12 @@ describe SystemHooksService do
:group_id, :user_id, :user_username, :user_name, :user_email, :group_access
)
end
+
+ it 'includes the correct project visibility level' do
+ data = event_data(project, :create)
+
+ expect(data[:project_visibility]).to eq('private')
+ end
end
context 'event names' do