spec/lib/mattermost/session_spec.rb · a9d9895dc7b4c024471f49a61166a6bb402eab9e · nexedi / gitlab-ce · GitLab

Find file Blame History Permalink

Merge branch 'master' into 'zj-mattermost-slash-config' · a9d9895d
Zeger-Jan van de Weg authored Dec 18, 2016
```
# Conflicts:
#   config/gitlab.yml.example
#   lib/mattermost/session.rb
#   spec/lib/mattermost/session_spec.rb
```
a9d9895d

session_spec.rb 2.96 KB