Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-04-10

# Conflicts:
#	CHANGELOG.md
#	app/assets/javascripts/vue_merge_request_widget/components/mr_widget_pipeline.vue
#	app/models/issue.rb
#	app/models/project.rb

[ci skip]

.gitlab-ci.yml

-image: "dev.gitlab.org:5005/gitlab/gitlab-build-images:ruby-2.3.6-golang-1.9-git-2.16-chrome-63.0-node-8.x-yarn-1.2-postgresql-9.6"
+image: "dev.gitlab.org:5005/gitlab/gitlab-build-images:ruby-2.3.7-golang-1.9-git-2.17-chrome-63.0-node-8.x-yarn-1.2-postgresql-9.6"
 
 .dedicated-runner: &dedicated-runner
   retry: 1
@@ -6,7 +6,7 @@ image: "dev.gitlab.org:5005/gitlab/gitlab-build-images:ruby-2.3.6-golang-1.9-git
     - gitlab-org
 
 .default-cache: &default-cache
-  key: "ruby-2.3.6-with-yarn"
+  key: "ruby-2.3.7-with-yarn"
   paths:
     - vendor/ruby
     - .yarn-cache/
@@ -692,7 +692,7 @@ static-analysis:
   script:
     - scripts/static-analysis
   cache:
-    key: "ruby-2.3.6-with-yarn-and-rubocop"
+    key: "ruby-2.3.7-with-yarn-and-rubocop"
     paths:
       - vendor/ruby
       - .yarn-cache/

.ruby-version

-2.3.6
+2.3.7

CHANGELOG.md

@@ -4,7 +4,11 @@ entry.
 
 ## 10.6.4 (2018-04-09)
 
+<<<<<<< HEAD
 ### Fixed (9 changes, 1 of them is from the community)
+=======
+### Fixed (8 changes, 1 of them is from the community)
+>>>>>>> upstream/master
 
 - Correct copy text for the promote milestone and label modals. !17726
 - Avoid validation errors when running the Pages domain verification service. !17992
@@ -12,7 +16,10 @@ entry.
 - Fix exceptions raised when migrating pipeline stages in the background. !18076
 - Work around Prometheus Helm chart name changes to fix integration. !18206 (joshlambert)
 - Don't show Jump to Discussion button on Issues.
+<<<<<<< HEAD
 - Fix data race between ObjectStorage background_upload and Pages publishing.
+=======
+>>>>>>> upstream/master
 - Fix listing commit branch/tags that contain special characters.
 - Fix 404 in group boards when moving issue between lists.
 

GITLAB_SHELL_VERSION

-7.1.1
+7.1.2

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

 <script>
+<<<<<<< HEAD
   /* eslint-disable vue/require-default-prop */
   import PipelineStage from '~/pipelines/components/stage.vue';
   import CiIcon from '~/vue_shared/components/ci_icon.vue';
@@ -12,23 +13,32 @@
       CiIcon,
       Icon,
       LinkedPipelinesMiniList,
