Merge branch 'master' into feature/gb/persist-pipeline-stages

* master: (524 commits)
  Improve user experience around slash commands in instant comments
  Fix LFS timeouts when trying to save large files
  retryable? is now available for CommitStatus
  Resolve "Documentation of `.gitlab-ci.yml` states incorrect example for variables"
  Fix test failures
  Add slugify project path to CI enviroment variables
  Fixed typo: craeted -> created
  32118 Make New environment empty state btn lowercase
  Expose import_status in Projects API
  32832 Remove overflow from comment form for confidential issues and vertically aligns confidential issue icon
  Fix test failures
  Allow manual bypass of auto_sign_in_with_provider
  Fix keys seed
  Allow users to be hard-deleted from the API
  fixup some classnames and media queries
  Enable the Style/PreferredHashMethods cop
  Lint our factories creation in addition to their build
  Don’t schedule workers from inside transactions
  Allow scheduling from after_commit hooks
  Forbid Sidekiq scheduling in transactions
  ...

Conflicts:
	app/serializers/pipeline_entity.rb
	db/schema.rb
	spec/factories/ci/stages.rb
	spec/lib/gitlab/import_export/safe_model_attributes.yml
	spec/services/ci/create_pipeline_service_spec.rb
	spec/spec_helper.rb

6 files changed, 316 insertions, 0 deletions

