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
diff options
context:
space:
mode:
Diffstat (limited to 'app/controllers/projects/mattermosts_controller.rb')
-rw-r--r--app/controllers/projects/mattermosts_controller.rb6
1 files changed, 3 insertions, 3 deletions
diff --git a/app/controllers/projects/mattermosts_controller.rb b/app/controllers/projects/mattermosts_controller.rb
index a4091ebdf4b..9a3e7e31d68 100644
--- a/app/controllers/projects/mattermosts_controller.rb
+++ b/app/controllers/projects/mattermosts_controller.rb
@@ -19,10 +19,10 @@ class Projects::MattermostsController < Projects::ApplicationController
result, message = integration.configure(current_user, configure_params)
if result
- flash[:notice] = 'This service is now configured'
+ flash[:notice] = 'This integration is now configured'
redirect_to edit_project_settings_integration_path(@project, integration)
else
- flash[:alert] = message || 'Failed to configure service'
+ flash[:alert] = message || 'Failed to configure integration'
redirect_to new_project_mattermost_path(@project)
end
end
@@ -31,7 +31,7 @@ class Projects::MattermostsController < Projects::ApplicationController
def configure_params
params.require(:mattermost).permit(:trigger, :team_id).merge(
- url: service_trigger_url(integration),
+ url: integration_trigger_url(integration),
icon_url: asset_url('slash-command-logo.png', skip_pipeline: true))
end