summaryrefslogtreecommitdiff
path: root/app/controllers/invites_controller.rb
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2015-04-14 15:16:00 +0200
committerDouwe Maan <douwe@gitlab.com>2015-04-14 15:16:00 +0200
commitcb5362e7ce0496e4fa7bec4ae629fd24e93d721e (patch)
tree4375ae5e99f11d51032559a95c12f1491bcd9e1f /app/controllers/invites_controller.rb
parent0013ea5130494326f37fb1d6988a369fa2c91d22 (diff)
downloadgitlab-ce-cb5362e7ce0496e4fa7bec4ae629fd24e93d721e.tar.gz
Follow newline guidelines.
Diffstat (limited to 'app/controllers/invites_controller.rb')
-rw-r--r--app/controllers/invites_controller.rb7
1 files changed, 5 insertions, 2 deletions
diff --git a/app/controllers/invites_controller.rb b/app/controllers/invites_controller.rb
index 3ac8654fcce..1f97ff16c55 100644
--- a/app/controllers/invites_controller.rb
+++ b/app/controllers/invites_controller.rb
@@ -43,10 +43,13 @@ class InvitesController < ApplicationController
return @member if defined?(@member)
@token = params[:id]
-
@member = Member.find_by_invite_token(@token)
- render_404 unless @member
+ unless @member
+ render_404 and return
+ end
+
+ @member
end
def authenticate_user!