+=======
+/* eslint-disable vue/require-default-prop */
+import PipelineStage from '~/pipelines/components/stage.vue';
+import CiIcon from '~/vue_shared/components/ci_icon.vue';
+import Icon from '~/vue_shared/components/icon.vue';
+
+export default {
+  name: 'MRWidgetPipeline',
+  components: {
+    PipelineStage,
+    CiIcon,
+    Icon,
+  },
+  props: {
+    pipeline: {
+      type: Object,
+      required: true,
+>>>>>>> upstream/master
     },
-    props: {
-      pipeline: {
-        type: Object,
-        required: true,
-      },
-      // This prop needs to be camelCase, html attributes are case insensive
-      // https://vuejs.org/v2/guide/components.html#camelCase-vs-kebab-case
-      hasCi: {
-        type: Boolean,
-        required: false,
-      },
-      ciStatus: {
-        type: String,
-        required: false,
-      },
+    // This prop needs to be camelCase, html attributes are case insensive
+    // https://vuejs.org/v2/guide/components.html#camelCase-vs-kebab-case
+    hasCi: {
+      type: Boolean,
+      required: false,
     },
+<<<<<<< HEAD
     computed: {
       hasPipeline() {
         return this.pipeline && Object.keys(this.pipeline).length > 0;
@@ -62,8 +72,35 @@
         const response = this.pipeline.triggered_by;
         return response ? [response] : [];
       },
+=======
+    ciStatus: {
+      type: String,
+      required: false,
+>>>>>>> upstream/master
+    },
+  },
+  computed: {
+    hasPipeline() {
+      return this.pipeline && Object.keys(this.pipeline).length > 0;
+    },
+    hasCIError() {
+      return this.hasCi && !this.ciStatus;
+    },
+    status() {
+      return this.pipeline.details && this.pipeline.details.status
+        ? this.pipeline.details.status
+        : {};
+    },
+    hasStages() {
+      return (
+        this.pipeline.details && this.pipeline.details.stages && this.pipeline.details.stages.length
+      );
     },
-  };
+    hasCommitInfo() {
+      return this.pipeline.commit && Object.keys(this.pipeline.commit).length > 0;
+    },
+  },
+};
 </script>
 <template>
   <div
@@ -100,6 +137,16 @@
 
           <template v-if="hasCommitInfo">
             for
+<<<<<<< HEAD
+=======
+
+            <a
+              :href="pipeline.commit.commit_path"
+              class="commit-sha js-commit-link"
+            >
+            {{ pipeline.commit.short_id }}</a>.
+          </template>
+>>>>>>> upstream/master
 
             <a
               :href="pipeline.commit.commit_path"

app/models/issue.rb

@@ -39,9 +39,12 @@ class Issue < ActiveRecord::Base
 
   has_many :issue_assignees
   has_many :assignees, -> { auto_include(false) }, class_name: "User", through: :issue_assignees
+<<<<<<< HEAD
 
   has_one :epic_issue
   has_one :epic, through: :epic_issue
+=======
+>>>>>>> upstream/master
 
   validates :project, presence: true
 

app/models/project.rb

@@ -205,8 +205,11 @@ class Project < ActiveRecord::Base
 
   has_one :cluster_project, class_name: 'Clusters::Project'
   has_many :clusters, -> { auto_include(false) }, through: :cluster_project, class_name: 'Clusters::Cluster'
+<<<<<<< HEAD
 
   has_many :prometheus_metrics
+=======
+>>>>>>> upstream/master
 
   # Container repositories need to remove data from the container registry,
   # which is not managed by the DB. Hence we're still using dependent: :destroy

app/workers/authorized_projects_worker.rb

@@ -2,6 +2,14 @@ class AuthorizedProjectsWorker
   include ApplicationWorker
   prepend WaitableWorker
 
+  # This is a workaround for a Ruby 2.3.7 bug. rspec-mocks cannot restore the
+  # visibility of prepended modules. See https://github.com/rspec/rspec-mocks/issues/1231
+  # for more details.
+  if Rails.env.test?
+    def self.bulk_perform_and_wait(args_list, timeout: 10)
+    end
+  end
+
   def perform(user_id)
     user = User.find_by(id: user_id)
 

changelogs/unreleased/feature-add_target_to_tags.yml

+---
+title: Expose the target commit ID through the tag API
+merge_request:
+author:
+type: added

doc/api/tags.md

@@ -42,6 +42,7 @@ Parameters:
       "description": "Amazing release. Wow"
     },
     "name": "v1.0.0",
+    "target": "2695effb5807a22ff3d138d593fd856244e155e7",
     "message": null
   }
 ]
