Merge remote-tracking branch 'upstream/master' into show-commit-status-from-latest-pipeline

* upstream/master: (557 commits)
  Fix wrong error message expectation in API::Commits spec
  Move admin settings spinach feature to rspec
  Encode when migrating ProcessCommitWorker jobs
  Prevent overflow with vertical scroll when we have space to show content
  Make rubocop happy
  API: Ability to cherry-pick a commit
  Be smarter when finding a sudoed user in API::Helpers
  Backport hooks on group policies for the EE-specific implementation
  API: Ability to get group's project in simple representation
  Add AddLowerPathIndexToRoutes to setup_postgresql.rake
  For single line git commit messages, the close quote should be on the same line as the open quote
  added border-radius and padding to labels
  Allow all alphanumeric characters in file names (!8002)
  Add failing test for #20190
  Don't allow blank MR titles in API
  Replace static fixture for awards_handler_spec (!7661)
  Crontab typo '* */6' -> '0 */6' (4x/day not 1x-per-min-for-1h 4x/day)
  Fix test
  Tweak style and add back wording
  Clean up commit copy to clipboard and make consistent
  ...

14 files changed, 78 insertions, 178 deletions

diff --git a/spec/javascripts/fixtures/application.html.haml b/spec/javascripts/fixtures/application.html.haml
deleted file mode 100644
index 3fc6114407d..00000000000
--- a/spec/javascripts/fixtures/application.html.haml
+++ /dev/null
@@ -1,2 +0,0 @@
-%a#test-link.btn.disabled{:href => "/foo"} Test link
-%button#test-button.btn.disabled Test Button
diff --git a/spec/javascripts/fixtures/awards_handler.html.haml b/spec/javascripts/fixtures/awards_handler.html.haml
deleted file mode 100644
index 1ef2e8f8624..00000000000
--- a/spec/javascripts/fixtures/awards_handler.html.haml
+++ /dev/null
@@ -1,52 +0,0 @@
-.issue-details.issuable-details
-  .detail-page-description.content-block
-    %h2.title Quibusdam sint officiis earum molestiae ipsa autem voluptatem nisi rem.
-    .description.js-task-list-container.is-task-list-enabled
-      .wiki
-        %p Qui exercitationem magnam optio quae fuga earum odio.
-        %textarea.hidden.js-task-list-field Qui exercitationem magnam optio quae fuga earum odio.
-      %small.edited-text
-    .content-block.content-block-small
-      .awards.js-awards-block{"data-award-url" => "/gitlab-org/gitlab-test/issues/8/toggle_award_emoji"}
-        %button.award-control.btn.js-emoji-btn{"data-placement" => "bottom", "data-title" => "", :type => "button"}
-          .icon.emoji-icon.emoji-1F44D{"data-aliases" => "", "data-emoji" => "thumbsup", "data-unicode-name" => "1F44D", :title => "thumbsup"}
-          %span.award-control-text.js-counter 0
-        %button.award-control.btn.js-emoji-btn{"data-placement" => "bottom", "data-title" => "", :type => "button"}
-          .icon.emoji-icon.emoji-1F44E{"data-aliases" => "", "data-emoji" => "thumbsdown", "data-unicode-name" => "1F44E", :title => "thumbsdown"}
-          %span.award-control-text.js-counter 0
-        .award-menu-holder.js-award-holder
-          %button.btn.award-control.js-add-award{:type => "button"}
-            %i.fa.fa-smile-o.award-control-icon.award-control-icon-normal
-            %i.fa.fa-spinner.fa-spin.award-control-icon.award-control-icon-loading
-            %span.award-control-text Add
-    %section.issuable-discussion
-      #notes
-        %ul#notes-list.notes.main-notes-list.timeline
-          %li#note_348.note.note-row-348.timeline-entry{"data-author-id" => "18", "data-editable" => ""}
-            .timeline-entry-inner
-              .timeline-icon
-                %a{:href => "/u/agustin"}
-                  %img.avatar.s40{:alt => "", :src => "#"}/
-              .timeline-content
-                .note-header
-                  %a.author_link{:href => "/u/agustin"}
-                    %span.author Brenna Stokes
-                  .inline.note-headline-light
-                    @agustin commented
-                    %a{:href => "#note_348"}
-                      %time 11 days ago
-                  .note-actions
-                    %span.note-role Reporter
-                    %a.note-action-button.note-emoji-button.js-add-award.js-note-emoji{"data-position" => "right", :href => "#", :title => "Award Emoji"}
-                      %i.fa.fa-spinner.fa-spin
-                      %i.fa.fa-smile-o.link-highlight
-                .js-task-list-container.note-body.is-task-list-enabled
-                  .note-text
-                    %p Suscipit sunt quia quisquam sed eveniet ipsam.
-                  .note-awards
-                    .awards.hidden.js-awards-block{"data-award-url" => "/gitlab-org/gitlab-test/notes/348/toggle_award_emoji"}
-                      .award-menu-holder.js-award-holder
-                        %button.btn.award-control.js-add-award{:type => "button"}
-                          %i.fa.fa-smile-o.award-control-icon.award-control-icon-normal
-                          %i.fa.fa-spinner.fa-spin.award-control-icon.award-control-icon-loading
-                          %span.award-control-text Add
diff --git a/spec/javascripts/fixtures/build.html.haml b/spec/javascripts/fixtures/build.html.haml
deleted file mode 100644
index 06b49516e5c..00000000000
--- a/spec/javascripts/fixtures/build.html.haml
+++ /dev/null
@@ -1,62 +0,0 @@
-.build-page
-  .prepend-top-default
-    .autoscroll-container
-      %button.btn.btn-success.btn-sm#autoscroll-button{:type => "button", :data => {:state => 'disabled'}} enable autoscroll
-    #js-build-scroll.scroll-controls
-      %a.btn{href: '#build-trace'}
-        %i.fa.fa-angle-up
-      %a.btn{href: '#down-build-trace'}
-        %i.fa.fa-angle-down
-    %pre.build-trace#build-trace
-      %code.bash.js-build-output
-      %i.fa.fa-refresh.fa-spin.js-build-refresh
-
-%aside.right-sidebar.right-sidebar-expanded.build-sidebar.js-build-sidebar
-  .block.build-sidebar-header.visible-xs-block.visible-sm-block.append-bottom-default
-    Build
-    %strong #1
-    %a.gutter-toggle.pull-right.js-sidebar-build-toggle{ href: "#" }
-      %i.fa.fa-angle-double-right
-  .blocks-container
-    .dropdown.build-dropdown
-      .title Stage
-      %button.dropdown-menu-toggle{type: 'button', 'data-toggle' => 'dropdown'}
-        %span.stage-selection More
-        %i.fa.fa-caret-down
-      %ul.dropdown-menu
-        %li
-          %a.stage-item build
-        %li
-          %a.stage-item test
-        %li
-          %a.stage-item deploy
-  .builds-container
-    .build-job{data: {stage: 'build'}}
-      %a{href: 'http://example.com/root/test-build/builds/1'}
-        %i.fa.fa-check
-        %i.fa.fa-check-circle-o
-        %span
-          Setup
-    .build-job{data: {stage: 'test'}}
-      %a{href: 'http://example.com/root/test-build/builds/2'}
-        %i.fa.fa-check
-        %i.fa.fa-check-circle-o
-        %span
-          Tests
-    .build-job{data: {stage: 'deploy'}}
-      %a{href: 'http://example.com/root/test-build/builds/3'}
-        %i.fa.fa-check
-        %i.fa.fa-check-circle-o
-        %span
-          Deploy
-
-.js-build-options{ data: { page_url: 'http://example.com/root/test-build/builds/2',
-  build_url: 'http://example.com/root/test-build/builds/2.json',
-  build_status: 'passed',
-  build_stage: 'test',
-  log_state: 'buildstate' }}
-
-%p.build-detail-row
-  The artifacts will be removed in
-  %span.js-artifacts-remove
-    2016-12-19 09:02:12 UTC
diff --git a/spec/javascripts/fixtures/builds.rb b/spec/javascripts/fixtures/builds.rb
new file mode 100644
index 00000000000..978e25a1c32
--- /dev/null
+++ b/spec/javascripts/fixtures/builds.rb
@@ -0,0 +1,33 @@
+require 'spec_helper'
+
+describe Projects::BuildsController, '(JavaScript fixtures)', type: :controller do
+  include JavaScriptFixturesHelpers
+
+  let(:admin) { create(:admin) }
+  let(:namespace) { create(:namespace, name: 'frontend-fixtures' )}
+  let(:project) { create(:project_empty_repo, namespace: namespace, path: 'builds-project') }
+  let(:pipeline) { create(:ci_empty_pipeline, project: project) }
+  let!(:build_with_artifacts) { create(:ci_build, :success, :artifacts, :trace, pipeline: pipeline, stage: 'test', artifacts_expire_at: Time.now + 18.months) }
+  let!(:failed_build) { create(:ci_build, :failed, pipeline: pipeline, stage: 'build') }
+  let!(:pending_build) { create(:ci_build, :pending, pipeline: pipeline, stage: 'deploy') }
+
+  render_views
+
+  before(:all) do
+    clean_frontend_fixtures('builds/')
+  end
+
+  before(:each) do
+    sign_in(admin)
+  end
+
+  it 'builds/build-with-artifacts.html.raw' do |example|
+    get :show,
+      namespace_id: project.namespace.to_param,
+      project_id: project.to_param,
+      id: build_with_artifacts.to_param
+
+    expect(response).to be_success
+    store_frontend_fixture(response, example.description)
+  end
+end
diff --git a/spec/javascripts/fixtures/comments.html.haml b/spec/javascripts/fixtures/comments.html.haml
deleted file mode 100644
index cc1f8f15c21..00000000000
--- a/spec/javascripts/fixtures/comments.html.haml
+++ /dev/null
@@ -1,21 +0,0 @@
-.flash-container.timeline-content
-.timeline-icon.hidden-xs.hidden-sm
-  %a.author_link
-    %img
-.timeline-content.timeline-content-form
-  %form.new-note.js-quick-submit.common-note-form.gfm-form.js-main-target-form
-    .md-area
-      .md-header
-      .md-write-holder
-        .zen-backdrop.div-dropzone-wrapper
-          .div-dropzone-wrapper
-            .div-dropzone.dz-clickable
-              %textarea.note-textarea.js-note-text.js-gfm-input.js-autosize.markdown-area
-    .note-form-actions.clearfix
-      %input.btn.btn-nr.btn-create.append-right-10.comment-btn.js-comment-button{ type: 'submit' }
-      %a.btn.btn-nr.btn-reopen.btn-comment.js-note-target-reopen
-        Reopen issue
-      %a.btn.btn-nr.btn-close.btn-comment.js-note-target-close
-        Close issue
-      %a.btn.btn-cancel.js-note-discard
-        Discard draft
\ No newline at end of file
diff --git a/spec/javascripts/fixtures/event_filter.html.haml b/spec/javascripts/fixtures/event_filter.html.haml
index 95e248cadf8..5477c6075f0 100644
--- a/spec/javascripts/fixtures/event_filter.html.haml
+++ b/spec/javascripts/fixtures/event_filter.html.haml
@@ -12,6 +12,10 @@
       %span
         Merge events
   %li
