summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGrzegorz Bizon <grzesiek.bizon@gmail.com>2016-01-18 08:12:31 +0100
committerGrzegorz Bizon <grzesiek.bizon@gmail.com>2016-01-18 08:12:31 +0100
commit6fe33804dc080522242d9ea3639548c2b246a56b (patch)
treebcfca47b98d40a74cbfb8ad81618f38d27b30c05
parent7506afe14bad7bb4f93e26a539b3ffe75303e180 (diff)
downloadgitlab-ce-6fe33804dc080522242d9ea3639548c2b246a56b.tar.gz
Remove dropdown containing CI Lint button on builds pagefeature/expose-ci-lint-tool
Link to CI Lint on builds page will be a separate button from now on.
-rw-r--r--app/views/projects/builds/index.html.haml12
-rw-r--r--features/project/builds/summary.feature2
-rw-r--r--features/steps/project/builds/summary.rb4
3 files changed, 6 insertions, 12 deletions
diff --git a/app/views/projects/builds/index.html.haml b/app/views/projects/builds/index.html.haml
index 747d94cc9e6..bbb6944a65a 100644
--- a/app/views/projects/builds/index.html.haml
+++ b/app/views/projects/builds/index.html.haml
@@ -9,15 +9,9 @@
= link_to 'Cancel running', cancel_all_namespace_project_builds_path(@project.namespace, @project),
data: { confirm: 'Are you sure?' }, class: 'btn btn-danger', method: :post
- .dropdown.inline
- %button.btn.btn-default.dropdown-toggle{ type: 'button', id: 'tools-dropdown', 'data-toggle' => 'dropdown' }
- Tools
- %span.caret
- %ul.dropdown-menu.dropdown-menu-right
- %li
- = link_to ci_lint_path do
- = icon('wrench')
- %span CI Lint Tool
+ = link_to ci_lint_path, class: 'btn btn-default' do
+ = icon('wrench')
+ %span CI Lint
%ul.nav-links
%li{class: ('active' if @scope.nil?)}
diff --git a/features/project/builds/summary.feature b/features/project/builds/summary.feature
index 9f006fcaca8..b69d279517b 100644
--- a/features/project/builds/summary.feature
+++ b/features/project/builds/summary.feature
@@ -12,4 +12,4 @@ Feature: Project Builds Summary
Scenario: I browse project builds page
When I visit project builds page
- Then I see button to CI Lint Tool
+ Then I see button to CI Lint
diff --git a/features/steps/project/builds/summary.rb b/features/steps/project/builds/summary.rb
index 67986b958ec..036bc0a499e 100644
--- a/features/steps/project/builds/summary.rb
+++ b/features/steps/project/builds/summary.rb
@@ -12,9 +12,9 @@ class Spinach::Features::ProjectBuildsSummary < Spinach::FeatureSteps
expect(page).to have_css '#build-trace'
end
- step 'I see button to CI Lint Tool' do
+ step 'I see button to CI Lint' do
page.within('.controls') do
- ci_lint_tool_link = page.find_link('CI Lint Tool')
+ ci_lint_tool_link = page.find_link('CI Lint')
expect(ci_lint_tool_link[:href]).to eq ci_lint_path
end
end