diff options
| author | Jeroen van Baarsen <jeroenvanbaarsen@gmail.com> | 2015-03-01 10:54:42 +0100 |
|---|---|---|
| committer | Jeroen van Baarsen <jeroenvanbaarsen@gmail.com> | 2015-03-01 10:54:42 +0100 |
| commit | 93bacb03e5ea33a67bcc8198862a23d2038bf6ef (patch) | |
| tree | 40eeda3d6162a1a833f2e1b9c95fcd92d566bff6 /app/helpers/application_helper.rb | |
| parent | 7486bc0ae33adc141abbca2ea5dea833e56d5409 (diff) | |
| parent | 51abeaa1bc93862a4d15506a590704f9fc56cfd6 (diff) | |
| download | gitlab-ce-93bacb03e5ea33a67bcc8198862a23d2038bf6ef.tar.gz | |
Merge pull request #8890 from sue445/feature/project_api_avatar_url
Expose avatar_url in projects API
Diffstat (limited to 'app/helpers/application_helper.rb')
| -rw-r--r-- | app/helpers/application_helper.rb | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 365de3595cd..a81e41819b7 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -58,10 +58,8 @@ module ApplicationHelper Project.find_with_namespace(project_id) end - if project.avatar.present? - image_tag project.avatar.url, options - elsif project.avatar_in_git - image_tag namespace_project_avatar_path(project.namespace, project), options + if project.avatar_url + image_tag project.avatar_url, options else # generated icon project_identicon(project, options) end |