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
path: root/app
diff options
context:
space:
mode:
authorJonne Haß <me@jhass.eu>2020-01-22 01:56:01 +0300
committerJonne Haß <me@jhass.eu>2020-01-22 01:56:01 +0300
commit8d690a9e3358fc92487efc0f789c0367bb879554 (patch)
tree8fd458b041b66a7e3981f3140484c6831e04f2fb /app
parent16b242fa0f669666640a08db4bac4b7e0c8e52bd (diff)
undo changes in introduced by merge conflicts in the api branch
Diffstat (limited to 'app')
-rw-r--r--app/services/photo_service.rb7
1 files changed, 1 insertions, 6 deletions
diff --git a/app/services/photo_service.rb b/app/services/photo_service.rb
index c2d331bb3..673c16c1d 100644
--- a/app/services/photo_service.rb
+++ b/app/services/photo_service.rb
@@ -54,12 +54,7 @@ class PhotoService
end
def update_profile_photo(photo)
- profile_params = {
- image_url: photo.url(:thumb_large),
- image_url_medium: photo.url(:thumb_medium),
- image_url_small: photo.url(:thumb_small)
- }
- @user.update_profile(profile_params)
+ @user.update_profile(photo: photo)
end
def send_to_streams(photo, photo_params)