diff options
| author | Grzegorz Bizon <grzesiek.bizon@gmail.com> | 2016-04-06 10:10:29 +0200 |
|---|---|---|
| committer | Grzegorz Bizon <grzesiek.bizon@gmail.com> | 2016-04-06 19:56:34 +0200 |
| commit | 5f32b82a80d517421889cfc89452f8d94fa09ea5 (patch) | |
| tree | 6ff3384cf8401319e23efab44f189e558c5ad6f9 /app | |
| parent | 15ea971847e0c72d99c8822afe2b1ea181479916 (diff) | |
| download | gitlab-ce-5f32b82a80d517421889cfc89452f8d94fa09ea5.tar.gz | |
Change name of badge variable in badges controller
Diffstat (limited to 'app')
| -rw-r--r-- | app/controllers/projects/badges_controller.rb | 2 | ||||
| -rw-r--r-- | app/views/projects/badges/index.html.haml | 6 |
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 · - = @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) |