diff options
| author | Robert Speicher <robert@gitlab.com> | 2016-03-30 15:42:26 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2016-03-30 15:42:26 +0000 |
| commit | 489165e3438c8f0fbbdb4bb0f08f2406f7cafb0c (patch) | |
| tree | 41835ac836e911be2729c83827fcf4614e1f34bd /app/controllers/projects | |
| parent | 8718acdf80f5dcc70fdd625dfb0d073924132628 (diff) | |
| parent | d6097ca402d78fb23383fee2afc91e7bafc604c3 (diff) | |
| download | gitlab-ce-489165e3438c8f0fbbdb4bb0f08f2406f7cafb0c.tar.gz | |
Merge branch 'refactor/project-badges-interface' into 'master'
Refactor builds badge, encapsulate inside a class
This merge requests attempts to introduce interface for all badges.
Currently we only have a build badge, but other badges are in plans,
like coverage badge.
See merge request !3403
Diffstat (limited to 'app/controllers/projects')
| -rw-r--r-- | app/controllers/projects/badges_controller.rb | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/app/controllers/projects/badges_controller.rb b/app/controllers/projects/badges_controller.rb index 6ff47c4033a..6d4d4360988 100644 --- a/app/controllers/projects/badges_controller.rb +++ b/app/controllers/projects/badges_controller.rb @@ -2,11 +2,12 @@ class Projects::BadgesController < Projects::ApplicationController before_action :no_cache_headers def build + badge = Gitlab::Badge::Build.new(project, params[:ref]) + respond_to do |format| format.html { render_404 } format.svg do - image = Ci::ImageForBuildService.new.execute(project, ref: params[:ref]) - send_file(image.path, filename: image.name, disposition: 'inline', type: 'image/svg+xml') + send_data(badge.data, type: badge.type, disposition: 'inline') end end end |