@@ -73,6 +74,7 @@ Example Response:
 {
   "name": "v5.0.0",
   "message": null,
+  "target": "60a8ff033665e1207714d6670fcd7b65304ec02f",
   "commit": {
     "id": "60a8ff033665e1207714d6670fcd7b65304ec02f",
     "short_id": "60a8ff03",
@@ -132,12 +134,16 @@ Parameters:
     "description": "Amazing release. Wow"
   },
   "name": "v1.0.0",
+  "target: "2695effb5807a22ff3d138d593fd856244e155e7",
   "message": null
 }
 ```
 The message will be `null` when creating a lightweight tag otherwise
 it will contain the annotation.
 
+The target will contain the tag objects ID when creating annotated tags,
+otherwise it will contain the commit ID when creating lightweight tags.
+
 In case of an error,
 status code `405` with an explaining error message is returned.
 

doc/install/installation.md

@@ -133,9 +133,10 @@ Remove the old Ruby 1.8 if present:
 Download Ruby and compile it:
 
     mkdir /tmp/ruby && cd /tmp/ruby
-    curl --remote-name --progress https://cache.ruby-lang.org/pub/ruby/2.3/ruby-2.3.6.tar.gz
-    echo '4e6a0f828819e15d274ae58485585fc8b7caace0  ruby-2.3.6.tar.gz' | shasum -c - && tar xzf ruby-2.3.6.tar.gz
-    cd ruby-2.3.6
+    curl --remote-name --progress https://cache.ruby-lang.org/pub/ruby/2.3/ruby-2.3.7.tar.gz
+    echo '540996fec64984ab6099e34d2f5820b14904f15a  ruby-2.3.7.tar.gz' | shasum -c - && tar xzf ruby-2.3.7.tar.gz
+    cd ruby-2.3.7
+
     ./configure --disable-install-rdoc
     make
     sudo make install

lib/api/entities.rb

@@ -957,7 +957,7 @@ module API
     end
 
     class Tag < Grape::Entity
-      expose :name, :message
+      expose :name, :message, :target
 
       expose :commit, using: Entities::Commit do |repo_tag, options|
         options[:project].repository.commit(repo_tag.dereferenced_target)

package.json

@@ -16,7 +16,7 @@
     "webpack-prod": "NODE_ENV=production webpack --config config/webpack.config.js"
   },
   "dependencies": {
-    "@gitlab-org/gitlab-svgs": "^1.16.0",
+    "@gitlab-org/gitlab-svgs": "^1.17.0",
     "autosize": "^4.0.0",
     "axios": "^0.17.1",
     "babel-core": "^6.26.0",

spec/fixtures/api/schemas/public_api/v4/tag.json

@@ -10,6 +10,7 @@
     "name": { "type": "string" },
     "message": { "type": ["string", "null"] },
     "commit": { "$ref": "commit/basic.json" },
+    "target": { "type": "string" },
     "release": {
       "oneOf": [
         { "type": "null" },

spec/workers/concerns/waitable_worker_spec.rb

@@ -14,6 +14,12 @@ describe WaitableWorker do
       include ApplicationWorker
       prepend WaitableWorker
 
+      # This is a workaround for a Ruby 2.3.7 bug. rspec-mocks cannot restore
+      # the visibility of prepended modules. See
+      # https://github.com/rspec/rspec-mocks/issues/1231 for more details.
+      def self.bulk_perform_inline(args_list)
+      end
+
       def perform(i = 0)
         self.class.counter += i
       end

yarn.lock

@@ -54,9 +54,9 @@
     lodash "^4.2.0"
     to-fast-properties "^2.0.0"
 
-"@gitlab-org/gitlab-svgs@^1.16.0":
-  version "1.16.0"
-  resolved "https://registry.yarnpkg.com/@gitlab-org/gitlab-svgs/-/gitlab-svgs-1.16.0.tgz#6c88a1bd9f5b3d3e5bf6a6d89d61724022185667"
+"@gitlab-org/gitlab-svgs@^1.17.0":
+  version "1.17.0"
+  resolved "https://registry.yarnpkg.com/@gitlab-org/gitlab-svgs/-/gitlab-svgs-1.17.0.tgz#d0c74d9e44c127ccfad16941f352088b86f86c89"
 
 "@types/jquery@^2.0.40":
   version "2.0.48"