Merge branch 'develop' into feature-admin_users

Conflicts:
	users/app/controllers/application_controller.rb
	users/app/models/user.rb

1 files changed, 0 insertions, 32 deletions

diff --git a/users/app/controllers/application_controller.rb b/users/app/controllers/application_controller.rb
deleted file mode 100644
index 0d6e5d1..0000000
--- a/users/app/controllers/application_controller.rb
+++ /dev/null
@@ -1,32 +0,0 @@
-class ApplicationController < ActionController::Base
-  protect_from_forgery
-
-  protected
-
-  def current_user
-    @current_user ||= User.find(session[:user_id]) if session[:user_id]
-  end
-  helper_method :current_user
-
-  def logged_in?
-    !!current_user
-  end
-  helper_method :logged_in?
-
-  def authorize
-    access_denied unless logged_in?
-  end
-
-  def admin?
-    current_user && current_user.is_admin?
-  end
-  helper_method :admin?
-
-  def authorize_admin
-    access_denied unless admin?
-  end
-
-  def access_denied
-    redirect_to login_url, :alert => "Not authorized"
-  end
-end