summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
Diffstat (limited to 'config')
-rw-r--r--config/gitlab.yml.example2
-rw-r--r--config/routes/project.rb6
2 files changed, 7 insertions, 1 deletions
diff --git a/config/gitlab.yml.example b/config/gitlab.yml.example
index b8b41a0d86c..f53a3d066df 100644
--- a/config/gitlab.yml.example
+++ b/config/gitlab.yml.example
@@ -576,4 +576,4 @@ test:
admin_group: ''
staging:
- <<: *base
+ <<: *base \ No newline at end of file
diff --git a/config/routes/project.rb b/config/routes/project.rb
index e17d6bae10c..23d85368f1b 100644
--- a/config/routes/project.rb
+++ b/config/routes/project.rb
@@ -76,6 +76,12 @@ constraints(ProjectUrlConstrainer.new) do
end
end
+ resources :mattermost, only: [:new] do
+ collection do
+ post :configure
+ end
+ end
+
resources :deploy_keys, constraints: { id: /\d+/ }, only: [:index, :new, :create] do
member do
put :enable