+    %a.event-filter-link{ id: "issue_event_filter", title: "Filter by issue events", href: "/dashboard/activity"}
+      %span
+        Issue events
+  %li
     %a.event-filter-link{ id: "comments_event_filter", title: "Filter by comments", href: "/dashboard/activity"}
       %span
         Comments
diff --git a/spec/javascripts/fixtures/issuable.html.haml b/spec/javascripts/fixtures/issuable.html.haml
deleted file mode 100644
index 42ab4aa68b1..00000000000
--- a/spec/javascripts/fixtures/issuable.html.haml
+++ /dev/null
@@ -1,2 +0,0 @@
-%form.js-main-target-form
-  %textarea#note_note
diff --git a/spec/javascripts/fixtures/issue_note.html.haml b/spec/javascripts/fixtures/issue_note.html.haml
deleted file mode 100644
index 0aecc7334fd..00000000000
--- a/spec/javascripts/fixtures/issue_note.html.haml
+++ /dev/null
@@ -1,12 +0,0 @@
-%ul
-  %li.note
-    .js-task-list-container
-      .note-text
-        %ul.task-list
-          %li.task-list-item
-            %input.task-list-item-checkbox{type: 'checkbox'}
-            Task List Item
-      .note-edit-form
-        %form
-          %textarea.js-task-list-field
-            \- [ ] Task List Item
diff --git a/spec/javascripts/fixtures/issues.rb b/spec/javascripts/fixtures/issues.rb
index d95eb851421..06f708f9e15 100644
--- a/spec/javascripts/fixtures/issues.rb
+++ b/spec/javascripts/fixtures/issues.rb
@@ -4,7 +4,8 @@ describe Projects::IssuesController, '(JavaScript fixtures)', type: :controller
   include JavaScriptFixturesHelpers
 
   let(:admin) { create(:admin) }
