diff options
| author | Grzegorz Bizon <grzegorz@gitlab.com> | 2017-07-22 05:36:02 +0000 |
|---|---|---|
| committer | Grzegorz Bizon <grzegorz@gitlab.com> | 2017-07-22 05:36:02 +0000 |
| commit | d950e4d937f06fb9c09847301a908839cf78dae1 (patch) | |
| tree | e4ab5d30f0b5059589ef0a34d7f31c58152220b0 /app | |
| parent | f6d2ac2bf14a136bc1d1714a519102b3a023331c (diff) | |
| parent | 0d3b8fad9742e6568458f2a8e4d66f0b36d731ec (diff) | |
| download | gitlab-ce-d950e4d937f06fb9c09847301a908839cf78dae1.tar.gz | |
Merge branch 'zj-pipeline-badge-improvements' into 'master'
Pipeline badge improvements
Closes #15582 and #20961
See merge request !12966
Diffstat (limited to 'app')
| -rw-r--r-- | app/controllers/projects/badges_controller.rb | 6 | ||||
| -rw-r--r-- | app/controllers/projects/settings/ci_cd_controller.rb | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/app/controllers/projects/badges_controller.rb b/app/controllers/projects/badges_controller.rb index 6c25cd83a24..06ba73d8e8d 100644 --- a/app/controllers/projects/badges_controller.rb +++ b/app/controllers/projects/badges_controller.rb @@ -3,11 +3,11 @@ class Projects::BadgesController < Projects::ApplicationController before_action :authorize_admin_project!, only: [:index] before_action :no_cache_headers, except: [:index] - def build - build_status = Gitlab::Badge::Build::Status + def pipeline + pipeline_status = Gitlab::Badge::Pipeline::Status .new(project, params[:ref]) - render_badge build_status + render_badge pipeline_status end def coverage diff --git a/app/controllers/projects/settings/ci_cd_controller.rb b/app/controllers/projects/settings/ci_cd_controller.rb index ea7ceb3eaa5..15a2ff56b92 100644 --- a/app/controllers/projects/settings/ci_cd_controller.rb +++ b/app/controllers/projects/settings/ci_cd_controller.rb @@ -35,7 +35,7 @@ module Projects def define_badges_variables @ref = params[:ref] || @project.default_branch || 'master' - @badges = [Gitlab::Badge::Build::Status, + @badges = [Gitlab::Badge::Pipeline::Status, Gitlab::Badge::Coverage::Report] @badges.map! do |badge| |