kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Fix rubocop errors [ci skip]

Browse source
This commit is contained in:
Z.J. van de Weg 2016-12-20 20:11:02 +01:00
parent e9c14918e5
commit 2393d30da2
4 changed files with 7 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app/models/project_services/mattermost_slash_commands_service.rb
View file

@ -24,13 +24,13 @@ class MattermostSlashCommandsService < ChatSlashCommandsService
create(command(params)) create(command(params))
update(active: true, token: token) if token update(active: true, token: token) if token
rescue => Mattermost::Error => e rescue Mattermost::Error => e
false, e.message [false, e.message]
end end
def list_teams(user) def list_teams(user)
Mattermost::Team.new(user).all Mattermost::Team.new(user).all
rescue => Mattermost::Error => e rescue Mattermost::Error
[] []
end end

2
lib/mattermost/client.rb
View file

@ -34,7 +34,7 @@ module Mattermost
end end
json_response json_response
rescue JSON::JSONError => e rescue JSON::JSONError
raise ClientError('Cannot parse response') raise ClientError('Cannot parse response')
end end
end end

1
spec/features/projects/services/mattermost_slash_command_spec.rb
View file

@ -41,7 +41,6 @@ feature 'Setup Mattermost slash commands', feature: true do
end end
end end
describe 'mattermost service is not enabled' do describe 'mattermost service is not enabled' do
before do before do
allow(Gitlab.config.mattermost).to receive(:enabled).and_return(false) allow(Gitlab.config.mattermost).to receive(:enabled).and_return(false)