Jacob Schatz 01160fc061 Merge branch 'avatar-cropping' into 'master' ...

Fix avatar stretching by providing a cropping feature

Originally by @nesk at https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/2773

Fixes #7959

See merge request !2951

2016-02-26 17:56:24 +00:00

..

assets

Merge branch 'avatar-cropping' into 'master'

2016-02-26 17:56:24 +00:00

controllers

Merge branch 'master' into avatar-cropping

2016-02-24 10:42:51 -05:00

finders

Rename Tasks to Todos

2016-02-20 12:39:27 -02:00

helpers

Move "I should see Crowd login form" feature to a view spec

2016-02-24 17:38:13 -05:00

mailers

Fix broken link in CI build notification emails

2016-02-12 14:01:27 +01:00

models

Add :with_avatar trait to User factory

2016-02-24 13:50:03 -05:00

services

Does not create a todo when commenting on commit or project snippet

2016-02-24 21:09:40 -03:00

uploaders

Minor changes on avatar cropping internals

2016-02-18 13:12:39 +01:00

validators

Re-add EmailValidator to avoid the repetition of format: { with: Devise.email_regexp }

2016-02-09 18:15:35 +01:00

views

Merge branch 'avatar-cropping' into 'master'

2016-02-26 17:56:24 +00:00

workers

Merge branch 'fix/gitpushservice-complexity-issue' into 'master'

2016-02-18 09:33:21 +00:00