-  let(:project) { create(:project_empty_repo) }
+  let(:namespace) { create(:namespace, name: 'frontend-fixtures' )}
+  let(:project) { create(:project_empty_repo, namespace: namespace, path: 'issues-project') }
 
   render_views
 
@@ -25,8 +26,13 @@ describe Projects::IssuesController, '(JavaScript fixtures)', type: :controller
   end
 
   it 'issues/issue-with-task-list.html.raw' do |example|
+    issue = create(:issue, project: project, description: '- [ ] Task List Item')
+    render_issue(example.description, issue)
+  end
+
+  it 'issues/issue_with_comment.html.raw' do |example|
     issue = create(:issue, project: project)
-    issue.update(description: '- [ ] Task List Item')
+    create(:note, project: project, noteable: issue, note: '- [ ] Task List Item').save
     render_issue(example.description, issue)
   end
 
diff --git a/spec/javascripts/fixtures/linked_tabs.html.haml b/spec/javascripts/fixtures/linked_tabs.html.haml
new file mode 100644
index 00000000000..93c0cf97ff0
--- /dev/null
+++ b/spec/javascripts/fixtures/linked_tabs.html.haml
@@ -0,0 +1,13 @@
+%ul.nav.nav-tabs.linked-tabs
+  %li
+    %a{ href: 'foo/bar/1', data: { target: 'div#tab1', action: 'tab1', toggle: 'tab' } }
+      Tab 1
+  %li
+    %a{ href: 'foo/bar/1/context', data: { target: 'div#tab2', action: 'tab2', toggle: 'tab' } }
+      Tab 2
+
+.tab-content
+  #tab1.tab-pane
+    Tab 1 Content
+  #tab2.tab-pane
+    Tab 2 Content
diff --git a/spec/javascripts/fixtures/pipeline_graph.html.haml b/spec/javascripts/fixtures/pipeline_graph.html.haml
new file mode 100644
index 00000000000..deca50ceaa7
--- /dev/null
+++ b/spec/javascripts/fixtures/pipeline_graph.html.haml
@@ -0,0 +1,15 @@
+%div.pipeline-visualization.js-pipeline-graph
+  %ul.stage-column-list
+    %li.stage-column
+      .stage-name
+        %a{:href => "/"}
+          Test
+          .builds-container
+            %ul
+              %li.build
+                .curve
+                .build-content
+                  %a
+                    %svg
+                    .ci-status-text
+                      stop_review
diff --git a/spec/javascripts/fixtures/right_sidebar.html.haml b/spec/javascripts/fixtures/right_sidebar.html.haml
deleted file mode 100644
index d48b77cf0ce..00000000000
--- a/spec/javascripts/fixtures/right_sidebar.html.haml
+++ /dev/null
@@ -1,17 +0,0 @@
-%div
-  %div.page-gutter.page-with-sidebar
-
-  %aside.right-sidebar
-    %div.block.issuable-sidebar-header
-      %a.gutter-toggle.pull-right.js-sidebar-toggle
-        %i.fa.fa-angle-double-left
-      %button.btn.btn-default.issuable-header-btn.pull-right.js-issuable-todo{ type: "button", data: { todo_text: "Add Todo", mark_text: "Mark Done", issuable_id: "1", issuable_type: "issue", url: "/todos" }}
-        %span.js-issuable-todo-text
-          Add Todo
-        %i.fa.fa-spin.fa-spinner.js-issuable-todo-loading.hidden
-
-    %form.issuable-context-form
-      %div.block.labels
-        %div.sidebar-collapsed-icon
-          %i.fa.fa-tags
-          %span 1
diff --git a/spec/javascripts/fixtures/signin_tabs.html.haml b/spec/javascripts/fixtures/signin_tabs.html.haml
new file mode 100644
index 00000000000..12b8d423cbe
--- /dev/null
+++ b/spec/javascripts/fixtures/signin_tabs.html.haml
@@ -0,0 +1,5 @@
+%ul.nav-tabs
+  %li
+    %a.active{ id: 'standard', href: '#standard'} Standard
+  %li
+    %a{ id: 'ldap', href: '#ldap'} Ldap
diff --git a/spec/javascripts/fixtures/zen_mode.html.haml b/spec/javascripts/fixtures/zen_mode.html.haml
deleted file mode 100644
index cb906a7feaa..00000000000
--- a/spec/javascripts/fixtures/zen_mode.html.haml
+++ /dev/null
@@ -1,8 +0,0 @@
-.md-area
-  .zen-backdrop
-    %textarea#note_note.js-gfm-input.markdown-area
-    %a.js-zen-enter(tabindex="-1" href="#")
-      %i.fa.fa-expand
-      Edit in fullscreen
-    %a.js-zen-leave(tabindex="-1" href="#")
-      %i.fa.fa-compress