diff options
| author | Kamil Trzciński <ayufan@ayufan.eu> | 2016-12-21 14:59:41 +0000 |
|---|---|---|
| committer | Kamil Trzciński <ayufan@ayufan.eu> | 2016-12-21 14:59:41 +0000 |
| commit | a516478d7b953e15cef1bc84280ea9913c206d33 (patch) | |
| tree | 0d3342b685b3e8a4c73046fdb2816c49b130feb7 /config | |
| parent | 70da604de5e5e00ae97325fe837a0d533cd85b8b (diff) | |
| parent | 1d6c8ce50fbf8eeeed3c38d24b654673e65fef7b (diff) | |
| download | gitlab-ce-a516478d7b953e15cef1bc84280ea9913c206d33.tar.gz | |
Merge branch 'zj-mattermost-slash-config' into 'master'
Mattermost slash auto config
Closes #24769
See merge request !8070
Diffstat (limited to 'config')
| -rw-r--r-- | config/gitlab.yml.example | 2 | ||||
| -rw-r--r-- | config/routes/project.rb | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/config/gitlab.yml.example b/config/gitlab.yml.example index 2d1d48bf9da..42e5f105d46 100644 --- a/config/gitlab.yml.example +++ b/config/gitlab.yml.example @@ -586,4 +586,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 335fccb617b..baabd22b840 100644 --- a/config/routes/project.rb +++ b/config/routes/project.rb @@ -76,6 +76,8 @@ constraints(ProjectUrlConstrainer.new) do end end + resource :mattermost, only: [:new, :create] + resources :deploy_keys, constraints: { id: /\d+/ }, only: [:index, :new, :create] do member do put :enable |