Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-06-11

# Conflicts:
#	Gemfile.lock

[ci skip]

Gemfile.lock

@@ -336,7 +336,10 @@ GEM
       diff-lcs (~> 1.1)
       mime-types (>= 1.16)
       posix-spawn (~> 0.3)
+<<<<<<< HEAD
     gitlab-license (1.0.0)
+=======
+>>>>>>> upstream/master
     gitlab-markup (1.6.4)
     gitlab-styles (2.3.2)
       rubocop (~> 0.51)
@@ -1078,7 +1081,10 @@ DEPENDENCIES
   gitlab-flowdock-git-hook (~> 1.0.1)
   gitlab-gollum-lib (~> 4.2)
   gitlab-gollum-rugged_adapter (~> 0.4.4)
+<<<<<<< HEAD
   gitlab-license (~> 1.0)
+=======
+>>>>>>> upstream/master
   gitlab-markup (~> 1.6.4)
   gitlab-styles (~> 2.3)
   gitlab_omniauth-ldap (~> 2.0.4)

app/assets/javascripts/clusters/stores/clusters_store.js

@@ -95,7 +95,7 @@ export default class ClusterStore {
         this.state.applications.jupyter.hostname =
           serverAppEntry.hostname ||
           (this.state.applications.ingress.externalIp
-            ? `jupyter.${this.state.applications.ingress.externalIp}.xip.io`
+            ? `jupyter.${this.state.applications.ingress.externalIp}.nip.io`
             : '');
       }
     });

app/assets/javascripts/sidebar/components/time_tracking/comparison_pane.vue

 <script>
 import { parseSeconds, stringifyTime } from '../../../lib/utils/pretty_time';
+import tooltip from '../../../vue_shared/directives/tooltip';
 
 export default {
   name: 'TimeTrackingComparisonPane',
+  directives: {
+    tooltip,
+  },
   props: {
     timeSpent: {
       type: Number,
@@ -51,17 +55,12 @@ export default {
   <div class="time-tracking-comparison-pane">
     <div
       class="compare-meter"
-      data-toggle="tooltip"
-      data-placement="top"
-      role="timeRemainingDisplay"
-      :aria-valuenow="timeRemainingTooltip"
       :title="timeRemainingTooltip"
-      :data-original-title="timeRemainingTooltip"
+      v-tooltip
       :class="timeRemainingStatusClass"
     >
       <div
         class="meter-container"
-        role="timeSpentPercent"
         :aria-valuenow="timeRemainingPercent"
       >
         <div

qa/qa/page/project/job/show.rb

@@ -6,6 +6,7 @@ module QA::Page
 
       view 'app/views/shared/builds/_build_output.html.haml' do
         element :build_output, '.js-build-output'
+        element :loading_animation, '.js-build-refresh'
       end
 
       view 'app/assets/javascripts/vue_shared/components/ci_badge_link.vue' do
@@ -20,6 +21,10 @@ module QA::Page
         find('.ci-status').text == PASSED_STATUS
       end
 
+      def trace_loading?
+        has_css?('.js-build-refresh')
+      end
+
       # Reminder: You may wish to wait for a particular job status before checking output
       def output
         find('.js-build-output').text

qa/qa/specs/features/project/deploy_key_clone_spec.rb

@@ -92,7 +92,9 @@ module QA
         Page::Project::Pipeline::Show.act { go_to_first_job }
 
         Page::Project::Job::Show.perform do |job|
-          job.wait(reload: false) { job.completed? }
+          job.wait(reload: false) do
+            job.completed? && !job.trace_loading?
+          end
 
           expect(job.passed?).to be_truthy, "Job status did not become \"passed\"."
           expect(job.output).to include(sha1sum)

spec/javascripts/clusters/stores/clusters_store_spec.js

@@ -110,7 +110,7 @@ describe('Clusters Store', () => {
 
       expect(
         store.state.applications.jupyter.hostname,
-      ).toEqual(`jupyter.${store.state.applications.ingress.externalIp}.xip.io`);
+      ).toEqual(`jupyter.${store.state.applications.ingress.externalIp}.nip.io`);
     });
   });
 });