Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZ.J. van de Weg <git@zjvandeweg.nl>2016-12-20 01:50:42 +0300
committerZ.J. van de Weg <git@zjvandeweg.nl>2016-12-20 01:50:42 +0300
commit921f411a41d92ff6b3fdea2560adbd861d97be57 (patch)
tree826d960e2b66317ecdd13738737532fdef8414bc
parent5c99afcf0bb8ea3091d8155bc4d4a22534a66116 (diff)
Last fixes
-rw-r--r--app/models/project_services/mattermost_slash_commands_service.rb2
-rw-r--r--lib/mattermost/team.rb4
-rw-r--r--spec/lib/mattermost/team_spec.rb24
3 files changed, 13 insertions, 17 deletions
diff --git a/app/models/project_services/mattermost_slash_commands_service.rb b/app/models/project_services/mattermost_slash_commands_service.rb
index 5000f96e350..92e2ae637fb 100644
--- a/app/models/project_services/mattermost_slash_commands_service.rb
+++ b/app/models/project_services/mattermost_slash_commands_service.rb
@@ -37,7 +37,7 @@ class MattermostSlashCommandsService < ChatService
end
end
- def list_teams
+ def list_teams(current_user)
begin
response = Mattermost::Session.new(current_user).with_session do |session|
Mattermost::Team.all(session)
diff --git a/lib/mattermost/team.rb b/lib/mattermost/team.rb
index ea5cfd2cb0b..5ee77aa9adf 100644
--- a/lib/mattermost/team.rb
+++ b/lib/mattermost/team.rb
@@ -1,10 +1,6 @@
module Mattermost
class Team
def self.all(session)
- retreive_teams(session)
- end
-
- def self.retreive_teams(session)
session.get('/api/v3/teams/all').parsed_response
end
end
diff --git a/spec/lib/mattermost/team_spec.rb b/spec/lib/mattermost/team_spec.rb
index d4fe63fcd8b..c208be3912b 100644
--- a/spec/lib/mattermost/team_spec.rb
+++ b/spec/lib/mattermost/team_spec.rb
@@ -6,18 +6,18 @@ describe Mattermost::Team do
let(:response) do
[{
- "id"=>"xiyro8huptfhdndadpz8r3wnbo",
- "create_at"=>1482174222155,
- "update_at"=>1482174222155,
- "delete_at"=>0,
- "display_name"=>"chatops",
- "name"=>"chatops",
- "email"=>"admin@example.com",
- "type"=>"O",
- "company_name"=>"",
- "allowed_domains"=>"",
- "invite_id"=>"o4utakb9jtb7imctdfzbf9r5ro",
- "allow_open_invite"=>false}]
+ "id" => "xiyro8huptfhdndadpz8r3wnbo",
+ "create_at" => 1482174222155,
+ "update_at" => 1482174222155,
+ "delete_at" => 0,
+ "display_name" => "chatops",
+ "name" => "chatops",
+ "email" => "admin@example.com",
+ "type" => "O",
+ "company_name" => "",
+ "allowed_domains" => "",
+ "invite_id" => "o4utakb9jtb7imctdfzbf9r5ro",
+ "allow_open_invite" => false }]
end
let(:json) { nil }