Commit 47cd0c5e authored by Tim Zallmann's avatar Tim Zallmann

Removing Webhooks

Fix for clicking away repo promotion
parent 481b5446
...@@ -547,6 +547,7 @@ import initGroupAnalytics from './init_group_analytics'; ...@@ -547,6 +547,7 @@ import initGroupAnalytics from './init_group_analytics';
break; break;
case 'projects:settings:repository:show': case 'projects:settings:repository:show':
new UsersSelect(); new UsersSelect();
new UserCallout();
// Initialize expandable settings panels // Initialize expandable settings panels
initSettingsPanels(); initSettingsPanels();
break; break;
......
...@@ -4,10 +4,6 @@ ...@@ -4,10 +4,6 @@
Project services Project services
%p Project services allow you to integrate GitLab with other applications %p Project services allow you to integrate GitLab with other applications
.col-lg-8 .col-lg-8
- if show_promotions? && show_callout?('promote_webhooks_dismissed')
= render 'shared/promotions/promote_webhooks'
%table.table %table.table
%colgroup %colgroup
%col %col
......
.user-callout.promotion-callout{ id: 'promote_webhooks', data: { uid: 'promote_webhooks_dismissed' } }
.bordered-box.content-block
%button.btn.btn-default.close.js-close-callout{ type: 'button', 'aria-label' => 'Dismiss webhooks promotion' }
= icon('times', class: 'dismiss-icon', 'aria-hidden' => 'true')
.user-callout-copy
%h4
- if current_application_settings.should_check_namespace_plan?
Upgrade your plan to activate Webhooks.
- else
Improve project with Webhooks and GitLab Enterprise Edition.
%p
Project webhooks allow you to trigger a URL if for example new code is pushed or a new issue is created. You can configure webhooks to listen for specific events like pushes, issues or merge requests. GitLab will send a POST request with data to the webhook URL.
%a{ href: '/help/user/project/integrations/webhooks.html', target: '_blank' } Read more
= render 'shared/promotions/promotion_link_project'
...@@ -47,6 +47,7 @@ describe 'Promotions', js: true do ...@@ -47,6 +47,7 @@ describe 'Promotions', js: true do
project.team << [standarddeveloper, :developer] project.team << [standarddeveloper, :developer]
project.add_developer(standarddeveloper) project.add_developer(standarddeveloper)
project.team << [user, :master] project.team << [user, :master]
otherproject.team << [user, :developer]
stub_application_setting(check_namespace_plan: true) stub_application_setting(check_namespace_plan: true)
allow(Gitlab).to receive(:com?) { true } allow(Gitlab).to receive(:com?) { true }
...@@ -174,4 +175,6 @@ describe 'Promotions', js: true do ...@@ -174,4 +175,6 @@ describe 'Promotions', js: true do
expect(page).not_to have_selector('#promote_squash_commits') expect(page).not_to have_selector('#promote_squash_commits')
end end
end end
end end
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment