diff options
| author | Z.J. van de Weg <git@zjvandeweg.nl> | 2016-12-23 13:13:30 +0300 |
|---|---|---|
| committer | Z.J. van de Weg <git@zjvandeweg.nl> | 2017-01-24 16:18:30 +0300 |
| commit | 85f0229b157a26f4cd954ce5ca20588a9dae29f6 (patch) | |
| tree | c015f5bc7a413e3479e94784720d18fc9ea27707 /app/controllers/projects/mattermosts_controller.rb | |
| parent | b60de9c0fd90c310d2a4146f75b67f9f360cbd6c (diff) | |
Fix inconsistent return type
Diffstat (limited to 'app/controllers/projects/mattermosts_controller.rb')
| -rw-r--r-- | app/controllers/projects/mattermosts_controller.rb | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/app/controllers/projects/mattermosts_controller.rb b/app/controllers/projects/mattermosts_controller.rb index 01d99c7df35..20161e1cfd8 100644 --- a/app/controllers/projects/mattermosts_controller.rb +++ b/app/controllers/projects/mattermosts_controller.rb @@ -34,7 +34,10 @@ class Projects::MattermostsController < Projects::ApplicationController end def teams - @teams ||= @service.list_teams(current_user) + @teams ||= begin + teams, error_message = @service.list_teams(current_user) + error_message ? error_message : teams + end end def service |