delta/gitlab/gitlab-ce.git/config/gitlab.yml.example, branch normalize_frontend_headers gitlab.com: gitlab-org/gitlab-ce.git Merge branch 'zj-mattermost-slash-config' into 'master' 2016-12-21T14:59:41+00:00 Kamil Trzciński ayufan@ayufan.eu 2016-12-21T14:59:41+00:00 a516478d7b953e15cef1bc84280ea9913c206d33 Mattermost slash auto config Closes #24769 See merge request !8070 

Mattermost slash auto config

Closes #24769

See merge request !8070
 Added support for Authentiq oauth provider 2016-12-21T08:51:10+00:00 Alex dev.alexkeramidas@gmail.com 2016-12-11T12:09:37+00:00 6e186b76bb22c5803e3d7105f8ff78c11128812d 






Merge branch 'master' into 'zj-mattermost-slash-config'
2016-12-18T12:59:09+00:00

Zeger-Jan van de Weg
zegerjan@gitlab.com

2016-12-18T12:59:09+00:00

a9d9895dc7b4c024471f49a61166a6bb402eab9e

# Conflicts:
#   config/gitlab.yml.example
#   lib/mattermost/session.rb
#   spec/lib/mattermost/session_spec.rb




# Conflicts:
#   config/gitlab.yml.example
#   lib/mattermost/session.rb
#   spec/lib/mattermost/session_spec.rb






Store mattermost_url in settings
2016-12-17T09:31:14+00:00

Kamil Trzcinski
ayufan@ayufan.eu

2016-12-16T11:20:42+00:00

e663725961de66ac838d0a5a85978656938e74f4












Base work for auto config MM slash commands
2016-12-16T11:21:09+00:00

Z.J. van de Weg
git@zjvandeweg.nl

2016-12-13T18:52:41+00:00

87d160634dfdaacd0dc382c26932786382d1be34












Add idle_timeout to reply by email doc.
2016-11-16T11:46:37+00:00

Marin Jankovski
maxlazio@gmail.com

2016-11-11T14:49:51+00:00

04f2dd65fb355eb3bf20e0d3deef9123132aacad












Make mail_room idle_timeout option configurable.
2016-11-16T11:46:37+00:00

Marin Jankovski
maxlazio@gmail.com

2016-11-11T14:40:19+00:00

aa9a289ce55d5099e6a65f25e7c3b38f66148aca












Update gitlab.yml.example
2016-11-01T22:04:54+00:00

Elan Ruusamäe
glen@delfi.ee

2016-11-01T22:00:34+00:00

afc465d9ecce58df92b436d2ebf9732147e9a0cb












Finish updates to use JIRA gem
2016-10-26T17:02:16+00:00

Felipe Artur
felipefac@gmail.com

2016-09-29T21:11:32+00:00

c2d6822e942f86422348fe4ebea7142822e5882c

Code improvements, bug fixes, finish documentation and specs





Code improvements, bug fixes, finish documentation and specs







Merge branch 'docs/refactor-reply-by-email' into 'master'

2016-10-11T13:27:23+00:00

Achilleas Pipinellis
axilleas@axilleas.me

2016-10-11T13:27:23+00:00

38978fa53ffb7b263f987cb1fca84722c83b2fec


Move reply by email docs to a new location

## What does this MR do?

Move reply by email docs to a new location.

Part of https://gitlab.com/gitlab-org/gitlab-ce/issues/3349

## Moving docs to a new location?

See the guidelines: http://docs.gitlab.com/ce/development/doc_styleguide.html#changing-document-location

- [ ] Make sure the old link is not removed and has its contents replaced with a link to the new location.
- [ ] Make sure internal links pointing to the document in question are not broken.
- [ ] Search and replace any links referring to old docs in GitLab Rails app, specifically under the `app/views/` directory.
- [ ] If working on CE, submit an MR to EE with the changes as well.

See merge request !6517





Move reply by email docs to a new location

## What does this MR do?

Move reply by email docs to a new location.

Part of https://gitlab.com/gitlab-org/gitlab-ce/issues/3349

## Moving docs to a new location?

See the guidelines: http://docs.gitlab.com/ce/development/doc_styleguide.html#changing-document-location

- [ ] Make sure the old link is not removed and has its contents replaced with a link to the new location.
- [ ] Make sure internal links pointing to the document in question are not broken.
- [ ] Search and replace any links referring to old docs in GitLab Rails app, specifically under the `app/views/` directory.
- [ ] If working on CE, submit an MR to EE with the changes as well.

See merge request !6517