mirror of
https://github.com/wahyd4/gitlabhq.git
synced 2026-08-11 21:56:19 +10:00
Move tests as well, remove public namespace from controller
This commit is contained in:
@@ -1,24 +1,22 @@
|
||||
module Public
|
||||
class UnsubscribesController < ApplicationController
|
||||
skip_before_filter :authenticate_user!,
|
||||
:reject_blocked, :set_current_user_for_observers,
|
||||
:add_abilities
|
||||
layout 'public_users'
|
||||
class UnsubscribesController < ApplicationController
|
||||
skip_before_filter :authenticate_user!,
|
||||
:reject_blocked, :set_current_user_for_observers,
|
||||
:add_abilities
|
||||
layout 'public_users'
|
||||
|
||||
def show
|
||||
@user = get_user
|
||||
end
|
||||
|
||||
def create
|
||||
@user = get_user
|
||||
@user.admin_unsubscribe! if @user
|
||||
redirect_to new_user_session_path, notice: 'You have been unsubscribed'
|
||||
end
|
||||
|
||||
protected
|
||||
def get_user
|
||||
@email = "#{params[:email]}.#{params[:format]}"
|
||||
User.where(email: @email).first
|
||||
end
|
||||
def show
|
||||
@user = get_user
|
||||
end
|
||||
end
|
||||
|
||||
def create
|
||||
@user = get_user
|
||||
@user.admin_unsubscribe! if @user
|
||||
redirect_to new_user_session_path, notice: 'You have been unsubscribed'
|
||||
end
|
||||
|
||||
protected
|
||||
def get_user
|
||||
@email = "#{params[:email]}.#{params[:format]}"
|
||||
User.where(email: @email).first
|
||||
end
|
||||
end
|
||||
|
||||
+1
-1
@@ -1,6 +1,6 @@
|
||||
require 'spec_helper'
|
||||
|
||||
describe Public::UnsubscribesController do
|
||||
describe UnsubscribesController do
|
||||
let!(:user) { create :user, email: 'me@example.com' }
|
||||
|
||||
describe "show" do
|
||||
Reference in New Issue
Block a user