Commit 0cbf5abc authored by Justin Ho's avatar Justin Ho

Rename services to integrations in listing page

parent 3add719d
...@@ -9,7 +9,7 @@ module Projects ...@@ -9,7 +9,7 @@ module Projects
feature_category :integrations feature_category :integrations
def show def show
@services = @project.find_or_initialize_services @integrations = @project.find_or_initialize_services
end end
end end
end end
......
...@@ -6,4 +6,4 @@ ...@@ -6,4 +6,4 @@
- integrations_link_start = '<a href="%{url}">'.html_safe % { url: help_page_url('user/project/integrations/overview') } - integrations_link_start = '<a href="%{url}">'.html_safe % { url: help_page_url('user/project/integrations/overview') }
- webhooks_link_start = '<a href="%{url}">'.html_safe % { url: project_hooks_path(@project) } - webhooks_link_start = '<a href="%{url}">'.html_safe % { url: project_hooks_path(@project) }
%p= _("%{integrations_link_start}Integrations%{link_end} enable you to make third-party applications part of your GitLab workflow. If the available integrations don't meet your needs, consider using a %{webhooks_link_start}webhook%{link_end}.").html_safe % { integrations_link_start: integrations_link_start, webhooks_link_start: webhooks_link_start, link_end: '</a>'.html_safe } %p= _("%{integrations_link_start}Integrations%{link_end} enable you to make third-party applications part of your GitLab workflow. If the available integrations don't meet your needs, consider using a %{webhooks_link_start}webhook%{link_end}.").html_safe % { integrations_link_start: integrations_link_start, webhooks_link_start: webhooks_link_start, link_end: '</a>'.html_safe }
= render 'shared/integrations/index', integrations: @services = render 'shared/integrations/index', integrations: @integrations
...@@ -28,7 +28,7 @@ RSpec.describe Projects::Settings::IntegrationsController do ...@@ -28,7 +28,7 @@ RSpec.describe Projects::Settings::IntegrationsController do
end end
context 'sets correct services list' do context 'sets correct services list' do
let(:active_services) { assigns(:services).map(&:type) } let(:active_services) { assigns(:integrations).map(&:type) }
let(:disabled_services) { %w[GithubService] } let(:disabled_services) { %w[GithubService] }
it 'enables SlackSlashCommandsService and disables GitlabSlackApplication' do it 'enables SlackSlashCommandsService and disables GitlabSlackApplication' do
......
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