Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

use camo for medium and small avatars #5883

Merged
merged 1 commit into from
Apr 24, 2015

Conversation

SuperTux88
Copy link
Member

on the contacts page, external urls were used without camo

@@ -4,8 +4,8 @@ class AvatarPresenter < BasePresenter
DEFAULT_IMAGE = ActionController::Base.helpers.image_path('user/default.png')

def base_hash
{ small: image_url_small || DEFAULT_IMAGE,
medium: image_url_medium || DEFAULT_IMAGE,
{ small: image_url(:thumb_small) || DEFAULT_IMAGE,

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Align the elements of a hash literal if they span more than one line.
Space inside { detected.

@SuperTux88 SuperTux88 force-pushed the fix-camo-on-contacts-page branch from 2065acf to 6b28b03 Compare April 24, 2015 00:54
{ small: image_url_small || DEFAULT_IMAGE,
medium: image_url_medium || DEFAULT_IMAGE,
{
small: image_url(:thumb_small) || DEFAULT_IMAGE,

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Align the elements of a hash literal if they span more than one line.

@SuperTux88 SuperTux88 force-pushed the fix-camo-on-contacts-page branch from 6b28b03 to 81cc0a3 Compare April 24, 2015 00:57
medium: image_url_medium || DEFAULT_IMAGE,
large: image_url || DEFAULT_IMAGE
{
small: image_url(:thumb_small) || DEFAULT_IMAGE,

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Unnecessary spacing detected.

@SuperTux88 SuperTux88 force-pushed the fix-camo-on-contacts-page branch from 81cc0a3 to 56bc37b Compare April 24, 2015 01:00
@SuperTux88 SuperTux88 force-pushed the fix-camo-on-contacts-page branch from 56bc37b to 344b198 Compare April 24, 2015 01:10
@denschub denschub merged commit 344b198 into diaspora:develop Apr 24, 2015
denschub added a commit that referenced this pull request Apr 24, 2015
@denschub
Copy link
Member

Thank you!

🍪

@SuperTux88 SuperTux88 deleted the fix-camo-on-contacts-page branch April 25, 2015 00:11
@denschub denschub added this to the 0.5.1.0 milestone Apr 25, 2015
@jhass jhass added backport and removed backport labels May 3, 2015
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants