Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
80760d78
Commit
80760d78
authored
Aug 21, 2020
by
Vladimir Shushlin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove deployment_webhooks feature flag
parent
d66eb6d5
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
1 addition
and
13 deletions
+1
-13
app/models/deployment.rb
app/models/deployment.rb
+1
-1
spec/workers/deployments/finished_worker_spec.rb
spec/workers/deployments/finished_worker_spec.rb
+0
-12
No files found.
app/models/deployment.rb
View file @
80760d78
...
...
@@ -148,7 +148,7 @@ class Deployment < ApplicationRecord
def
execute_hooks
deployment_data
=
Gitlab
::
DataBuilder
::
Deployment
.
build
(
self
)
project
.
execute_hooks
(
deployment_data
,
:deployment_hooks
)
if
Feature
.
enabled?
(
:deployment_webhooks
,
project
,
default_enabled:
true
)
project
.
execute_hooks
(
deployment_data
,
:deployment_hooks
)
project
.
execute_services
(
deployment_data
,
:deployment_hooks
)
end
...
...
spec/workers/deployments/finished_worker_spec.rb
View file @
80760d78
...
...
@@ -61,17 +61,5 @@ RSpec.describe Deployments::FinishedWorker do
worker
.
perform
(
deployment
.
id
)
end
it
'does not execute webhooks if feature flag is disabled'
do
stub_feature_flags
(
deployment_webhooks:
false
)
deployment
=
create
(
:deployment
)
project
=
deployment
.
project
create
(
:project_hook
,
deployment_events:
true
,
project:
project
)
expect
(
WebHookService
).
not_to
receive
(
:new
)
worker
.
perform
(
deployment
.
id
)
end
end
end
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment