Follow newline guidelines.

3 files changed, 11 insertions, 4 deletions

diff --git a/app/controllers/groups/group_members_controller.rb b/app/controllers/groups/group_members_controller.rb
index 359eeb4d27a..265cf4f0f4a 100644
--- a/app/controllers/groups/group_members_controller.rb
+++ b/app/controllers/groups/group_members_controller.rb
@@ -48,13 +48,16 @@ class Groups::GroupMembersController < Groups::ApplicationController
   end
 
   def resend_invite
+    redirect_path = group_group_members_path(@group)
+    
     @group_member = @group.group_members.find(params[:id])
+
     if @group_member.invite?
       @group_member.resend_invite
 
-      redirect_to group_group_members_path(@group), notice: 'The invitation was successfully resent.'
+      redirect_to redirect_path, notice: 'The invitation was successfully resent.'
     else
-      redirect_to group_group_members_path(@group), alert: 'The invitation has already been accepted.'
+      redirect_to redirect_path, alert: 'The invitation has already been accepted.'
     end
   end
 
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!
diff --git a/app/controllers/projects/project_members_controller.rb b/app/controllers/projects/project_members_controller.rb
index 3da44cbc9d6..72967a26ff1 100644
--- a/app/controllers/projects/project_members_controller.rb
+++ b/app/controllers/projects/project_members_controller.rb
@@ -62,6 +62,7 @@ class Projects::ProjectMembersController < Projects::ApplicationController
     redirect_path = namespace_project_project_members_path(@project.namespace, @project)
 
     @project_member = @project.project_members.find(params[:id])
+    
     if @project_member.invite?
       @project_member.resend_invite