Automatic merge of gitlab-org/gitlab-ce master

app/assets/javascripts/reports/components/issues_list.vue

@@ -52,6 +52,11 @@ export default {
       required: false,
       default: '',
     },
+    showReportSectionStatus: {
+      type: Boolean,
+      required: false,
+      default: true,
+    },
   },
   computed: {
     issuesWithState() {
@@ -81,6 +86,7 @@ export default {
       :status="wrapped.status"
       :component="component"
       :is-new="wrapped.isNew"
+      :show-report-section-status="showReportSectionStatus"
     />
   </smart-virtual-list>
 </template>

app/assets/javascripts/reports/components/report_item.vue

@@ -34,12 +34,22 @@ export default {
       required: false,
       default: false,
     },
+    showReportSectionStatusIcon: {
+      type: Boolean,
+      required: false,
+      default: true,
+    },
   },
 };
 </script>
 <template>
   <li :class="{ 'is-dismissed': issue.isDismissed }" class="report-block-list-issue">
-    <issue-status-icon :status="status" :status-icon-size="statusIconSize" class="append-right-5" />
+    <issue-status-icon
+      v-if="showReportSectionStatusIcon"
+      :status="status"
+      :status-icon-size="statusIconSize"
+      class="append-right-5"
+    />
 
     <component :is="component" v-if="component" :issue="issue" :status="status" :is-new="isNew" />
   </li>

app/assets/javascripts/reports/components/report_section.vue

@@ -73,6 +73,11 @@ export default {
       default: () => ({}),
       required: false,
     },
+    showReportSectionStatusIcon: {
+      type: Boolean,
+      required: false,
+      default: true,
+    },
   },
 
   data() {
@@ -166,6 +171,7 @@ export default {
           :resolved-issues="resolvedIssues"
           :neutral-issues="neutralIssues"
           :component="component"
+          :show-report-section-status-icon="showReportSectionStatusIcon"
         />
       </slot>
     </div>

doc/gitlab-basics/README.md

@@ -27,9 +27,11 @@ The following are guides to basic GitLab functionality:
 
 ## Git basics
 
-If you're unfamiliar with the command line, these resources will help:
+If you're familiar with Git on the command line, you can interact with your GitLab projects just as you would with any other Git repository.
+
+These resources will help get further acclimated to working on the command line.
 
-- [Command line basics](command-line-commands.md), for those unfamiliar with the command line interface.
 - [Start using Git on the command line](start-using-git.md), for some simple Git commands.
+- [Command line basics](command-line-commands.md), to create and edit files using the command line.
 
 More Git resources are available at GitLab's [Git documentation](../topics/git/index.md).

doc/gitlab-basics/command-line-commands.md

@@ -13,10 +13,12 @@ button (you'll have to paste it on your shell in the next step).
 
 ![Copy the HTTPS or SSH](img/project_clone_url.png)
 
-## On the command line
+## Working with project files on the command line
 
 This section has examples of some basic shell commands that you might find useful. For more information, search the web for _bash commands_.
 
+Alternatively, you can edit files using your choice of editor (IDE) or the GitLab user interface.
+
 ### Clone your project
 
 Go to your computer's shell and type the following command with your SSH or HTTPS URL:

spec/frontend/reports/components/report_item_spec.js

+import { shallowMount } from '@vue/test-utils';
+import { STATUS_SUCCESS } from '~/reports/constants';
+import ReportItem from '~/reports/components/report_item.vue';
+import { componentNames } from '~/reports/components/issue_body';
+
+describe('ReportItem', () => {
+  describe('showReportSectionStatusIcon', () => {
+    it('does not render CI Status Icon when showReportSectionStatusIcon is false', () => {
+      const wrapper = shallowMount(ReportItem, {
+        propsData: {
+          issue: { foo: 'bar' },
+          component: componentNames.TestIssueBody,
+          status: STATUS_SUCCESS,
+          showReportSectionStatusIcon: false,
+        },
+      });
+
+      expect(wrapper.find('issuestatusicon-stub').exists()).toBe(false);
+    });
+
+    it('shows status icon when unspecified', () => {
+      const wrapper = shallowMount(ReportItem, {
+        propsData: {
+          issue: { foo: 'bar' },
+          component: componentNames.TestIssueBody,
+          status: STATUS_SUCCESS,
+        },
+      });
+
+      expect(wrapper.find('issuestatusicon-stub').exists()).toBe(true);
+    });
+  });
+});