summaryrefslogtreecommitdiff
path: root/spec/lib/mattermost
diff options
context:
space:
mode:
authorZ.J. van de Weg <git@zjvandeweg.nl>2016-12-16 12:57:43 +0100
committerZ.J. van de Weg <git@zjvandeweg.nl>2016-12-16 14:16:10 +0100
commit475a4dc34dd775147dafebcf1b4d648bf2b9aeec (patch)
treeafcc70bc7e0116cb00d61ab4624ef09a5dffb6ef /spec/lib/mattermost
parent0045996728308bcb7643618ab48efb7e04e7d4bf (diff)
parent166ae89dfa36b8e844e58e61e3838200c4ab8ab7 (diff)
downloadgitlab-ce-475a4dc34dd775147dafebcf1b4d648bf2b9aeec.tar.gz
Merge branch 'zj-mattermost-session' into zj-mattermost-slash-config
Diffstat (limited to 'spec/lib/mattermost')
-rw-r--r--spec/lib/mattermost/session_spec.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/lib/mattermost/session_spec.rb b/spec/lib/mattermost/session_spec.rb
index aa56a56db81..a93bab877da 100644
--- a/spec/lib/mattermost/session_spec.rb
+++ b/spec/lib/mattermost/session_spec.rb
@@ -5,7 +5,7 @@ describe Mattermost::Session do
subject { described_class.new('http://localhost:8065', user) }
- # Needed for doorman to function
+ # Needed for doorkeeper to function
it { is_expected.to respond_to(:current_resource_owner) }
it { is_expected.to respond_to(:request) }
it { is_expected.to respond_to(:authorization) }