Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/diaspora/diaspora.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSteffen van Bergerem <svbergerem@online.de>2016-09-02 15:07:35 +0300
committerDennis Schubert <mail@dennis-schubert.de>2016-09-04 04:01:51 +0300
commit08794bc47bb1000398c98aaa1b9b6705d47d3910 (patch)
tree50599a1561dc414b887c3359ae5a5c9321171f3f /app/controllers
parent18fbb2a885b48b957fdfd70ff53fb7956adbfa13 (diff)
Remove user_photo method from users controller
closes #7049
Diffstat (limited to 'app/controllers')
-rw-r--r--app/controllers/users_controller.rb12
1 files changed, 1 insertions, 11 deletions
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index b7242c118..63d8074e1 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -3,7 +3,7 @@
# the COPYRIGHT file.
class UsersController < ApplicationController
- before_action :authenticate_user!, except: %i(new create public user_photo)
+ before_action :authenticate_user!, except: %i(new create public)
respond_to :html
def edit
@@ -118,16 +118,6 @@ class UsersController < ApplicationController
redirect_to current_user.exported_photos_file.url
end
- def user_photo
- username = params[:username].split('@')[0]
- user = User.find_by_username(username)
- if user.present?
- redirect_to user.image_url
- else
- render :nothing => true, :status => 404
- end
- end
-
def confirm_email
if current_user.confirm_email(params[:token])
flash[:notice] = I18n.t("users.confirm_email.email_confirmed", email: current_user.email)