Merge branch 'master' into ce-to-ee-2018-03-14

README.md

@@ -42,9 +42,9 @@ http://doc.gitlab.com/ee/
 To upgrade from CE, just perform a normal upgrade, but use an EE package:
 https://about.gitlab.com/update/#ee
 
-If you need help with your GitLab installation and for any technical questions please contact us at subscribers@gitlab.com
+If you need help with your GitLab installation and for any technical questions please see the [support page](https://about.gitlab.com/support/)
 
-For all other questions, contact us at sales@gitlab.com
+For all other questions, please see our [contact page](https://about.gitlab.com/contact/)
 
 ## Open source software to collaborate on code
 

ee/app/assets/javascripts/vue_merge_request_widget/mr_widget_options.js

@@ -298,11 +298,11 @@ export default {
         :ci-status="mr.ciStatus"
         :has-ci="mr.hasCI"
         />
-      <mr-widget-deployment
-        v-if="shouldRenderDeployments"
-        :mr="mr"
-        :service="service"
-        />
+      <deployment
+        v-for="deployment in mr.deployments"
+        :key="deployment.id"
+        :deployment="deployment"
+      />
       <mr-widget-approvals
         v-if="shouldRenderApprovals"
         :mr="mr"

ee/lib/gitlab/geo/cron_manager.rb

@@ -2,7 +2,12 @@ module Gitlab
   module Geo
     class CronManager
       COMMON_JOBS = %w[geo_metrics_update_worker].freeze
-      PRIMARY_JOBS = %w[geo_repository_verification_primary_batch_worker].freeze
+
+      PRIMARY_JOBS = %w[
+        geo_prune_event_log_worker
+        geo_repository_verification_primary_batch_worker
+      ].freeze
+
       SECONDARY_JOBS = %w[
         geo_repository_sync_worker
         geo_file_download_dispatch_worker

ee/spec/lib/gitlab/geo/cron_manager_spec.rb

@@ -30,6 +30,7 @@ describe Gitlab::Geo::CronManager, :geo do
       geo_file_download_dispatch_worker
       geo_repository_verification_secondary_scheduler_worker
       geo_metrics_update_worker
+      geo_prune_event_log_worker
     ].freeze
 
     before(:all) do

spec/javascripts/vue_mr_widget/ee_mr_widget_options_spec.js

@@ -821,4 +821,40 @@ describe('ee merge request widget options', () => {
       });
     });
   });
+
+  describe('rendering deployments', () => {
+    const deploymentMockData = {
+      id: 15,
+      name: 'review/diplo',
+      url: '/root/acets-review-apps/environments/15',
+      stop_url: '/root/acets-review-apps/environments/15/stop',
+      metrics_url: '/root/acets-review-apps/environments/15/deployments/1/metrics',
+      metrics_monitoring_url: '/root/acets-review-apps/environments/15/metrics',
+      external_url: 'http://diplo.',
+      external_url_formatted: 'diplo.',
+      deployed_at: '2017-03-22T22:44:42.258Z',
+      deployed_at_formatted: 'Mar 22, 2017 10:44pm',
+    };
+
+    beforeEach((done) => {
+      vm = mountComponent(Component, {
+        mrData: {
+          ...mockData,
+        },
+      });
+
+      vm.mr.deployments.push({
+        ...deploymentMockData,
+      }, {
+        ...deploymentMockData,
+        id: deploymentMockData.id + 1,
+      });
+
+      vm.$nextTick(done);
+    });
+
+    it('renders multiple deployments', () => {
+      expect(vm.$el.querySelectorAll('.deploy-heading').length).toBe(2);
+    });
+  });
 });