diff options
| author | Grzegorz Bizon <grzesiek.bizon@gmail.com> | 2017-01-16 14:21:44 +0100 |
|---|---|---|
| committer | Grzegorz Bizon <grzesiek.bizon@gmail.com> | 2017-01-16 14:21:44 +0100 |
| commit | 4657c28777dfc2729261f895f8e36cbef51395bc (patch) | |
| tree | 86c2483e843be06ad10c0f0b43f6a20da3a5a6b8 /app/serializers/commit_entity.rb | |
| parent | 5456859b5b28baca95ced74179a349563498a5f0 (diff) | |
| parent | daaaf5ef9f182761ac07d76d24d971765134c7e1 (diff) | |
| download | gitlab-ce-fix/keep-artifacts-button-visibility.tar.gz | |
Merge branch 'master' into fix/keep-artifacts-button-visibilityfix/keep-artifacts-button-visibility
* master: (579 commits)
Conflicts:
spec/models/build_spec.rb
Diffstat (limited to 'app/serializers/commit_entity.rb')
| -rw-r--r-- | app/serializers/commit_entity.rb | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/app/serializers/commit_entity.rb b/app/serializers/commit_entity.rb index acc20f6dc52..31763955f97 100644 --- a/app/serializers/commit_entity.rb +++ b/app/serializers/commit_entity.rb @@ -3,17 +3,21 @@ class CommitEntity < API::Entities::RepoCommit expose :author, using: UserEntity + expose :author_gravatar_url do |commit| + GravatarService.new.execute(commit.author_email) + end + expose :commit_url do |commit| - namespace_project_tree_url( + namespace_project_commit_url( request.project.namespace, request.project, - id: commit.id) + commit) end expose :commit_path do |commit| - namespace_project_tree_path( + namespace_project_commit_path( request.project.namespace, request.project, - id: commit.id) + commit) end end |