Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-08-26

# Conflicts:
#	app/assets/javascripts/vue_merge_request_widget/components/mr_widget_pipeline.vue

[ci skip]

.gitlab/issue_templates/Test plan.md

+# Test Plan
+
+<!-- This issue outlines testing activities related to a particular issue or epic.
+
+[Here is an example test plan](https://gitlab.com/gitlab-org/gitlab-ce/issues/50353)
+
+This and other comments should be removed as you write the plan -->
+
+## Introduction
+
+<!-- Briefly outline what is being tested
+
+Mention the issue(s) this test plan is related to -->
+
+## Scope
+
+<!-- State any limits on aspects of the feature being tested
+Outline the types of data to be included
+Outline the types of tests to be performed (functional, security, performance,
+database, automated, etc) -->
+
+## ACC Matrix
+
+<!-- Use the matrix below as a template to identify the Attributes, Components, and
+Capabilities relevant to the scope of this test plan. Add or remove Attributes
+and Components as required and list Capabilities in the next section
+
+Attributes (columns) are adverbs or adjectives that describe (at a high level)
+the qualities testing is meant to ensure Components have.
+
+Components (rows) are nouns that define major parts of the product being tested.
+
+Capabilities link Attributes and Components. They are what your product needs to
+do to make sure a Component fulfills an Attribute
+
+For more information see the [Google Testing Blog article about the 10 minute
+test plan](https://testing.googleblog.com/2011/09/10-minute-test-plan.html) and
+[this wiki page from an open-source tool that implements the ACC
+model](https://code.google.com/archive/p/test-analytics/wikis/AccExplained.wiki). -->
+
+|            | Simple | Secure | Responsive | Obvious | Stable |
+|------------|:------:|:------:|:----------:|:-------:|:------:|
+| Admin      |        |        |            |         |        |
+| Groups     |        |        |            |         |        |
+| Project    |        |        |            |         |        |
+| Repository |        |        |            |         |        |
+| Issues     |        |        |            |         |        |
+| MRs        |        |        |            |         |        |
+| CI/CD      |        |        |            |         |        |
+| Ops        |        |        |            |         |        |
+| Registry   |        |        |            |         |        |
+| Wiki       |        |        |            |         |        |
+| Snippets   |        |        |            |         |        |
+| Settings   |        |        |            |         |        |
+| Tracking   |        |        |            |         |        |
+| API        |        |        |            |         |        |
+
+## Capabilities
+
+<!-- Use the ACC matrix above to help you identify Capabilities at each relevant
+intersection of Components and Attributes.
+
+Some features might be simple enough that they only involve one Component, while
+more complex features could involve multiple or even all.
+
+Example (from https://gitlab.com/gitlab-org/gitlab-ce/issues/50353):
+* Respository is
+  * Simple
+    * It's easy to select the desired file template
+    * It doesn't require unnecessary actions to save the change
+    * It's easy to undo the change after selecting a template
+  * Responsive
+    * The list of templates can be restricted to allow a user to find a specific template among many
+    * Once a template is selected the file content updates quickly and smoothly
+-->
+
+## Test Plan
+
+<!-- If the scope is small enough you may not need to write a list of tests to
+perform. It might be enough to use the Capabilities to guide your testing.
+
+If the feature is more complex, especially if it involves multiple Components,
+briefly outline a set of tests here. When identifying tests to perform be sure
+to consider risk. Note inherent/known levels of risk so that testing can focus
+on high risk areas first.
+
+New end-to-end and integration tests (Selenium and API) should be added to the
+[Test Coverage sheet](https://docs.google.com/spreadsheets/d/1RlLfXGboJmNVIPP9jgFV5sXIACGfdcFq1tKd7xnlb74/)
+
+Please note if automated tests already exist.
+
+When adding new automated tests, please keep [testing levels](https://docs.gitlab.com/ce/development/testing_guide/testing_levels.html)
+in mind.
+-->
+
+/label ~Quality
\ No newline at end of file

app/assets/javascripts/vue_merge_request_widget/components/mr_widget_pipeline.vue

@@ -4,7 +4,10 @@ import PipelineStage from '~/pipelines/components/stage.vue';
 import CiIcon from '~/vue_shared/components/ci_icon.vue';
 import Icon from '~/vue_shared/components/icon.vue';
 import TooltipOnTruncate from '~/vue_shared/components/tooltip_on_truncate.vue';
+<<<<<<< HEAD
 import LinkedPipelinesMiniList from 'ee/vue_shared/components/linked_pipelines_mini_list.vue';
+=======
+>>>>>>> upstream/master
 
 export default {
   name: 'MRWidgetPipeline',
@@ -13,7 +16,10 @@ export default {
     CiIcon,
     Icon,
     TooltipOnTruncate,
+<<<<<<< HEAD
     LinkedPipelinesMiniList,
+=======
+>>>>>>> upstream/master
   },
   props: {
     pipeline: {

app/assets/javascripts/vue_shared/components/stacked_progress_bar.vue

@@ -71,7 +71,11 @@ export default {
   },
   methods: {
     getPercent(count) {
-      return roundOffFloat((count / this.totalCount) * 100, 1);
+      const percent = roundOffFloat((count / this.totalCount) * 100, 1);
+      if (percent > 0 && percent < 1) {
+        return '< 1';
+      }
+      return percent;
     },
     barStyle(percent) {
       return `width: ${percent}%;`;

changelogs/unreleased/6028-show-generic-percent-stacked-progress-bar.yml

+---
+title: Show '< 1%' when percent value evaluated is less than 1 on Stacked Progress
+  Bar
+merge_request: 21306
+author:
+type: fixed

qa/qa.rb

@@ -83,6 +83,7 @@ module QA
     # Test scenario entrypoints.
     #
     module Test
+      autoload :Instance, 'qa/scenario/test/instance'
       module Instance
         autoload :All, 'qa/scenario/test/instance/all'
         autoload :Smoke, 'qa/scenario/test/instance/smoke'

qa/qa/scenario/test/instance.rb

+# frozen_string_literal: true
+
+module QA
+  module Scenario
+    module Test
+      # This class exists for back-compatibility so that gitlab-qa can continue
+      # to call Test::Instance instead of Test::Instance::All until at least
+      # the current latest GitLab version has the Test::Instance::All class.
+      # As of Aug, 22nd 2018. Only GitLab >= 11.3 has this class.
+      module Instance
+        include Bootable
+
+        def self.perform(*args)
+          self.tap do |scenario|
+            yield scenario if block_given?
+            break scenario.do_perform(*args)
+          end
+        end
+
+        def self.do_perform(address, *rspec_options)
+          Runtime::Scenario.define(:gitlab_address, address)
+
+          Specs::Runner.perform do |specs|
+            specs.tty = true
+            specs.options =
+              if rspec_options.any?
+                rspec_options
+              else
+                ::File.expand_path('../specs/features', __dir__)
+              end
+          end
+        end
+      end
+    end
+  end
+end

spec/javascripts/vue_shared/components/stacked_progress_bar_spec.js

@@ -44,7 +44,11 @@ describe('StackedProgressBarComponent', () => {
       });
 
       it('returns percentage with decimal place from provided count based on `totalCount`', () => {
-        expect(vm.getPercent(10)).toBe(0.2);
+        expect(vm.getPercent(67)).toBe(1.3);
+      });
+
+      it('returns percentage as `< 1` from provided count based on `totalCount` when evaluated value is less than 1', () => {
+        expect(vm.getPercent(10)).toBe('< 1');
       });
     });