diff options
| author | Z.J. van de Weg <git@zjvandeweg.nl> | 2017-01-26 09:16:07 +0100 |
|---|---|---|
| committer | Z.J. van de Weg <git@zjvandeweg.nl> | 2017-01-30 11:01:36 +0100 |
| commit | b3de65bcc5627915511182a9ac9857b1fef14853 (patch) | |
| tree | 537c79d5c1f03b1306556b3abf20a5bb3fe565dc /app/controllers | |
| parent | 8bcc911b9bc9fcb2179860c5a98d8a1ad3ec34b0 (diff) | |
| download | gitlab-ce-b3de65bcc5627915511182a9ac9857b1fef14853.tar.gz | |
Update #list_teams to propagate errors
Diffstat (limited to 'app/controllers')
| -rw-r--r-- | app/controllers/projects/mattermosts_controller.rb | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/app/controllers/projects/mattermosts_controller.rb b/app/controllers/projects/mattermosts_controller.rb index 20161e1cfd8..38f7e6eb5e9 100644 --- a/app/controllers/projects/mattermosts_controller.rb +++ b/app/controllers/projects/mattermosts_controller.rb @@ -34,10 +34,7 @@ class Projects::MattermostsController < Projects::ApplicationController end def teams - @teams ||= begin - teams, error_message = @service.list_teams(current_user) - error_message ? error_message : teams - end + @teams, @teams_error_message = @service.list_teams(current_user) end def service |