Merge branch 'ce-to-ee-2018-04-10' into 'master'

CE upstream - 2018-04-10 04:58 UTC

See merge request gitlab-org/gitlab-ee!5305

GITLAB_SHELL_VERSION

-7.1.1
+7.1.2

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

 <script>
-  /* 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';
-  import LinkedPipelinesMiniList from 'ee/vue_shared/components/linked_pipelines_mini_list.vue';
+/* 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';
+import LinkedPipelinesMiniList from 'ee/vue_shared/components/linked_pipelines_mini_list.vue';
 
-  export default {
-    name: 'MRWidgetPipeline',
-    components: {
-      PipelineStage,
-      CiIcon,
-      Icon,
-      LinkedPipelinesMiniList,
+export default {
+  name: 'MRWidgetPipeline',
+  components: {
+    PipelineStage,
+    CiIcon,
+    Icon,
+    LinkedPipelinesMiniList,
+  },
+  props: {
+    pipeline: {
+      type: Object,
+      required: true,
     },
-    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,
     },
-    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;
-      },
-      /* We typically set defaults ([]) in the store or prop declarations, but because triggered
-      * and triggeredBy are appended to `pipeline`, we can't set defaults in the store, and we
-      * need to check their length here to prevent initializing linked-pipeline-mini-lists
-      * unneccessarily. */
-      triggered() {
-        return this.pipeline.triggered || [];
-      },
-      triggeredBy() {
-        const response = this.pipeline.triggered_by;
-        return response ? [response] : [];
-      },
+    ciStatus: {
+      type: String,
+      required: false,
     },
-  };
+  },
+  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;
+    },
+    /* We typically set defaults ([]) in the store or prop declarations, but because triggered
+    * and triggeredBy are appended to `pipeline`, we can't set defaults in the store, and we
+    * need to check their length here to prevent initializing linked-pipeline-mini-lists
+    * unneccessarily. */
+    triggered() {
+      return this.pipeline.triggered || [];
+    },
+    triggeredBy() {
+      const response = this.pipeline.triggered_by;
+      return response ? [response] : [];
+    },
+  },
+};
 </script>
 <template>
   <div

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.
 

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" },

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"