diff --git a/app/views/projects/jobs/_header.html.haml b/app/views/projects/jobs/_header.html.haml
new file mode 100644
index 00000000000..ad72ab5b199
--- /dev/null
+++ b/app/views/projects/jobs/_header.html.haml
@@ -0,0 +1,31 @@
+- show_controls = local_assigns.fetch(:show_controls, true)
+- pipeline = @build.pipeline
+
+.content-block.build-header.top-area
+  .header-content
+    = render 'ci/status/badge', status: @build.detailed_status(current_user), link: false, title: @build.status_title
+    %strong
+      Job
+      = link_to "##{@build.id}", namespace_project_job_path(@project.namespace, @project, @build), class: 'js-build-id'
+    in pipeline
+    %strong
+      = link_to "##{pipeline.id}", pipeline_path(pipeline)
+    for
+    %strong
+      = link_to pipeline.short_sha, namespace_project_commit_path(@project.namespace, @project, pipeline.sha), class: 'commit-sha'
+    from
+    %strong
+      = link_to @build.ref, project_ref_path(@project, @build.ref), class: 'ref-name'
+
+    = render "projects/jobs/user" if @build.user
+
+    = time_ago_with_tooltip(@build.created_at)
+
+  - if show_controls
+    .nav-controls
+      - if can?(current_user, :create_issue, @project) && @build.failed?
+        = link_to "New issue", new_namespace_project_issue_path(@project.namespace, @project, issue: build_failed_issue_options), class: 'btn btn-new btn-inverted'
+      - if can?(current_user, :update_build, @build) && @build.retryable?
+        = link_to "Retry job", retry_namespace_project_job_path(@project.namespace, @project, @build), class: 'btn btn-inverted-secondary', method: :post
+    %button.btn.btn-default.pull-right.visible-xs-block.visible-sm-block.build-gutter-toggle.js-sidebar-build-toggle{ role: "button", type: "button" }
+      = icon('angle-double-left')
diff --git a/app/views/projects/jobs/_sidebar.html.haml b/app/views/projects/jobs/_sidebar.html.haml
new file mode 100644
index 00000000000..09d4ddc243b
--- /dev/null
+++ b/app/views/projects/jobs/_sidebar.html.haml
@@ -0,0 +1,132 @@
+- builds = @build.pipeline.builds.to_a
+
+%aside.right-sidebar.right-sidebar-expanded.build-sidebar.js-build-sidebar.js-right-sidebar{ data: { "offset-top" => "101", "spy" => "affix" } }
+  .block.build-sidebar-header.visible-xs-block.visible-sm-block.append-bottom-default
+    Job
+    %strong ##{@build.id}
+    %a.gutter-toggle.pull-right.js-sidebar-build-toggle{ href: "#" }
+      = icon('angle-double-right')
+  - if @build.coverage
+    .block.coverage
+      .title
+        Test coverage
+      %p.build-detail-row
+        #{@build.coverage}%
+
+  .blocks-container
+    - if can?(current_user, :read_build, @project) && (@build.artifacts? || @build.artifacts_expired?)
+      .block{ class: ("block-first" if !@build.coverage) }
+        .title
+          Job artifacts
+        - if @build.artifacts_expired?
+          %p.build-detail-row
+            The artifacts were removed
+            #{time_ago_with_tooltip(@build.artifacts_expire_at)}
+        - elsif @build.has_expiring_artifacts?
+          %p.build-detail-row
+            The artifacts will be removed in
+            %span.js-artifacts-remove= @build.artifacts_expire_at
+
+        - if @build.artifacts?
+          .btn-group.btn-group-justified{ role: :group }
+            - if @build.has_expiring_artifacts? && can?(current_user, :update_build, @build)
+              = link_to keep_namespace_project_job_artifacts_path(@project.namespace, @project, @build), class: 'btn btn-sm btn-default', method: :post do
+                Keep
+
+            = link_to download_namespace_project_job_artifacts_path(@project.namespace, @project, @build), rel: 'nofollow', download: '', class: 'btn btn-sm btn-default' do
+              Download
+
+            - if @build.artifacts_metadata?
+              = link_to browse_namespace_project_job_artifacts_path(@project.namespace, @project, @build), class: 'btn btn-sm btn-default' do
+                Browse
+
+    .block{ class: ("block-first" if !@build.coverage && !(can?(current_user, :read_build, @project) && (@build.artifacts? || @build.artifacts_expired?))) }
+      .title
+        Job details
+        - if can?(current_user, :update_build, @build) && @build.retryable?
+          = link_to "Retry job", retry_namespace_project_job_path(@project.namespace, @project, @build), class: 'pull-right retry-link', method: :post
+      - if @build.merge_request
+        %p.build-detail-row
+          %span.build-light-text Merge Request:
+          = link_to "#{@build.merge_request.to_reference}", merge_request_path(@build.merge_request), class: 'bold'
+      - if @build.duration
+        %p.build-detail-row
+          %span.build-light-text Duration:
+          = time_interval_in_words(@build.duration)
+      - if @build.finished_at
+        %p.build-detail-row
+          %span.build-light-text Finished:
+          #{time_ago_with_tooltip(@build.finished_at)}
+      - if @build.erased_at
+        %p.build-detail-row
+          %span.build-light-text Erased:
+          #{time_ago_with_tooltip(@build.erased_at)}
+      %p.build-detail-row
+        %span.build-light-text Runner:
+        - if @build.runner && current_user && current_user.admin
+          = link_to "##{@build.runner.id}", admin_runner_path(@build.runner.id)
+        - elsif @build.runner
+          \##{@build.runner.id}
+      .btn-group.btn-group-justified{ role: :group }
+        - if @build.active?
+          = link_to "Cancel", cancel_namespace_project_job_path(@project.namespace, @project, @build), class: 'btn btn-sm btn-default', method: :post
+
+    - if @build.trigger_request
+      .build-widget
+        %h4.title
+          Trigger
+
+        %p
+          %span.build-light-text Token:
+          #{@build.trigger_request.trigger.short_token}
+
+        - if @build.trigger_request.variables
+          %p
+            %button.btn.group.btn-group-justified.reveal-variables Reveal Variables
+
+
+          - @build.trigger_request.variables.each do |key, value|
+            .hide.js-build
+              .js-build-variable= key
+              .js-build-value= value
+
+    .block
+      .title
+        Commit title
+      %p.build-light-text.append-bottom-0
+        #{@build.pipeline.git_commit_title}
+
+    - if @build.tags.any?
+      .block
+        .title
+          Tags
+        - @build.tag_list.each do |tag|
+          %span.label.label-primary
+            = tag
+
+    - if @build.pipeline.stages_count > 1
+      .dropdown.build-dropdown
+        .title Stage
+        %button.dropdown-menu-toggle{ type: 'button', 'data-toggle' => 'dropdown' }
+          %span.stage-selection More
+          = icon('chevron-down')
+        %ul.dropdown-menu
+          - @build.pipeline.legacy_stages.each do |stage|
+            %li
+              %a.stage-item= stage.name
+
+  .builds-container
+    - HasStatus::ORDERED_STATUSES.each do |build_status|
+      - builds.select{|build| build.status == build_status}.each do |build|
+        .build-job{ class: sidebar_build_class(build, @build), data: { stage: build.stage } }
+          = link_to namespace_project_job_path(@project.namespace, @project, build) do
+            = icon('arrow-right')
+            %span{ class: "ci-status-icon-#{build.status}" }
+              = ci_icon_for_status(build.status)
+            %span
+              - if build.name
+                = build.name
+              - else
+                = build.id
+            - if build.retried?
+              %i.fa.fa-refresh.has-tooltip{ data: { container: 'body', placement: 'bottom' }, title: 'Job was retried' }
diff --git a/app/views/projects/jobs/_table.html.haml b/app/views/projects/jobs/_table.html.haml
new file mode 100644
index 00000000000..82806f022ee
--- /dev/null
+++ b/app/views/projects/jobs/_table.html.haml
@@ -0,0 +1,25 @@
+- admin = local_assigns.fetch(:admin, false)
+
+- if builds.blank?
+  %div
+    .nothing-here-block No jobs to show
+- else
+  .table-holder
+    %table.table.ci-table.builds-page
+      %thead
+        %tr
+          %th Status
+          %th Job
+          %th Pipeline
+          - if admin
+            %th Project
+            %th Runner
+          %th Stage
+          %th Name
+          %th
+          %th Coverage
+          %th
+
+      = render partial: "projects/ci/builds/build", collection: builds, as: :build, locals: { commit_sha: true, ref: true, pipeline_link: true, stage: true, allow_retry: true, admin: admin }
+
+  = paginate builds, theme: 'gitlab'
diff --git a/app/views/projects/jobs/_user.html.haml b/app/views/projects/jobs/_user.html.haml
new file mode 100644
index 00000000000..83f299da651
--- /dev/null
+++ b/app/views/projects/jobs/_user.html.haml
@@ -0,0 +1,7 @@
+by
+%a{ href: user_path(@build.user) }
+  %span.hidden-xs
+    = image_tag avatar_icon(@build.user, 24), class: "avatar s24"
+    %strong{ data: { toggle: 'tooltip', placement: 'top', title: @build.user.to_reference } }
+      = @build.user.name
+  %strong.visible-xs-inline= @build.user.to_reference
diff --git a/app/views/projects/jobs/index.html.haml b/app/views/projects/jobs/index.html.haml
new file mode 100644
index 00000000000..a33e3978ee1
--- /dev/null
+++ b/app/views/projects/jobs/index.html.haml
@@ -0,0 +1,23 @@
+- @no_container = true
+- page_title "Jobs"
+= render "projects/pipelines/head"
+
+%div{ class: container_class }
+  .top-area
+    - build_path_proc = ->(scope) { project_jobs_path(@project, scope: scope) }
+    = render "shared/builds/tabs", build_path_proc: build_path_proc, all_builds: @all_builds, scope: @scope
+
+    .nav-controls
+      - if can?(current_user, :update_build, @project)
+        - if @all_builds.running_or_pending.any?
+          = link_to 'Cancel running', cancel_all_namespace_project_jobs_path(@project.namespace, @project),
+            data: { confirm: 'Are you sure?' }, class: 'btn btn-danger', method: :post
+
+        - unless @repository.gitlab_ci_yml
+          = link_to 'Get started with Pipelines', help_page_path('ci/quick_start/README'), class: 'btn btn-info'
+
+        = link_to ci_lint_path, class: 'btn btn-default' do
+          %span CI lint
+
+  .content-list.builds-content-list
+    = render "table", builds: @builds, project: @project
diff --git a/app/views/projects/jobs/show.html.haml b/app/views/projects/jobs/show.html.haml
new file mode 100644
index 00000000000..0d10dfcef70
--- /dev/null
+++ b/app/views/projects/jobs/show.html.haml
@@ -0,0 +1,98 @@
+- @no_container = true
+- page_title "#{@build.name} (##{@build.id})", "Jobs"
+= render "projects/pipelines/head"
+
+%div{ class: container_class }
+  .build-page
+    = render "header"
+
+    - if @build.stuck?
+      - unless @build.any_runners_online?
+        .bs-callout.bs-callout-warning.js-build-stuck
+          %p
+            - if no_runners_for_project?(@build.project)
+              This job is stuck, because the project doesn't have any runners online assigned to it.
+            - elsif @build.tags.any?
+              This job is stuck, because you don't have any active runners online with any of these tags assigned to them:
+              - @build.tags.each do |tag|
+                %span.label.label-primary
+                  = tag
+            - else
+              This job is stuck, because you don't have any active runners that can run this job.
+
+            %br
+            Go to
+            = link_to namespace_project_runners_path(@build.project.namespace, @build.project) do
+              Runners page
+
+    - if @build.starts_environment?
+      .prepend-top-default.js-environment-container
+        .environment-information
+          - if @build.outdated_deployment?
+            = ci_icon_for_status('success_with_warnings')
+          - else
+            = ci_icon_for_status(@build.status)
+
+          - environment = environment_for_build(@build.project, @build)
+          - if @build.success? && @build.last_deployment.present?
+            - if @build.last_deployment.last?
+              This job is the most recent deployment to #{environment_link_for_build(@build.project, @build)}.
+            - else
+              This job is an out-of-date deployment to #{environment_link_for_build(@build.project, @build)}.
+              View the most recent deployment #{deployment_link(environment.last_deployment)}.
+          - elsif @build.complete? && !@build.success?
+            The deployment of this job to #{environment_link_for_build(@build.project, @build)} did not succeed.
+          - else
+            This job is creating a deployment to #{environment_link_for_build(@build.project, @build)}
+            - if environment.try(:last_deployment)
+              and will overwrite the #{deployment_link(environment.last_deployment, text: 'latest deployment')}
+
+    .prepend-top-default.js-build-erased
+      - if @build.erased?
+        .erased.alert.alert-warning
+          - if @build.erased_by_user?
+            Job has been erased by #{link_to(@build.erased_by_name, user_path(@build.erased_by))} #{time_ago_with_tooltip(@build.erased_at)}
+          - else
+            Job has been erased #{time_ago_with_tooltip(@build.erased_at)}
+
+    .prepend-top-default
+      .build-trace-container#build-trace
+        .top-bar.sticky
+          .js-truncated-info.truncated-info.hidden<
+            Showing last
+            %span.js-truncated-info-size.truncated-info-size><
+            KiB of log -
+            %a.js-raw-link.raw-link{ href: raw_namespace_project_job_path(@project.namespace, @project, @build) }>< Complete Raw
+          .controllers
+            - if @build.has_trace?
+              = link_to raw_namespace_project_job_path(@project.namespace, @project, @build),
+                      title: 'Open raw trace',
+                      data: { placement: 'top', container: 'body' },
+                      class: 'js-raw-link-controller has-tooltip' do
+                = icon('download')
+
+            - if can?(current_user, :update_build, @project) && @build.erasable?
+              = link_to erase_namespace_project_job_path(@project.namespace, @project, @build),
+                        method: :post,
+                        data: { confirm: 'Are you sure you want to erase this build?', placement: 'top', container: 'body' },
+                        title: 'Erase Build',
+                        class: 'has-tooltip js-erase-link' do
+                = icon('trash')
+
+            %button.js-scroll-up.btn-scroll.btn-transparent.btn-blank.has-tooltip{ type: 'button',
+                    disabled: true,
+                    title: 'Scroll Up',
+                    data: { placement: 'top', container: 'body'} }
+              = custom_icon('scroll_up')
+            %button.js-scroll-down.btn-scroll.btn-transparent.btn-blank.has-tooltip{ type: 'button',
+                    disabled: true,
+                    title: 'Scroll Down',
+                    data: { placement: 'top', container: 'body'} }
+              = custom_icon('scroll_down')
+        .bash.sticky.js-scroll-container
+          %code.js-build-output
+          .build-loader-animation.js-build-refresh
+
+  = render "sidebar"
+
+.js-build-options{ data: javascript_build_options }