diff options
author | Grzegorz Bizon <grzegorz@gitlab.com> | 2016-12-17 12:27:03 +0000 |
---|---|---|
committer | Grzegorz Bizon <grzegorz@gitlab.com> | 2016-12-17 12:27:03 +0000 |
commit | e47989a58b8a9f83855ea9210ba5786fc14fb841 (patch) | |
tree | 2c9c722e8a989e38b36e9e9c9eef12cc9b0e2e76 /app/models/user.rb | |
parent | 0a6450094eb13702f6f6f03e468db4fc8f023315 (diff) | |
parent | c9610e0a052526adb3138dccf6114d710979a0b7 (diff) | |
download | gitlab-ce-e47989a58b8a9f83855ea9210ba5786fc14fb841.tar.gz |
Merge branch 'zj-mattermost-session' into 'master'
Mattermost session
This branch is based of tag v8.14.4 so I could test on an instance better.
But stuck on the tests, as setting up the whole doorkeeper stuff doesn't seem to be supported for testing.
See merge request !8033
Diffstat (limited to 'app/models/user.rb')
0 files changed, 0 insertions, 0 deletions