Raise one by one instead of if checks

87ff0107 · Lin Jen-Shin · 347ee6cc · 87ff0107
Commit 87ff0107 authored Mar 31, 2016 by Lin Jen-Shin
Show whitespace changes
Inline Side-by-side

Showing with 5 additions and 10 deletions

lib/gitlab/email/receiver.rb lib/gitlab/email/receiver.rb +5 -10

No files found.
--- a/lib/gitlab/email/receiver.rb
+++ b/lib/gitlab/email/receiver.rb
@@ -76,16 +76,11 @@ module Gitlab
      end
      def validate_permission(author, project, permission)
-        if author
+        raise UserNotFoundError unless author
-          if author.blocked?
+        raise UserBlockedError if author.blocked?
-            raise UserBlockedError
-          elsif project.nil? || !author.can?(permission, project)
        # TODO: Give project not found error if author cannot read project
-            raise UserNotAuthorizedError
+        raise UserNotAuthorizedError if project.nil? ||
-          end
+                                        !author.can?(permission, project)
-        else
-          raise UserNotFoundError
-        end
      end
      # Find the first matched user in database from email From: section