summaryrefslogtreecommitdiff
path: root/lib/mattermost
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-09-02 18:10:40 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-09-02 18:10:40 +0000
commit4e06ca9e7d67aee59d691a363dabba46d53d34ba (patch)
tree350af7ee7d4b8d0d22b4f251141f486fa8ae181a /lib/mattermost
parent8e3523281051490ff696bfd85bea1195c046c87c (diff)
downloadgitlab-ce-4e06ca9e7d67aee59d691a363dabba46d53d34ba.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib/mattermost')
-rw-r--r--lib/mattermost/session.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/mattermost/session.rb b/lib/mattermost/session.rb
index eea7daa3d8e..ccdd1443fb0 100644
--- a/lib/mattermost/session.rb
+++ b/lib/mattermost/session.rb
@@ -52,7 +52,7 @@ module Mattermost
# Next methods are needed for Doorkeeper
def pre_auth
@pre_auth ||= Doorkeeper::OAuth::PreAuthorization.new(
- Doorkeeper.configuration, server.client_via_uid, params)
+ Doorkeeper.configuration, params)
end
def authorization