summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--app/controllers/projects/badges_controller.rb2
-rw-r--r--app/views/projects/badges/index.html.haml6
2 files changed, 4 insertions, 4 deletions
diff --git a/app/controllers/projects/badges_controller.rb b/app/controllers/projects/badges_controller.rb
index 6e442d66adc..9dff74c823b 100644
--- a/app/controllers/projects/badges_controller.rb
+++ b/app/controllers/projects/badges_controller.rb
@@ -5,7 +5,7 @@ class Projects::BadgesController < Projects::ApplicationController
def index
@ref = params[:ref] || 'master'
- @badge = Gitlab::Badge::Build.new(@project, @ref)
+ @build_badge = Gitlab::Badge::Build.new(@project, @ref)
end
def build
diff --git a/app/views/projects/badges/index.html.haml b/app/views/projects/badges/index.html.haml
index fb57bf411dc..c22384ddf46 100644
--- a/app/views/projects/badges/index.html.haml
+++ b/app/views/projects/badges/index.html.haml
@@ -6,7 +6,7 @@
.panel.panel-default
.panel-heading
%b Builds badge &middot;
- = @badge.to_html
+ = @build_badge.to_html
.pull-right
= render 'shared/ref_switcher', destination: 'badges'
.panel-body
@@ -14,11 +14,11 @@
.col-md-2.text-center
Markdown
.col-md-10.code.js-syntax-highlight
- = highlight('.md', @badge.to_markdown)
+ = highlight('.md', @build_badge.to_markdown)
.row
%hr
.row
.col-md-2.text-center
HTML
.col-md-10.code.js-syntax-highlight
- = highlight('.html', @badge.to_html)
+ = highlight('.html', @build_badge.to_html)