summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorZ.J. van de Weg <git@zjvandeweg.nl>2016-12-13 19:52:41 +0100
committerZ.J. van de Weg <git@zjvandeweg.nl>2016-12-16 12:21:09 +0100
commit87d160634dfdaacd0dc382c26932786382d1be34 (patch)
tree3eb381dd13f1ebd0acdf6c5364f9c2639e057b26 /config
parentdd385c7c3d3046da18c6c251bce25afab1129662 (diff)
downloadgitlab-ce-87d160634dfdaacd0dc382c26932786382d1be34.tar.gz
Base work for auto config MM slash commands
Diffstat (limited to 'config')
-rw-r--r--config/gitlab.yml.example5
-rw-r--r--config/routes/project.rb1
2 files changed, 6 insertions, 0 deletions
diff --git a/config/gitlab.yml.example b/config/gitlab.yml.example
index 327e4a7937c..e1e76e8bf73 100644
--- a/config/gitlab.yml.example
+++ b/config/gitlab.yml.example
@@ -153,6 +153,11 @@ production: &base
# The location where LFS objects are stored (default: shared/lfs-objects).
# storage_path: shared/lfs-objects
+ # For executing commands from GitLab on Mattermost
+ mattermost:
+ enabled: false
+ host: 'http://locahost:8065'
+
## Gravatar
## For Libravatar see: http://doc.gitlab.com/ce/customization/libravatar.html
gravatar:
diff --git a/config/routes/project.rb b/config/routes/project.rb
index 0754f0ec3b0..6f480b9e1a0 100644
--- a/config/routes/project.rb
+++ b/config/routes/project.rb
@@ -61,6 +61,7 @@ constraints(ProjectUrlConstrainer.new) do
resources :services, constraints: { id: /[^\/]+/ }, only: [:index, :edit, :update] do
member do
get :test
+ post :configure
end
end