Merge branch 'ce-to-ee-2018-11-15' into 'master'

CE upstream - 2018-11-15 06:21 UTC

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

.gitlab-ci.yml

@@ -962,7 +962,8 @@ code_quality:
         --volume /var/run/docker.sock:/var/run/docker.sock
         "registry.gitlab.com/gitlab-org/security-products/codequality:$SP_VERSION" /code
   artifacts:
-    paths: [gl-code-quality-report.json]
+    reports:
+      codequality: gl-code-quality-report.json
     expire_in: 1 week
 
 sast:
@@ -986,7 +987,8 @@ sast:
         --volume /var/run/docker.sock:/var/run/docker.sock
         "registry.gitlab.com/gitlab-org/security-products/sast:$SP_VERSION" /app/bin/run /code
   artifacts:
-    paths: [gl-sast-report.json]
+    reports:
+      sast: gl-sast-report.json
 
 dependency_scanning:
   <<: *dedicated-no-docs-no-db-pull-cache-job
@@ -1008,7 +1010,8 @@ dependency_scanning:
         --volume /var/run/docker.sock:/var/run/docker.sock
         "registry.gitlab.com/gitlab-org/security-products/dependency-scanning:$SP_VERSION" /code
   artifacts:
-    paths: [gl-dependency-scanning-report.json]
+    reports:
+      dependency_scanning: gl-dependency-scanning-report.json
 
 qa:internal:
   <<: *dedicated-no-docs-no-db-pull-cache-job

app/assets/javascripts/diffs/components/app.vue

@@ -94,7 +94,7 @@ export default {
       return __('Show latest version');
     },
     canCurrentUserFork() {
-      return this.currentUser.canFork === true && this.currentUser.canCreateMergeRequest;
+      return this.currentUser.can_fork === true && this.currentUser.can_create_merge_request;
     },
     showCompareVersions() {
       return this.mergeRequestDiffs && this.mergeRequestDiff;

app/assets/javascripts/diffs/components/commit_item.vue

@@ -40,15 +40,17 @@ export default {
   },
   computed: {
     authorName() {
-      return (this.commit.author && this.commit.author.name) || this.commit.authorName;
+      return (this.commit.author && this.commit.author.name) || this.commit.author_name;
     },
     authorUrl() {
       return (
-        (this.commit.author && this.commit.author.webUrl) || `mailto:${this.commit.authorEmail}`
+        (this.commit.author && this.commit.author.web_url) || `mailto:${this.commit.author_email}`
       );
     },
     authorAvatar() {
-      return (this.commit.author && this.commit.author.avatarUrl) || this.commit.authorGravatarUrl;
+      return (
+        (this.commit.author && this.commit.author.avatar_url) || this.commit.author_gravatar_url
+      );
     },
   },
 };
@@ -66,18 +68,18 @@ export default {
     <div class="commit-detail flex-list">
       <div class="commit-content qa-commit-content">
         <a
-          :href="commit.commitUrl"
+          :href="commit.commit_url"
           class="commit-row-message item-title"
-          v-html="commit.titleHtml"
+          v-html="commit.title_html"
         ></a>
 
         <span class="commit-row-message d-block d-sm-none">
           &middot;
-          {{ commit.shortId }}
+          {{ commit.short_id }}
         </span>
 
         <button
-          v-if="commit.descriptionHtml"
+          v-if="commit.description_html"
           class="text-expander js-toggle-button"
           type="button"
           :aria-label="__('Toggle commit description')"
@@ -95,29 +97,29 @@ export default {
           ></a>
           {{ s__('CommitWidget|authored') }}
           <time-ago-tooltip
-            :time="commit.authoredDate"
+            :time="commit.authored_date"
           />
         </div>
 
         <pre
-          v-if="commit.descriptionHtml"
+          v-if="commit.description_html"
           class="commit-row-description js-toggle-content append-bottom-8"
-          v-html="commit.descriptionHtml"
+          v-html="commit.description_html"
         ></pre>
       </div>
       <div class="commit-actions flex-row d-none d-sm-flex">
         <div
-          v-if="commit.signatureHtml"
-          v-html="commit.signatureHtml"
+          v-if="commit.signature_html"
+          v-html="commit.signature_html"
         ></div>
         <commit-pipeline-status
-          v-if="commit.pipelineStatusPath"
-          :endpoint="commit.pipelineStatusPath"
+          v-if="commit.pipeline_status_path"
+          :endpoint="commit.pipeline_status_path"
         />
         <div class="commit-sha-group">
           <div
             class="label label-monospace"
-            v-text="commit.shortId"
+            v-text="commit.short_id"
           ></div>
           <clipboard-button
             :text="commit.id"

app/assets/javascripts/diffs/components/compare_versions_dropdown.vue

@@ -56,16 +56,16 @@ export default {
   methods: {
     commitsText(version) {
       return n__(
-        `${version.commitsCount} commit,`,
-        `${version.commitsCount} commits,`,
-        version.commitsCount,
+        `${version.commits_count} commit,`,
+        `${version.commits_count} commits,`,
+        version.commits_count,
       );
     },
     href(version) {
       if (this.showCommitCount) {
-        return version.versionPath;
+        return version.version_path;
       }
-      return version.comparePath;
+      return version.compare_path;
     },
     versionName(version) {
       if (this.isLatest(version)) {
@@ -74,7 +74,7 @@ export default {
       if (this.targetBranch && (this.isBase(version) || !version)) {
         return this.targetBranch.branchName;
       }
-      return `version ${version.versionIndex}`;
+      return `version ${version.version_index}`;
     },
     isActive(version) {
       if (!version) {
@@ -84,11 +84,11 @@ export default {
       if (this.targetBranch) {
         return (
           (this.isBase(version) && !this.startVersion) ||
-          (this.startVersion && this.startVersion.versionIndex === version.versionIndex)
+          (this.startVersion && this.startVersion.version_index === version.version_index)
         );
       }
 
-      return version.versionIndex === this.mergeRequestVersion.versionIndex;
+      return version.version_index === this.mergeRequestVersion.version_index;
     },
     isBase(version) {
       if (!version || !this.targetBranch) {
@@ -98,7 +98,7 @@ export default {
     },
     isLatest(version) {
       return (
-        this.mergeRequestVersion && version.versionIndex === this.targetVersions[0].versionIndex
+        this.mergeRequestVersion && version.version_index === this.targetVersions[0].version_index
       );
     },
   },
@@ -142,7 +142,7 @@ export default {
               </div>
               <div>
                 <small class="commit-sha">
-                  {{ version.truncatedCommitSha }}
+                  {{ version.truncated_commit_sha }}
                 </small>
               </div>
               <div>
@@ -151,8 +151,8 @@ export default {
                     {{ commitsText(version) }}
                   </template>
                   <time-ago
-                    v-if="version.createdAt"
-                    :time="version.createdAt"
+                    v-if="version.created_at"
+                    :time="version.created_at"
                     class="js-timeago js-timeago-render"
                   />
                 </small>

app/assets/javascripts/diffs/components/diff_content.vue

@@ -39,7 +39,7 @@ export default {
       return this.diffFile.viewer.name === 'text';
     },
     diffFileCommentForm() {
-      return this.getCommentFormForDiffFile(this.diffFile.fileHash);
+      return this.getCommentFormForDiffFile(this.diffFile.file_hash);
     },
     showNotesContainer() {
       return this.diffFile.discussions.length || this.diffFileCommentForm;
@@ -73,28 +73,28 @@ export default {
         <inline-diff-view
           v-if="isInlineView"
           :diff-file="diffFile"
-          :diff-lines="diffFile.highlightedDiffLines || []"
+          :diff-lines="diffFile.highlighted_diff_lines || []"
         />
         <parallel-diff-view
           v-if="isParallelView"
           :diff-file="diffFile"
-          :diff-lines="diffFile.parallelDiffLines || []"
+          :diff-lines="diffFile.parallel_diff_lines || []"
         />
       </template>
       <diff-viewer
         v-else
         :diff-mode="diffMode"
-        :new-path="diffFile.newPath"
-        :new-sha="diffFile.diffRefs.headSha"
-        :old-path="diffFile.oldPath"
-        :old-sha="diffFile.diffRefs.baseSha"
-        :file-hash="diffFile.fileHash"
+        :new-path="diffFile.new_path"
+        :new-sha="diffFile.diff_refs.head_sha"
+        :old-path="diffFile.old_path"
+        :old-sha="diffFile.diff_refs.base_sha"
+        :file-hash="diffFile.file_hash"
         :project-path="projectPath"
       >
         <image-diff-overlay
           slot="image-overlay"
           :discussions="diffFile.discussions"
-          :file-hash="diffFile.fileHash"
+          :file-hash="diffFile.file_hash"
           :can-comment="getNoteableData.current_user.can_create_note"
         />
         <div
@@ -115,7 +115,7 @@ export default {
             :save-button-title="__('Comment')"
             class="diff-comment-form new-note discussion-form discussion-form-container"
             @handleFormUpdate="handleSaveNote"
-            @cancelForm="closeDiffFileCommentForm(diffFile.fileHash)"
+            @cancelForm="closeDiffFileCommentForm(diffFile.file_hash)"
           />          
         </div>
       </diff-viewer>

app/assets/javascripts/diffs/components/diff_file.vue

@@ -40,7 +40,7 @@ export default {
       return sprintf(
         __('You can %{linkStart}view the blob%{linkEnd} instead.'),
         {
-          linkStart: `<a href="${_.escape(this.file.viewPath)}">`,
+          linkStart: `<a href="${_.escape(this.file.view_path)}">`,
           linkEnd: '</a>',
         },
         false,
@@ -49,9 +49,9 @@ export default {
     showExpandMessage() {
       return (
         this.isCollapsed ||
-        (!this.file.highlightedDiffLines &&
+        (!this.file.highlighted_diff_lines &&
           !this.isLoadingCollapsedDiff &&
-          !this.file.tooLarge &&
+          !this.file.too_large &&
           this.file.text)
       );
     },
@@ -59,9 +59,11 @@ export default {
       return this.isLoadingCollapsedDiff || (!this.file.renderIt && !this.isCollapsed);
     },
     hasDiffLines() {
-      const { highlightedDiffLines, parallelDiffLines } = this.file;
-
-      return highlightedDiffLines && parallelDiffLines && parallelDiffLines.length > 0;
+      return (
+        this.file.highlighted_diff_lines &&
+        this.file.parallel_diff_lines &&
+        this.file.parallel_diff_lines.length > 0
+      );
     },
   },
   watch: {
@@ -115,9 +117,9 @@ export default {
 
 <template>
   <div
-    :id="file.fileHash"
+    :id="file.file_hash"
     :class="{
-      'is-active': currentDiffFileId === file.fileHash
+      'is-active': currentDiffFileId === file.file_hash
     }"
     class="diff-file file-holder"
   >
@@ -141,7 +143,7 @@ export default {
         make your changes there, and submit a merge request.
       </span>
       <a
-        :href="file.forkPath"
+        :href="file.fork_path"
         class="js-fork-suggestion-button btn btn-grouped btn-inverted btn-success"
       >
         Fork
@@ -157,7 +159,7 @@ export default {
 
     <diff-content
       v-if="!isCollapsed && file.renderIt"
-      :class="{ hidden: isCollapsed || file.tooLarge }"
+      :class="{ hidden: isCollapsed || file.too_large }"
       :diff-file="file"
     />
     <gl-loading-icon
@@ -178,7 +180,7 @@ export default {
       </a>
     </div>
     <div
-      v-if="file.tooLarge"
+      v-if="file.too_large"
       class="nothing-here-block diff-collapsed js-too-large-diff"
     >
       {{ __('This source diff could not be displayed because it is too large.') }}

app/assets/javascripts/diffs/components/diff_file_header.vue

@@ -68,32 +68,32 @@ export default {
     },
     titleLink() {
       if (this.diffFile.submodule) {
-        return this.diffFile.submoduleTreeUrl || this.diffFile.submoduleLink;
+        return this.diffFile.submodule_tree_url || this.diffFile.submodule_link;
       }
       return this.discussionPath;
     },
     filePath() {
       if (this.diffFile.submodule) {
-        return `${this.diffFile.filePath} @ ${truncateSha(this.diffFile.blob.id)}`;
+        return `${this.diffFile.file_path} @ ${truncateSha(this.diffFile.blob.id)}`;
       }
 
-      if (this.diffFile.deletedFile) {
-        return sprintf(__('%{filePath} deleted'), { filePath: this.diffFile.filePath }, false);
+      if (this.diffFile.deleted_file) {
+        return sprintf(__('%{filePath} deleted'), { filePath: this.diffFile.file_path }, false);
       }
 
-      return this.diffFile.filePath;
+      return this.diffFile.file_path;
     },
     titleTag() {
-      return this.diffFile.fileHash ? 'a' : 'span';
+      return this.diffFile.file_hash ? 'a' : 'span';
     },
     isUsingLfs() {
-      return this.diffFile.storedExternally && this.diffFile.externalStorage === 'lfs';
+      return this.diffFile.stored_externally && this.diffFile.external_storage === 'lfs';
     },
     collapseIcon() {
       return this.expanded ? 'chevron-down' : 'chevron-right';
     },
     viewFileButtonText() {
-      const truncatedContentSha = _.escape(truncateSha(this.diffFile.contentSha));
+      const truncatedContentSha = _.escape(truncateSha(this.diffFile.content_sha));
       return sprintf(
         s__('MergeRequests|View file @ %{commitId}'),
         {
@@ -103,7 +103,7 @@ export default {
       );
     },
     viewReplacedFileButtonText() {
-      const truncatedBaseSha = _.escape(truncateSha(this.diffFile.diffRefs.baseSha));
+      const truncatedBaseSha = _.escape(truncateSha(this.diffFile.diff_refs.base_sha));
       return sprintf(
         s__('MergeRequests|View replaced file @ %{commitId}'),
         {
@@ -113,7 +113,7 @@ export default {
       );
     },
     gfmCopyText() {
-      return `\`${this.diffFile.filePath}\``;
+      return `\`${this.diffFile.file_path}\``;
     },
   },
   methods: {
@@ -164,21 +164,21 @@ export default {
           aria-hidden="true"
           css-classes="js-file-icon append-right-5"
         />
-        <span v-if="diffFile.renamedFile">
+        <span v-if="diffFile.renamed_file">
           <strong
             v-tooltip
-            :title="diffFile.oldPath"
+            :title="diffFile.old_path"
             class="file-title-name"
             data-container="body"
-            v-html="diffFile.oldPathHtml"
+            v-html="diffFile.old_path_html"
           ></strong>
           →
           <strong
             v-tooltip
-            :title="diffFile.newPath"
+            :title="diffFile.new_path"
             class="file-title-name"
             data-container="body"
-            v-html="diffFile.newPathHtml"
+            v-html="diffFile.new_path_html"
           ></strong>
         </span>
 
@@ -195,16 +195,16 @@ export default {
 
       <clipboard-button
         :title="__('Copy file path to clipboard')"
-        :text="diffFile.filePath"
+        :text="diffFile.file_path"
         :gfm="gfmCopyText"
         css-class="btn-default btn-transparent btn-clipboard"
       />
 
       <small
-        v-if="diffFile.modeChanged"
+        v-if="diffFile.mode_changed"
         ref="fileMode"
       >
-        {{ diffFile.aMode }} → {{ diffFile.bMode }}
+        {{ diffFile.a_mode }} → {{ diffFile.b_mode }}
       </small>
 
       <span
@@ -220,7 +220,7 @@ export default {
       class="file-actions d-none d-sm-block"
     >
       <template
-        v-if="diffFile.blob && diffFile.blob.readableText"
+        v-if="diffFile.blob && diffFile.blob.readable_text"
       >
         <button
           :disabled="!diffHasDiscussions(diffFile)"
@@ -234,33 +234,33 @@ export default {
         </button>
 
         <edit-button
-          v-if="!diffFile.deletedFile"
+          v-if="!diffFile.deleted_file"
           :can-current-user-fork="canCurrentUserFork"
-          :edit-path="diffFile.editPath"
-          :can-modify-blob="diffFile.canModifyBlob"
+          :edit-path="diffFile.edit_path"
+          :can-modify-blob="diffFile.can_modify_blob"
           @showForkMessage="showForkMessage"
         />
       </template>
 
       <a
-        v-if="diffFile.replacedViewPath"
-        :href="diffFile.replacedViewPath"
+        v-if="diffFile.replaced_view_path"
+        :href="diffFile.replaced_view_path"
         class="btn view-file js-view-file"
         v-html="viewReplacedFileButtonText"
       >
       </a>
       <a
-        :href="diffFile.viewPath"
+        :href="diffFile.view_path"
         class="btn view-file js-view-file"
         v-html="viewFileButtonText"
       >
       </a>
 
       <a
-        v-if="diffFile.externalUrl"
+        v-if="diffFile.external_url"
         v-tooltip
-        :href="diffFile.externalUrl"
-        :title="`View on ${diffFile.formattedExternalUrl}`"
+        :href="diffFile.external_url"
+        :title="`View on ${diffFile.formatted_external_url}`"
         target="_blank"
         rel="noopener noreferrer"
         class="btn btn-file-option"

app/assets/javascripts/diffs/components/diff_line_gutter_content.vue

@@ -73,7 +73,7 @@ export default {
     }),
     ...mapGetters(['isLoggedIn']),
     lineHref() {
-      return `#${this.line.lineCode || ''}`;
+      return `#${this.line.line_code || ''}`;
     },
     shouldShowCommentButton() {
       return (
@@ -99,7 +99,7 @@ export default {
   methods: {
     ...mapActions('diffs', ['loadMoreLines', 'showCommentForm']),
     handleCommentButton() {
-      this.showCommentForm({ lineCode: this.line.lineCode });
+      this.showCommentForm({ lineCode: this.line.line_code });
     },
     handleLoadMoreLines() {
       if (this.isRequesting) {
@@ -108,8 +108,8 @@ export default {
 
       this.isRequesting = true;
       const endpoint = this.contextLinesPath;
-      const oldLineNumber = this.line.metaData.oldPos || 0;
-      const newLineNumber = this.line.metaData.newPos || 0;
+      const oldLineNumber = this.line.meta_data.old_pos || 0;
+      const newLineNumber = this.line.meta_data.new_pos || 0;
       const offset = newLineNumber - oldLineNumber;
       const bottom = this.isBottom;
       const { fileHash } = this;
@@ -125,12 +125,12 @@ export default {
         to = lineNumber + UNFOLD_COUNT;
       } else {
         const diffFile = utils.findDiffFile(this.diffFiles, this.fileHash);
-        const indexForInline = utils.findIndexInInlineLines(diffFile.highlightedDiffLines, {
+        const indexForInline = utils.findIndexInInlineLines(diffFile.highlighted_diff_lines, {
           oldLineNumber,
           newLineNumber,
         });
-        const prevLine = diffFile.highlightedDiffLines[indexForInline - 2];
-        const prevLineNumber = (prevLine && prevLine.newLine) || 0;
+        const prevLine = diffFile.highlighted_diff_lines[indexForInline - 2];
+        const prevLineNumber = (prevLine && prevLine.new_line) || 0;
 
         if (since <= prevLineNumber + 1) {
           since = prevLineNumber + 1;

app/assets/javascripts/diffs/components/diff_line_note_form.vue

@@ -54,7 +54,7 @@ export default {
         this.noteableData.diff_head_sha,
         DIFF_NOTE_TYPE,
         this.noteableData.source_project_id,
-        this.line.lineCode,
+        this.line.line_code,
       ];
 
       this.initAutoSave(this.noteableData, keys);
@@ -73,7 +73,7 @@ export default {
       }
 
       this.cancelCommentForm({
-        lineCode: this.line.lineCode,
+        lineCode: this.line.line_code,
       });
       this.$nextTick(() => {
         this.resetAutoSave();
@@ -95,7 +95,7 @@ export default {
     <note-form
       ref="noteForm"
       :is-editing="true"
-      :line-code="line.lineCode"
+      :line-code="line.line_code"
       save-button-title="Comment"
       class="diff-comment-form"
       @handleFormUpdateAddToReview="addToReview"

app/assets/javascripts/diffs/components/diff_table_cell.vue

@@ -96,9 +96,7 @@ export default {
       };
     },
     lineNumber() {
-      const { lineType } = this;
-
-      return lineType === OLD_LINE_TYPE ? this.line.oldLine : this.line.newLine;
+      return this.lineType === OLD_LINE_TYPE ? this.line.old_line : this.line.new_line;
     },
   },
 };

app/assets/javascripts/diffs/components/inline_diff_comment_row.vue

@@ -48,7 +48,7 @@ export default {
           :discussions="line.discussions"
         />
         <diff-line-note-form
-          v-if="diffLineCommentForms[line.lineCode]"
+          v-if="diffLineCommentForms[line.line_code]"
           :diff-file-hash="diffFileHash"
           :line="line"
           :note-target-line="line"

app/assets/javascripts/diffs/components/inline_diff_table_row.vue

@@ -52,9 +52,7 @@ export default {
       };
     },
     inlineRowId() {
-      const { lineCode, oldLine, newLine } = this.line;
-
-      return lineCode || `${this.fileHash}_${oldLine}_${newLine}`;
+      return this.line.line_code || `${this.fileHash}_${this.line.old_line}_${this.line.new_line}`;
     },
   },
   created() {
@@ -107,7 +105,7 @@ export default {
     <td
       :class="line.type"
       class="line_content"
-      v-html="line.richText"
+      v-html="line.rich_text"
     >
     </td>
   </tr>

app/assets/javascripts/diffs/components/inline_diff_view.vue

@@ -46,23 +46,23 @@ export default {
         v-for="(line, index) in diffLines"
       >
         <inline-diff-table-row
-          :key="line.lineCode"
-          :file-hash="diffFile.fileHash"
-          :context-lines-path="diffFile.contextLinesPath"
+          :key="line.line_code"
+          :file-hash="diffFile.file_hash"
+          :context-lines-path="diffFile.context_lines_path"
           :line="line"
           :is-bottom="index + 1 === diffLinesLength"
         />
         <inline-diff-comment-row
           v-if="shouldRenderInlineCommentRow(line)"
           :key="index"
-          :diff-file-hash="diffFile.fileHash"
+          :diff-file-hash="diffFile.file_hash"
           :line="line"
           :line-index="index"
         />
         <inline-draft-comment-row
-          v-if="shouldRenderDraftRow(diffFile.fileHash, line)"
+          v-if="shouldRenderDraftRow(diffFile.file_hash, line)"
           :key="`draft_${index}`"
-          :draft="draftForLine(diffFile.fileHash, line)"
+          :draft="draftForLine(diffFile.file_hash, line)"
         />
       </template>
     </tbody>

app/assets/javascripts/diffs/components/parallel_diff_comment_row.vue

@@ -27,10 +27,10 @@ export default {
       diffLineCommentForms: state => state.diffs.diffLineCommentForms,
     }),
     leftLineCode() {
-      return this.line.left && this.line.left.lineCode;
+      return this.line.left && this.line.left.line_code;
     },
     rightLineCode() {
-      return this.line.right && this.line.right.lineCode;
+      return this.line.right && this.line.right.line_code;
     },
     hasExpandedDiscussionOnLeft() {
       return this.line.left && this.line.left.discussions

app/assets/javascripts/diffs/components/parallel_diff_table_row.vue

@@ -120,11 +120,11 @@ export default {
         class="diff-line-num old_line"
       />
       <td
-        :id="line.left.lineCode"
+        :id="line.left.line_code"
         :class="parallelViewLeftLineType"
         class="line_content parallel left-side"
         @mousedown.native="handleParallelLineMouseDown"
-        v-html="line.left.richText"
+        v-html="line.left.rich_text"
       >
       </td>
     </template>
@@ -146,11 +146,11 @@ export default {
         class="diff-line-num new_line"
       />
       <td
-        :id="line.right.lineCode"
+        :id="line.right.line_code"
         :class="line.right.type"
         class="line_content parallel right-side"
         @mousedown.native="handleParallelLineMouseDown"
-        v-html="line.right.richText"
+        v-html="line.right.rich_text"
       >
       </td>
     </template>

app/assets/javascripts/diffs/components/parallel_diff_view.vue

@@ -49,8 +49,8 @@ export default {
         >
           <parallel-diff-table-row
             :key="index"
-            :file-hash="diffFile.fileHash"
-            :context-lines-path="diffFile.contextLinesPath"
+            :file-hash="diffFile.file_hash"
+            :context-lines-path="diffFile.context_lines_path"
             :line="line"
             :is-bottom="index + 1 === diffLinesLength"
           />
@@ -58,14 +58,14 @@ export default {
             v-if="shouldRenderParallelCommentRow(line)"
             :key="`dcr-${index}`"
             :line="line"
-            :diff-file-hash="diffFile.fileHash"
+            :diff-file-hash="diffFile.file_hash"
             :line-index="index"
           />
           <parallel-draft-comment-row
-            v-if="shouldRenderParallelDraftRow(diffFile.fileHash, line)"
+            v-if="shouldRenderParallelDraftRow(diffFile.file_hash, line)"
             :key="`drafts-${index}`"
             :line="line"
-            :diff-file-content-sha="diffFile.fileHash"
+            :diff-file-content-sha="diffFile.file_hash"
           />
         </template>
       </tbody>

app/assets/javascripts/diffs/index.js

 import Vue from 'vue';
 import { mapState } from 'vuex';
-import { convertObjectPropsToCamelCase } from '~/lib/utils/common_utils';
 import diffsApp from './components/app.vue';
 
 export default function initDiffsApp(store) {
@@ -17,9 +16,7 @@ export default function initDiffsApp(store) {
       return {
         endpoint: dataset.endpoint,
         projectPath: dataset.projectPath,
-        currentUser: convertObjectPropsToCamelCase(JSON.parse(dataset.currentUserData), {
-          deep: true,
-        }),
+        currentUser: JSON.parse(dataset.currentUserData) || {},
       };
     },
     computed: {

app/assets/javascripts/diffs/store/actions.js

@@ -50,8 +50,8 @@ export const assignDiscussionsToDiff = (
 };
 
 export const removeDiscussionsFromDiff = ({ commit }, removeDiscussion) => {
-  const { fileHash, line_code, id } = removeDiscussion;
-  commit(types.REMOVE_LINE_DISCUSSIONS_FOR_FILE, { fileHash, lineCode: line_code, id });
+  const { file_hash, line_code, id } = removeDiscussion;
+  commit(types.REMOVE_LINE_DISCUSSIONS_FOR_FILE, { fileHash: file_hash, lineCode: line_code, id });
 };
 
 export const startRenderDiffsQueue = ({ state, commit }) => {
@@ -189,7 +189,7 @@ export const saveDiffDiscussion = ({ dispatch }, { note, formData }) => {
   return dispatch('saveNote', postData, { root: true })
     .then(result => dispatch('updateDiscussion', result.discussion, { root: true }))
     .then(discussion => dispatch('assignDiscussionsToDiff', [discussion]))
-    .then(() => dispatch('closeDiffFileCommentForm', formData.diffFile.fileHash))
+    .then(() => dispatch('closeDiffFileCommentForm', formData.diffFile.file_hash))
     .then(() => dispatch('startTaskList', null, { root: true }))
     .catch(() => createFlash(s__('MergeRequests|Saving the comment failed')));
 };

app/assets/javascripts/diffs/store/getters.js

-import _ from 'underscore';
 import { PARALLEL_DIFF_VIEW_TYPE, INLINE_DIFF_VIEW_TYPE } from '../constants';
 
 export const isParallelView = state => state.diffViewType === PARALLEL_DIFF_VIEW_TYPE;
@@ -68,8 +67,7 @@ export const diffHasDiscussions = (state, getters) => diff =>
  */
 export const getDiffFileDiscussions = (state, getters, rootState, rootGetters) => diff =>
   rootGetters.discussions.filter(
-    discussion =>
-      discussion.diff_discussion && _.isEqual(discussion.diff_file.file_hash, diff.fileHash),
+    discussion => discussion.diff_discussion && discussion.diff_file.file_hash === diff.file_hash,
   ) || [];
 
 export const shouldRenderParallelCommentRow = state => line => {
@@ -90,14 +88,14 @@ export const shouldRenderParallelCommentRow = state => line => {
     return true;
   }
 
-  const hasCommentFormOnLeft = line.left && state.diffLineCommentForms[line.left.lineCode];
-  const hasCommentFormOnRight = line.right && state.diffLineCommentForms[line.right.lineCode];
+  const hasCommentFormOnLeft = line.left && state.diffLineCommentForms[line.left.line_code];
+  const hasCommentFormOnRight = line.right && state.diffLineCommentForms[line.right.line_code];
 
   return hasCommentFormOnLeft || hasCommentFormOnRight;
 };
 
 export const shouldRenderInlineCommentRow = state => line => {
-  if (state.diffLineCommentForms[line.lineCode]) return true;
+  if (state.diffLineCommentForms[line.line_code]) return true;
 
   if (!line.discussions || line.discussions.length === 0) {
     return false;
@@ -108,7 +106,7 @@ export const shouldRenderInlineCommentRow = state => line => {
 
 // prevent babel-plugin-rewire from generating an invalid default during karma∂ tests
 export const getDiffFileByHash = state => fileHash =>
-  state.diffFiles.find(file => file.fileHash === fileHash);
+  state.diffFiles.find(file => file.file_hash === fileHash);
 
 export const allBlobs = state => Object.values(state.treeEntries).filter(f => f.type === 'blob');
 

app/assets/javascripts/diffs/store/mutations.js

@@ -23,12 +23,11 @@ export default {
   },
 
   [types.SET_DIFF_DATA](state, data) {
-    const diffData = convertObjectPropsToCamelCase(data, { deep: true });
-    prepareDiffData(diffData);
-    const { tree, treeEntries } = generateTreeList(diffData.diffFiles);
+    prepareDiffData(data);
+    const { tree, treeEntries } = generateTreeList(data.diff_files);
 
     Object.assign(state, {
-      ...diffData,
+      ...convertObjectPropsToCamelCase(data),
       tree: sortTree(tree),
       treeEntries,
     });
@@ -42,7 +41,7 @@ export default {
 
   [types.SET_MERGE_REQUEST_DIFFS](state, mergeRequestDiffs) {
     Object.assign(state, {
-      mergeRequestDiffs: convertObjectPropsToCamelCase(mergeRequestDiffs, { deep: true }),
+      mergeRequestDiffs,
     });
   },
 
@@ -62,19 +61,18 @@ export default {
     const { lineNumbers, contextLines, fileHash } = options;
     const { bottom } = options.params;
     const diffFile = findDiffFile(state.diffFiles, fileHash);
-    const { highlightedDiffLines, parallelDiffLines } = diffFile;
 
     removeMatchLine(diffFile, lineNumbers, bottom);
 
     const lines = addLineReferences(contextLines, lineNumbers, bottom).map(line => ({
       ...line,
-      lineCode: line.lineCode || `${fileHash}_${line.oldLine}_${line.newLine}`,
+      line_code: line.line_code || `${fileHash}_${line.old_line}_${line.new_line}`,
       discussions: line.discussions || [],
     }));
 
     addContextLines({
-      inlineLines: highlightedDiffLines,
-      parallelLines: parallelDiffLines,
+      inlineLines: diffFile.highlighted_diff_lines,
+      parallelLines: diffFile.parallel_diff_lines,
       contextLines: lines,
       bottom,
       lineNumbers,
@@ -82,10 +80,9 @@ export default {
   },
 
   [types.ADD_COLLAPSED_DIFFS](state, { file, data }) {
-    const normalizedData = convertObjectPropsToCamelCase(data, { deep: true });
-    prepareDiffData(normalizedData);
-    const [newFileData] = normalizedData.diffFiles.filter(f => f.fileHash === file.fileHash);
-    const selectedFile = state.diffFiles.find(f => f.fileHash === file.fileHash);
+    prepareDiffData(data);
+    const [newFileData] = data.diff_files.filter(f => f.file_hash === file.file_hash);
+    const selectedFile = state.diffFiles.find(f => f.file_hash === file.file_hash);
     Object.assign(selectedFile, { ...newFileData });
   },
 
@@ -101,20 +98,20 @@ export default {
 
     const discussionLineCode = discussion.line_code;
     const fileHash = discussion.diff_file.file_hash;
-    const lineCheck = ({ lineCode }) =>
-      lineCode === discussionLineCode &&
+    const lineCheck = line =>
+      line.line_code === discussionLineCode &&
       isDiscussionApplicableToLine({
         discussion,
-        diffPosition: diffPositionByLineCode[lineCode],
+        diffPosition: diffPositionByLineCode[line.line_code],
         latestDiff,
       });
 
     state.diffFiles = state.diffFiles.map(diffFile => {
-      if (diffFile.fileHash === fileHash) {
+      if (diffFile.file_hash === fileHash) {
         const file = { ...diffFile };
 
-        if (file.highlightedDiffLines) {
-          file.highlightedDiffLines = file.highlightedDiffLines.map(line => {
+        if (file.highlighted_diff_lines) {
+          file.highlighted_diff_lines = file.highlighted_diff_lines.map(line => {
             if (lineCheck(line)) {
               return {
                 ...line,
@@ -126,8 +123,8 @@ export default {
           });
         }
 
-        if (file.parallelDiffLines) {
-          file.parallelDiffLines = file.parallelDiffLines.map(line => {
+        if (file.parallel_diff_lines) {
+          file.parallel_diff_lines = file.parallel_diff_lines.map(line => {
             const left = line.left && lineCheck(line.left);
             const right = line.right && lineCheck(line.right);
 
@@ -148,7 +145,7 @@ export default {
           });
         }
 
-        if (!file.parallelDiffLines || !file.highlightedDiffLines) {
+        if (!file.parallel_diff_lines || !file.highlighted_diff_lines) {
           file.discussions = file.discussions.concat(discussion);
         }
 
@@ -160,16 +157,16 @@ export default {
   },
 
   [types.REMOVE_LINE_DISCUSSIONS_FOR_FILE](state, { fileHash, lineCode, id }) {
-    const selectedFile = state.diffFiles.find(f => f.fileHash === fileHash);
+    const selectedFile = state.diffFiles.find(f => f.file_hash === fileHash);
     if (selectedFile) {
-      if (selectedFile.parallelDiffLines) {
-        const targetLine = selectedFile.parallelDiffLines.find(
+      if (selectedFile.parallel_diff_lines) {
+        const targetLine = selectedFile.parallel_diff_lines.find(
           line =>
-            (line.left && line.left.lineCode === lineCode) ||
-            (line.right && line.right.lineCode === lineCode),
+            (line.left && line.left.line_code === lineCode) ||
+            (line.right && line.right.line_code === lineCode),
         );
         if (targetLine) {
-          const side = targetLine.left && targetLine.left.lineCode === lineCode ? 'left' : 'right';
+          const side = targetLine.left && targetLine.left.line_code === lineCode ? 'left' : 'right';
 
           Object.assign(targetLine[side], {
             discussions: [],
@@ -177,9 +174,9 @@ export default {
         }
       }
 
-      if (selectedFile.highlightedDiffLines) {
-        const targetInlineLine = selectedFile.highlightedDiffLines.find(
-          line => line.lineCode === lineCode,
+      if (selectedFile.highlighted_diff_lines) {
+        const targetInlineLine = selectedFile.highlighted_diff_lines.find(
+          line => line.line_code === lineCode,
         );
 
         if (targetInlineLine) {

app/assets/javascripts/notes/components/diff_with_note.vue

 <script>
 import { mapState, mapActions } from 'vuex';
-import { convertObjectPropsToCamelCase } from '~/lib/utils/common_utils';
 import DiffFileHeader from '~/diffs/components/diff_file_header.vue';
 import DiffViewer from '~/vue_shared/components/diff_viewer/diff_viewer.vue';
 import ImageDiffOverlay from '~/diffs/components/image_diff_overlay.vue';
@@ -34,7 +33,9 @@ export default {
       return getDiffMode(this.diffFile);
     },
     hasTruncatedDiffLines() {
-      return this.discussion.truncatedDiffLines && this.discussion.truncatedDiffLines.length !== 0;
+      return (
+        this.discussion.truncated_diff_lines && this.discussion.truncated_diff_lines.length !== 0
+      );
     },
     isDiscussionsExpanded() {
       return true; // TODO: @fatihacet - Fix this.
@@ -50,19 +51,17 @@ export default {
       return text ? 'text-file' : 'js-image-file';
     },
     diffFile() {
-      return convertObjectPropsToCamelCase(this.discussion.diffFile, { deep: true });
+      return this.discussion.diff_file;
     },
     imageDiffHtml() {
-      return this.discussion.imageDiffHtml;
+      return this.discussion.image_diff_html;
     },
     userColorScheme() {
       return window.gon.user_color_scheme;
     },
     normalizedDiffLines() {
-      if (this.discussion.truncatedDiffLines) {
-        return this.discussion.truncatedDiffLines.map(line =>
-          trimFirstCharOfLineContent(convertObjectPropsToCamelCase(line)),
-        );
+      if (this.discussion.truncated_diff_lines) {
+        return this.discussion.truncated_diff_lines.map(line => trimFirstCharOfLineContent(line));
       }
 
       return [];
@@ -97,7 +96,7 @@ export default {
     class="diff-file file-holder"
   >
     <diff-file-header
-      :discussion-path="discussion.discussionPath"
+      :discussion-path="discussion.discussion_path"
       :diff-file="diffFile"
       :can-current-user-fork="false"
       :discussions-expanded="isDiscussionsExpanded"
@@ -111,15 +110,15 @@ export default {
       <table>
         <tr
           v-for="line in normalizedDiffLines"
-          :key="line.lineCode"
+          :key="line.line_code"
           class="line_holder"
         >
-          <td class="diff-line-num old_line">{{ line.oldLine }}</td>
-          <td class="diff-line-num new_line">{{ line.newLine }}</td>
+          <td class="diff-line-num old_line">{{ line.old_line }}</td>
+          <td class="diff-line-num new_line">{{ line.new_line }}</td>
           <td
             :class="line.type"
             class="line_content"
-            v-html="line.richText"
+            v-html="line.rich_text"
           >
           </td>
         </tr>
@@ -165,17 +164,17 @@ export default {
     >
       <diff-viewer
         :diff-mode="diffMode"
-        :new-path="diffFile.newPath"
-        :new-sha="diffFile.diffRefs.headSha"
-        :old-path="diffFile.oldPath"
-        :old-sha="diffFile.diffRefs.baseSha"
-        :file-hash="diffFile.fileHash"
+        :new-path="diffFile.new_path"
+        :new-sha="diffFile.diff_refs.head_sha"
+        :old-path="diffFile.old_path"
+        :old-sha="diffFile.diff_refs.base_sha"
+        :file-hash="diffFile.file_hash"
         :project-path="projectPath"
       >
         <image-diff-overlay
           slot="image-overlay"
           :discussions="discussion"
-          :file-hash="diffFile.fileHash"
+          :file-hash="diffFile.file_hash"
           :show-comment-icon="true"
           :should-toggle-discussion="false"
           badge-class="image-comment-badge"

app/assets/javascripts/notes/components/noteable_discussion.vue

 <script>
 import { mapActions, mapGetters } from 'vuex';
-import { convertObjectPropsToCamelCase } from '~/lib/utils/common_utils';
 import { truncateSha } from '~/lib/utils/text_utility';
 import { s__ } from '~/locale';
 import systemNote from '~/vue_shared/components/notes/system_note.vue';
@@ -98,17 +97,16 @@ export default {
     transformedDiscussion() {
       return {
         ...this.discussion.notes[0],
-        truncatedDiffLines: this.discussion.truncated_diff_lines || [],
-        truncatedDiffLinesPath: this.discussion.truncated_diff_lines_path,
-        diffFile: this.discussion.diff_file,
-        diffDiscussion: this.discussion.diff_discussion,
-        imageDiffHtml: this.discussion.image_diff_html,
+        truncated_diff_lines: this.discussion.truncated_diff_lines || [],
+        truncated_diff_lines_path: this.discussion.truncated_diff_lines_path,
+        diff_file: this.discussion.diff_file,
+        diff_discussion: this.discussion.diff_discussion,
         active: this.discussion.active,
-        discussionPath: this.discussion.discussion_path,
+        discussion_path: this.discussion.discussion_path,
         resolved: this.discussion.resolved,
-        resolvedBy: this.discussion.resolved_by,
-        resolvedByPush: this.discussion.resolved_by_push,
-        resolvedAt: this.discussion.resolved_at,
+        resolved_by: this.discussion.resolved_by,
+        resolved_by_push: this.discussion.resolved_by_push,
+        resolved_at: this.discussion.resolved_at,
       };
     },
     author() {
@@ -148,7 +146,7 @@ export default {
       return null;
     },
     resolvedText() {
-      return this.transformedDiscussion.resolvedByPush ? 'Automatically resolved' : 'Resolved';
+      return this.transformedDiscussion.resolved_by_push ? 'Automatically resolved' : 'Resolved';
     },
     hasMultipleUnresolvedDiscussions() {
       return this.unresolvedDiscussions.length > 1;
@@ -160,12 +158,14 @@ export default {
       );
     },
     shouldRenderDiffs() {
-      const { diffDiscussion, diffFile } = this.transformedDiscussion;
-
-      return diffDiscussion && diffFile && this.renderDiffFile;
+      return (
+        this.transformedDiscussion.diff_discussion &&
+        this.transformedDiscussion.diff_file &&
+        this.renderDiffFile
+      );
     },
     shouldGroupReplies() {
-      return !this.shouldRenderDiffs && !this.transformedDiscussion.diffDiscussion;
+      return !this.shouldRenderDiffs && !this.transformedDiscussion.diff_discussion;
     },
     shouldRenderHeader() {
       return this.shouldRenderDiffs;
@@ -175,7 +175,7 @@ export default {
     },
     wrapperComponentProps() {
       if (this.shouldRenderDiffs) {
-        return { discussion: convertObjectPropsToCamelCase(this.discussion) };
+        return { discussion: this.discussion };
       }
 
       return {};
@@ -194,8 +194,8 @@ export default {
     },
     shouldShowDiscussions() {
       const isExpanded = this.discussion.expanded;
-      const { diffDiscussion, resolved } = this.transformedDiscussion;
-      const isResolvedNonDiffDiscussion = !diffDiscussion && resolved;
+      const { resolved } = this.transformedDiscussion;
+      const isResolvedNonDiffDiscussion = !this.transformedDiscussion.diff_discussion && resolved;
 
       return isExpanded || this.alwaysExpanded || isResolvedNonDiffDiscussion;
     },
@@ -343,9 +343,9 @@ Please check your network connection and try again.`;
               :expanded="discussion.expanded"
               @toggleHandler="toggleDiscussionHandler"
             >
-              <template v-if="transformedDiscussion.diffDiscussion">
+              <template v-if="transformedDiscussion.diff_discussion">
                 started a discussion on
-                <a :href="transformedDiscussion.discussionPath">
+                <a :href="transformedDiscussion.discussion_path">
                   <template v-if="transformedDiscussion.active">
                     the diff
                   </template>
@@ -366,8 +366,8 @@ Please check your network connection and try again.`;
             </note-header>
             <note-edited-text
               v-if="transformedDiscussion.resolved"
-              :edited-at="transformedDiscussion.resolvedAt"
-              :edited-by="transformedDiscussion.resolvedBy"
+              :edited-at="transformedDiscussion.resolved_at"
+              :edited-by="transformedDiscussion.resolved_by"
               :action-text="resolvedText"
               class-name="discussion-headline-light js-discussion-headline"
             />

app/assets/javascripts/notes/stores/actions.js

@@ -341,7 +341,7 @@ export const scrollToNoteIfNeeded = (context, el) => {
 };
 
 export const fetchDiscussionDiffLines = ({ commit }, discussion) =>
-  axios.get(discussion.truncatedDiffLinesPath).then(({ data }) => {
+  axios.get(discussion.truncated_diff_lines_path).then(({ data }) => {
     commit(types.SET_DISCUSSION_DIFF_LINES, {
       discussionId: discussion.id,
       diffLines: data.truncated_diff_lines,

app/assets/javascripts/notes/stores/mutations.js

@@ -102,7 +102,7 @@ export default {
     discussionsData.forEach(discussion => {
       if (discussion.diff_file) {
         Object.assign(discussion, {
-          fileHash: discussion.diff_file.file_hash,
+          file_hash: discussion.diff_file.file_hash,
           truncated_diff_lines: discussion.truncated_diff_lines || [],
         });
       }
@@ -195,7 +195,7 @@ export default {
     const selectedDiscussion = state.discussions.find(disc => disc.id === note.id);
     note.expanded = true; // override expand flag to prevent collapse
     if (note.diff_file) {
-      Object.assign(note, { fileHash: note.diff_file.file_hash });
+      Object.assign(note, { file_hash: note.diff_file.file_hash });
     }
     Object.assign(selectedDiscussion, { ...note });
   },

app/assets/stylesheets/pages/notes.scss

@@ -272,7 +272,7 @@ $note-form-margin-left: 72px;
   }
 
   .system-note {
-    padding: 6px 20px;
+    padding: 6px 21px;
     margin: $gl-padding-24 0;
     background-color: transparent;
 
@@ -407,6 +407,24 @@ $note-form-margin-left: 72px;
   }
 }
 
+.tab-pane.notes {
+  .diff-file .notes .system-note {
+    margin: 0;
+  }
+}
+
+.tab-pane.diffs {
+  .system-note {
+    padding: 0 $gl-padding;
+    margin-left: 20px;
+  }
+
+  .notes > .note-discussion li.note.system-note {
+    border-bottom: 0;
+    padding: 0 $gl-padding;
+  }
+}
+
 .diff-file {
   .is-over {
     .add-diff-note {
@@ -426,7 +444,7 @@ $note-form-margin-left: 72px;
     }
 
     .system-note {
-      margin: 0;
+      background-color: $white-light;
       padding: $gl-padding;
     }
   }
@@ -485,6 +503,11 @@ $note-form-margin-left: 72px;
 
   .note-wrapper {
     @include outline-comment();
+
+    &.system-note {
+      border: 0;
+      margin-left: 20px;
+    }
   }
 
   .discussion-reply-holder {

doc/workflow/shortcuts.md

@@ -101,4 +101,4 @@ You can see GitLab's keyboard shortcuts by using 'shift + ?'
 
 | Keyboard Shortcut | Description |
 | ----------------- | ----------- |
-| <kbd>⌘</kbd> + <kbd>p</kbd> | Go to file |
+| <kbd>Cmd</kbd>/<kbd>Ctrl</kbd> + <kbd>p</kbd> | Go to file |

ee/app/assets/javascripts/batch_comments/mixins/diff_line_note_form.js

@@ -55,7 +55,7 @@ export default {
 
       return this.saveDraft(postData)
         .then(() => {
-          this.handleClearForm(this.line.lineCode);
+          this.handleClearForm(this.line.line_code);
         })
         .catch(() => {
           createFlash(s__('MergeRequests|An error occurred while saving the draft comment.'));

ee/app/assets/javascripts/batch_comments/stores/modules/batch_comments/getters.js

@@ -31,7 +31,7 @@ export const draftsPerFileHashAndLine = state =>
 export const shouldRenderDraftRow = (state, getters) => (diffFileSha, line) =>
   !!(
     diffFileSha in getters.draftsPerFileHashAndLine &&
-    getters.draftsPerFileHashAndLine[diffFileSha][line.lineCode]
+    getters.draftsPerFileHashAndLine[diffFileSha][line.line_code]
   );
 
 export const shouldRenderParallelDraftRow = (state, getters) => (diffFileSha, line) => {
@@ -50,7 +50,7 @@ export const draftForDiscussion = (state, getters) => discussionId =>
 export const draftForLine = (state, getters) => (diffFileSha, line, side = null) => {
   const draftsForFile = getters.draftsPerFileHashAndLine[diffFileSha];
 
-  const key = side !== null ? parallelLineKey(line, side) : line.lineCode;
+  const key = side !== null ? parallelLineKey(line, side) : line.line_code;
 
   if (draftsForFile) {
     const draft = draftsForFile[key];

ee/app/assets/javascripts/batch_comments/utils.js

@@ -10,7 +10,7 @@ export const getDraftFormData = params => ({
   data: getFormData(params),
 });
 
-export const parallelLineKey = (line, side) => (line[side] ? line[side].lineCode : '');
+export const parallelLineKey = (line, side) => (line[side] ? line[side].line_code : '');
 
 export const showDraftOnSide = (line, side) => {
   // inline mode
@@ -21,8 +21,8 @@ export const showDraftOnSide = (line, side) => {
   // parallel
   if (side === 'left' || side === 'right') {
     const otherSide = side === 'left' ? 'right' : 'left';
-    const thisCode = (line[side] && line[side].lineCode) || '';
-    const otherCode = (line[otherSide] && line[otherSide].lineCode) || '';
+    const thisCode = (line[side] && line[side].line_code) || '';
+    const otherCode = (line[otherSide] && line[otherSide].line_code) || '';
 
     // either the lineCodes are different
     // or if they're the same, only show on the left side

spec/javascripts/diffs/components/commit_item_spec.js

@@ -21,7 +21,7 @@ const getAvatarElement = vm => vm.$el.querySelector('.user-avatar-link');
 const getCommitterElement = vm => vm.$el.querySelector('.commiter');
 const getCommitActionsElement = vm => vm.$el.querySelector('.commit-actions');
 
-describe('diffs/components/commit_widget', () => {
+describe('diffs/components/commit_item', () => {
   const Component = Vue.extend(CommitItem);
   const timeago = getTimeago();
   const { commit } = getDiffWithCommit();
@@ -37,15 +37,15 @@ describe('diffs/components/commit_widget', () => {
   it('renders commit title', () => {
     const titleElement = getTitleElement(vm);
 
-    expect(titleElement).toHaveAttr('href', commit.commitUrl);
-    expect(titleElement).toHaveText(commit.titleHtml);
+    expect(titleElement).toHaveAttr('href', commit.commit_url);
+    expect(titleElement).toHaveText(commit.title_html);
   });
 
   it('renders commit description', () => {
     const descElement = getDescElement(vm);
     const descExpandElement = getDescExpandElement(vm);
 
-    const expected = commit.descriptionHtml.replace(/
/g, '');
+    const expected = commit.description_html.replace(/
/g, '');
 
     expect(trimText(descElement.innerHTML)).toEqual(trimText(expected));
     expect(descExpandElement).not.toBeNull();
@@ -56,7 +56,7 @@ describe('diffs/components/commit_widget', () => {
     const labelElement = shaElement.querySelector('.label');
     const buttonElement = shaElement.querySelector('button');
 
-    expect(labelElement.textContent).toEqual(commit.shortId);
+    expect(labelElement.textContent).toEqual(commit.short_id);
     expect(buttonElement).toHaveData('clipboard-text', commit.id);
   });
 
@@ -64,27 +64,27 @@ describe('diffs/components/commit_widget', () => {
     const avatarElement = getAvatarElement(vm);
     const imgElement = avatarElement.querySelector('img');
 
-    expect(avatarElement).toHaveAttr('href', commit.author.webUrl);
+    expect(avatarElement).toHaveAttr('href', commit.author.web_url);
     expect(imgElement).toHaveClass('s36');
     expect(imgElement).toHaveAttr('alt', commit.author.name);
-    expect(imgElement).toHaveAttr('src', commit.author.avatarUrl);
+    expect(imgElement).toHaveAttr('src', commit.author.avatar_url);
   });
 
   it('renders committer text', () => {
     const committerElement = getCommitterElement(vm);
     const nameElement = committerElement.querySelector('a');
 
-    const expectTimeText = timeago.format(commit.authoredDate);
+    const expectTimeText = timeago.format(commit.authored_date);
     const expectedText = `${commit.author.name} authored ${expectTimeText}`;
 
     expect(trimText(committerElement.textContent)).toEqual(expectedText);
-    expect(nameElement).toHaveAttr('href', commit.author.webUrl);
+    expect(nameElement).toHaveAttr('href', commit.author.web_url);
     expect(nameElement).toHaveText(commit.author.name);
   });
 
   describe('without commit description', () => {
     beforeEach(done => {
-      vm.commit.descriptionHtml = '';
+      vm.commit.description_html = '';
 
       vm.$nextTick()
         .then(done)
@@ -103,9 +103,9 @@ describe('diffs/components/commit_widget', () => {
   describe('with no matching user', () => {
     beforeEach(done => {
       vm.commit.author = null;
-      vm.commit.authorEmail = TEST_AUTHOR_EMAIL;
-      vm.commit.authorName = TEST_AUTHOR_NAME;
-      vm.commit.authorGravatarUrl = TEST_AUTHOR_GRAVATAR;
+      vm.commit.author_email = TEST_AUTHOR_EMAIL;
+      vm.commit.author_name = TEST_AUTHOR_NAME;
+      vm.commit.author_gravatar_url = TEST_AUTHOR_GRAVATAR;
 
       vm.$nextTick()
         .then(done)
@@ -132,7 +132,7 @@ describe('diffs/components/commit_widget', () => {
 
   describe('with signature', () => {
     beforeEach(done => {
-      vm.commit.signatureHtml = TEST_SIGNATURE_HTML;
+      vm.commit.signature_html = TEST_SIGNATURE_HTML;
 
       vm.$nextTick()
         .then(done)
@@ -148,7 +148,7 @@ describe('diffs/components/commit_widget', () => {
 
   describe('with pipeline status', () => {
     beforeEach(done => {
-      vm.commit.pipelineStatusPath = TEST_PIPELINE_STATUS_PATH;
+      vm.commit.pipeline_status_path = TEST_PIPELINE_STATUS_PATH;
 
       vm.$nextTick()
         .then(done)

spec/javascripts/diffs/components/commit_widget_spec.js

@@ -19,6 +19,6 @@ describe('diffs/components/commit_widget', () => {
     const commitElement = vm.$el.querySelector('li.commit');
 
     expect(commitElement).not.toBeNull();
-    expect(commitElement).toContainText(commit.shortId);
+    expect(commitElement).toContainText(commit.short_id);
   });
 });

spec/javascripts/diffs/components/diff_content_spec.js

@@ -56,14 +56,14 @@ describe('DiffContent', () => {
 
     describe('image diff', () => {
       beforeEach(done => {
-        vm.diffFile.newPath = GREEN_BOX_IMAGE_URL;
-        vm.diffFile.newSha = 'DEF';
-        vm.diffFile.oldPath = RED_BOX_IMAGE_URL;
-        vm.diffFile.oldSha = 'ABC';
-        vm.diffFile.viewPath = '';
+        vm.diffFile.new_path = GREEN_BOX_IMAGE_URL;
+        vm.diffFile.new_sha = 'DEF';
+        vm.diffFile.old_path = RED_BOX_IMAGE_URL;
+        vm.diffFile.old_sha = 'ABC';
+        vm.diffFile.view_path = '';
         vm.diffFile.discussions = [{ ...discussionsMockData }];
         vm.$store.state.diffs.commentForms.push({
-          fileHash: vm.diffFile.fileHash,
+          fileHash: vm.diffFile.file_hash,
           x: 10,
           y: 20,
           width: 100,
@@ -113,10 +113,10 @@ describe('DiffContent', () => {
     describe('file diff', () => {
       it('should have download buttons in place', done => {
         const el = vm.$el;
-        vm.diffFile.newPath = 'test.abc';
-        vm.diffFile.newSha = 'DEF';
-        vm.diffFile.oldPath = 'test.abc';
-        vm.diffFile.oldSha = 'ABC';
+        vm.diffFile.new_path = 'test.abc';
+        vm.diffFile.new_sha = 'DEF';
+        vm.diffFile.old_path = 'test.abc';
+        vm.diffFile.old_sha = 'ABC';
 
         vm.$nextTick(() => {
           expect(el.querySelectorAll('.js-diff-inline-view').length).toEqual(0);

spec/javascripts/diffs/components/diff_file_spec.js

@@ -17,14 +17,14 @@ describe('DiffFile', () => {
   describe('template', () => {
     it('should render component with file header, file content components', () => {
       const el = vm.$el;
-      const { fileHash, filePath } = vm.file;
+      const { file_hash, file_path } = vm.file;
 
-      expect(el.id).toEqual(fileHash);
+      expect(el.id).toEqual(file_hash);
       expect(el.classList.contains('diff-file')).toEqual(true);
 
       expect(el.querySelectorAll('.diff-content.hidden').length).toEqual(0);
       expect(el.querySelector('.js-file-title')).toBeDefined();
-      expect(el.querySelector('.file-title-name').innerText.indexOf(filePath)).toBeGreaterThan(-1);
+      expect(el.querySelector('.file-title-name').innerText.indexOf(file_path)).toBeGreaterThan(-1);
       expect(el.querySelector('.js-syntax-highlight')).toBeDefined();
 
       expect(vm.file.renderIt).toEqual(false);
@@ -52,7 +52,7 @@ describe('DiffFile', () => {
       it('should have collapsed text and link', done => {
         vm.file.renderIt = true;
         vm.file.collapsed = false;
-        vm.file.highlightedDiffLines = null;
+        vm.file.highlighted_diff_lines = null;
 
         vm.$nextTick(() => {
           expect(vm.$el.innerText).toContain('This diff is collapsed');
@@ -90,8 +90,8 @@ describe('DiffFile', () => {
   describe('too large diff', () => {
     it('should have too large warning and blob link', done => {
       const BLOB_LINK = '/file/view/path';
-      vm.file.tooLarge = true;
-      vm.file.viewPath = BLOB_LINK;
+      vm.file.too_large = true;
+      vm.file.view_path = BLOB_LINK;
 
       vm.$nextTick(() => {
         expect(vm.$el.innerText).toContain(
@@ -112,8 +112,8 @@ describe('DiffFile', () => {
     it('calls handleLoadCollapsedDiff if collapsed changed & file has no lines', done => {
       spyOn(vm, 'handleLoadCollapsedDiff');
 
-      vm.file.highlightedDiffLines = undefined;
-      vm.file.parallelDiffLines = [];
+      vm.file.highlighted_diff_lines = undefined;
+      vm.file.parallel_diff_lines = [];
       vm.file.collapsed = true;
 
       vm.$nextTick()

spec/javascripts/diffs/components/diff_line_gutter_content_spec.js

@@ -11,16 +11,16 @@ describe('DiffLineGutterContent', () => {
     const cmp = Vue.extend(DiffLineGutterContent);
     const props = Object.assign({}, options);
     props.line = {
-      lineCode: 'LC_42',
+      line_code: 'LC_42',
       type: 'new',
-      oldLine: null,
-      newLine: 1,
-      discussions: [],
+      old_line: null,
+      new_line: 1,
+      discussions: [{ ...discussionsMockData }],
       text: '+<span id="LC1" class="line" lang="plaintext">  - Bad dates</span>\n',
-      richText: '+<span id="LC1" class="line" lang="plaintext">  - Bad dates</span>\n',
-      metaData: null,
+      rich_text: '+<span id="LC1" class="line" lang="plaintext">  - Bad dates</span>\n',
+      meta_data: null,
     };
-    props.fileHash = getDiffFileMock().fileHash;
+    props.fileHash = getDiffFileMock().file_hash;
     props.contextLinesPath = '/context/lines/path';
 
     return createComponentWithStore(cmp, store, props).$mount();
@@ -37,7 +37,7 @@ describe('DiffLineGutterContent', () => {
 
       it('should return # if there is no lineCode', () => {
         const component = createComponent();
-        component.line.lineCode = '';
+        component.line.line_code = '';
 
         expect(component.lineHref).toEqual('#');
       });
@@ -46,6 +46,7 @@ describe('DiffLineGutterContent', () => {
     describe('discussions, hasDiscussions, shouldShowAvatarsOnGutter', () => {
       it('should return empty array when there is no discussion', () => {
         const component = createComponent();
+        component.line.discussions = [];
 
         expect(component.hasDiscussions).toEqual(false);
         expect(component.shouldShowAvatarsOnGutter).toEqual(false);
@@ -54,8 +55,8 @@ describe('DiffLineGutterContent', () => {
       it('should return discussions for the given lineCode', () => {
         const cmp = Vue.extend(DiffLineGutterContent);
         const props = {
-          line: getDiffFileMock().highlightedDiffLines[1],
-          fileHash: getDiffFileMock().fileHash,
+          line: getDiffFileMock().highlighted_diff_lines[1],
+          fileHash: getDiffFileMock().file_hash,
           showCommentButton: true,
           contextLinesPath: '/context/lines/path',
         };
@@ -104,10 +105,10 @@ describe('DiffLineGutterContent', () => {
     it('should render user avatars', () => {
       const component = createComponent({
         showCommentButton: true,
-        lineCode: getDiffFileMock().highlightedDiffLines[1].lineCode,
+        lineCode: getDiffFileMock().highlighted_diff_lines[1].line_code,
       });
 
-      expect(component.$el.querySelector('.diff-comment-avatar-holders')).toBeDefined();
+      expect(component.$el.querySelector('.diff-comment-avatar-holders')).not.toBe(null);
     });
   });
 });

spec/javascripts/diffs/components/diff_line_note_form_spec.js

@@ -13,10 +13,10 @@ describe('DiffLineNoteForm', () => {
 
   beforeEach(() => {
     diffFile = getDiffFileMock();
-    diffLines = diffFile.highlightedDiffLines;
+    diffLines = diffFile.highlighted_diff_lines;
 
     component = createComponentWithStore(Vue.extend(DiffLineNoteForm), store, {
-      diffFileHash: diffFile.fileHash,
+      diffFileHash: diffFile.file_hash,
       diffLines,
       line: diffLines[0],
       noteTargetLine: diffLines[0],
@@ -61,7 +61,7 @@ describe('DiffLineNoteForm', () => {
         expect(window.confirm).not.toHaveBeenCalled();
         component.$nextTick(() => {
           expect(component.cancelCommentForm).toHaveBeenCalledWith({
-            lineCode: diffLines[0].lineCode,
+            lineCode: diffLines[0].line_code,
           });
 
           expect(component.resetAutoSave).toHaveBeenCalled();

spec/javascripts/diffs/components/inline_diff_view_spec.js

 import Vue from 'vue';
+import '~/behaviors/markdown/render_gfm';
 import InlineDiffView from '~/diffs/components/inline_diff_view.vue';
 import store from '~/mr_notes/stores';
 import { createComponentWithStore } from 'spec/helpers/vue_mount_component_helper';
@@ -10,14 +11,16 @@ describe('InlineDiffView', () => {
   const getDiffFileMock = () => Object.assign({}, diffFileMockData);
   const getDiscussionsMockData = () => [Object.assign({}, discussionsMockData)];
 
-  beforeEach(() => {
+  beforeEach(done => {
     const diffFile = getDiffFileMock();
 
     store.dispatch('diffs/setInlineDiffViewType');
     component = createComponentWithStore(Vue.extend(InlineDiffView), store, {
       diffFile,
-      diffLines: diffFile.highlightedDiffLines,
+      diffLines: diffFile.highlighted_diff_lines,
     }).$mount();
+
+    Vue.nextTick(done);
   });
 
   describe('template', () => {
@@ -32,7 +35,7 @@ describe('InlineDiffView', () => {
 
     it('should render discussions', done => {
       const el = component.$el;
-      component.$store.dispatch('setInitialNotes', getDiscussionsMockData());
+      component.diffLines[1].discussions = getDiscussionsMockData();
 
       Vue.nextTick(() => {
         expect(el.querySelectorAll('.notes_holder').length).toEqual(1);

spec/javascripts/diffs/components/parallel_diff_view_spec.js

@@ -14,7 +14,7 @@ describe('ParallelDiffView', () => {
 
     component = createComponentWithStore(Vue.extend(ParallelDiffView), store, {
       diffFile,
-      diffLines: diffFile.parallelDiffLines,
+      diffLines: diffFile.parallel_diff_lines,
     }).$mount();
   });
 

spec/javascripts/diffs/mock_data/diff_with_commit.js

-import { convertObjectPropsToCamelCase } from '~/lib/utils/common_utils';
-
 const FIXTURE = 'merge_request_diffs/with_commit.json';
 
 preloadFixtures(FIXTURE);
 
 export default function getDiffWithCommit() {
-  return convertObjectPropsToCamelCase(getJSONFixture(FIXTURE), { deep: true });
+  return getJSONFixture(FIXTURE);
 }

spec/javascripts/diffs/store/actions_spec.js

@@ -97,46 +97,46 @@ describe('DiffsStoreActions', () => {
       const state = {
         diffFiles: [
           {
-            fileHash: 'ABC',
-            parallelDiffLines: [
+            file_hash: 'ABC',
+            parallel_diff_lines: [
               {
                 left: {
-                  lineCode: 'ABC_1_1',
+                  line_code: 'ABC_1_1',
                   discussions: [],
                 },
                 right: {
-                  lineCode: 'ABC_1_1',
+                  line_code: 'ABC_1_1',
                   discussions: [],
                 },
               },
             ],
-            highlightedDiffLines: [
+            highlighted_diff_lines: [
               {
-                lineCode: 'ABC_1_1',
+                line_code: 'ABC_1_1',
                 discussions: [],
-                oldLine: 5,
-                newLine: null,
+                old_line: 5,
+                new_line: null,
               },
             ],
-            diffRefs: {
-              baseSha: 'abc',
-              headSha: 'def',
-              startSha: 'ghi',
+            diff_refs: {
+              base_sha: 'abc',
+              head_sha: 'def',
+              start_sha: 'ghi',
             },
-            newPath: 'file1',
-            oldPath: 'file2',
+            new_path: 'file1',
+            old_path: 'file2',
           },
         ],
       };
 
       const diffPosition = {
-        baseSha: 'abc',
-        headSha: 'def',
-        startSha: 'ghi',
-        newLine: null,
-        newPath: 'file1',
-        oldLine: 5,
-        oldPath: 'file2',
+        base_sha: 'abc',
+        head_sha: 'def',
+        start_sha: 'ghi',
+        new_line: null,
+        new_path: 'file1',
+        old_line: 5,
+        old_path: 'file2',
       };
 
       const singleDiscussion = {
@@ -145,7 +145,7 @@ describe('DiffsStoreActions', () => {
         diff_file: {
           file_hash: 'ABC',
         },
-        fileHash: 'ABC',
+        file_hash: 'ABC',
         resolvable: true,
         position: diffPosition,
         original_position: diffPosition,
@@ -164,24 +164,22 @@ describe('DiffsStoreActions', () => {
               discussion: singleDiscussion,
               diffPositionByLineCode: {
                 ABC_1_1: {
-                  baseSha: 'abc',
-                  headSha: 'def',
-                  startSha: 'ghi',
-                  newLine: null,
-                  newPath: 'file1',
-                  oldLine: 5,
-                  oldPath: 'file2',
-                  lineCode: 'ABC_1_1',
-                  positionType: 'text',
+                  base_sha: 'abc',
+                  head_sha: 'def',
+                  start_sha: 'ghi',
+                  new_line: null,
+                  new_path: 'file1',
+                  old_line: 5,
+                  old_path: 'file2',
+                  line_code: 'ABC_1_1',
+                  position_type: 'text',
                 },
               },
             },
           },
         ],
         [],
-        () => {
-          done();
-        },
+        done,
       );
     });
   });
@@ -191,11 +189,11 @@ describe('DiffsStoreActions', () => {
       const state = {
         diffFiles: [
           {
-            fileHash: 'ABC',
-            parallelDiffLines: [
+            file_hash: 'ABC',
+            parallel_diff_lines: [
               {
                 left: {
-                  lineCode: 'ABC_1_1',
+                  line_code: 'ABC_1_1',
                   discussions: [
                     {
                       id: 1,
@@ -203,14 +201,14 @@ describe('DiffsStoreActions', () => {
                   ],
                 },
                 right: {
-                  lineCode: 'ABC_1_1',
+                  line_code: 'ABC_1_1',
                   discussions: [],
                 },
               },
             ],
-            highlightedDiffLines: [
+            highlighted_diff_lines: [
               {
-                lineCode: 'ABC_1_1',
+                line_code: 'ABC_1_1',
                 discussions: [],
               },
             ],
@@ -219,7 +217,7 @@ describe('DiffsStoreActions', () => {
       };
       const singleDiscussion = {
         id: '1',
-        fileHash: 'ABC',
+        file_hash: 'ABC',
         line_code: 'ABC_1_1',
       };
 
@@ -238,9 +236,7 @@ describe('DiffsStoreActions', () => {
           },
         ],
         [],
-        () => {
-          done();
-        },
+        done,
       );
     });
   });

spec/javascripts/diffs/store/getters_spec.js

@@ -195,12 +195,12 @@ describe('Diffs Module Getters', () => {
       discussionMock.expanded = true;
 
       line.left = {
-        lineCode: 'ABC',
+        line_code: 'ABC',
         discussions: [discussionMock],
       };
 
       line.right = {
-        lineCode: 'DEF',
+        line_code: 'DEF',
         discussions: [discussionMock1],
       };
     });
@@ -259,7 +259,7 @@ describe('Diffs Module Getters', () => {
 
   describe('getDiffFileDiscussions', () => {
     it('returns an array with discussions when fileHash matches and the discussion belongs to a diff', () => {
-      discussionMock.diff_file.file_hash = diffFileMock.fileHash;
+      discussionMock.diff_file.file_hash = diffFileMock.file_hash;
 
       expect(
         getters.getDiffFileDiscussions(localState, {}, {}, { discussions: [discussionMock] })(
@@ -279,10 +279,10 @@ describe('Diffs Module Getters', () => {
   describe('getDiffFileByHash', () => {
     it('returns file by hash', () => {
       const fileA = {
-        fileHash: '123',
+        file_hash: '123',
       };
       const fileB = {
-        fileHash: '456',
+        file_hash: '456',
       };
       localState.diffFiles = [fileA, fileB];
 

spec/javascripts/diffs/store/mutations_spec.js

@@ -37,7 +37,7 @@ describe('DiffsStoreMutations', () => {
 
       mutations[types.SET_DIFF_DATA](state, diffMock);
 
-      const firstLine = state.diffFiles[0].parallelDiffLines[0];
+      const firstLine = state.diffFiles[0].parallel_diff_lines[0];
 
       expect(firstLine.right.text).toBeUndefined();
       expect(state.diffFiles[0].renderIt).toEqual(true);
@@ -98,19 +98,19 @@ describe('DiffsStoreMutations', () => {
     it('should call utils.addContextLines with proper params', () => {
       const options = {
         lineNumbers: { oldLineNumber: 1, newLineNumber: 2 },
-        contextLines: [{ oldLine: 1, newLine: 1, lineCode: 'ff9200_1_1', discussions: [] }],
+        contextLines: [{ old_line: 1, new_line: 1, line_code: 'ff9200_1_1', discussions: [] }],
         fileHash: 'ff9200',
         params: {
           bottom: true,
         },
       };
       const diffFile = {
-        fileHash: options.fileHash,
-        highlightedDiffLines: [],
-        parallelDiffLines: [],
+        file_hash: options.fileHash,
+        highlighted_diff_lines: [],
+        parallel_diff_lines: [],
       };
       const state = { diffFiles: [diffFile] };
-      const lines = [{ oldLine: 1, newLine: 1 }];
+      const lines = [{ old_line: 1, new_line: 1 }];
 
       const findDiffFileSpy = spyOnDependency(mutations, 'findDiffFile').and.returnValue(diffFile);
       const removeMatchLineSpy = spyOnDependency(mutations, 'removeMatchLine');
@@ -133,8 +133,8 @@ describe('DiffsStoreMutations', () => {
       );
 
       expect(addContextLinesSpy).toHaveBeenCalledWith({
-        inlineLines: diffFile.highlightedDiffLines,
-        parallelLines: diffFile.parallelDiffLines,
+        inlineLines: diffFile.highlighted_diff_lines,
+        parallelLines: diffFile.parallel_diff_lines,
         contextLines: options.contextLines,
         bottom: options.params.bottom,
         lineNumbers: options.lineNumbers,
@@ -144,54 +144,50 @@ describe('DiffsStoreMutations', () => {
 
   describe('ADD_COLLAPSED_DIFFS', () => {
     it('should update the state with the given data for the given file hash', () => {
-      const spy = spyOnDependency(mutations, 'convertObjectPropsToCamelCase').and.callThrough();
-
       const fileHash = 123;
-      const state = { diffFiles: [{}, { fileHash, existingField: 0 }] };
-      const data = { diff_files: [{ file_hash: fileHash, extra_field: 1, existingField: 1 }] };
+      const state = { diffFiles: [{}, { file_hash: fileHash, existing_field: 0 }] };
+      const data = { diff_files: [{ file_hash: fileHash, extra_field: 1, existing_field: 1 }] };
 
       mutations[types.ADD_COLLAPSED_DIFFS](state, { file: state.diffFiles[1], data });
 
-      expect(spy).toHaveBeenCalledWith(data, { deep: true });
-
-      expect(state.diffFiles[1].fileHash).toEqual(fileHash);
-      expect(state.diffFiles[1].existingField).toEqual(1);
-      expect(state.diffFiles[1].extraField).toEqual(1);
+      expect(state.diffFiles[1].file_hash).toEqual(fileHash);
+      expect(state.diffFiles[1].existing_field).toEqual(1);
+      expect(state.diffFiles[1].extra_field).toEqual(1);
     });
   });
 
   describe('SET_LINE_DISCUSSIONS_FOR_FILE', () => {
     it('should add discussions to the given line', () => {
       const diffPosition = {
-        baseSha: 'ed13df29948c41ba367caa757ab3ec4892509910',
-        headSha: 'b921914f9a834ac47e6fd9420f78db0f83559130',
-        newLine: null,
-        newPath: '500-lines-4.txt',
-        oldLine: 5,
-        oldPath: '500-lines-4.txt',
-        startSha: 'ed13df29948c41ba367caa757ab3ec4892509910',
+        base_sha: 'ed13df29948c41ba367caa757ab3ec4892509910',
+        head_sha: 'b921914f9a834ac47e6fd9420f78db0f83559130',
+        new_line: null,
+        new_path: '500-lines-4.txt',
+        old_line: 5,
+        old_path: '500-lines-4.txt',
+        start_sha: 'ed13df29948c41ba367caa757ab3ec4892509910',
       };
 
       const state = {
         latestDiff: true,
         diffFiles: [
           {
-            fileHash: 'ABC',
-            parallelDiffLines: [
+            file_hash: 'ABC',
+            parallel_diff_lines: [
               {
                 left: {
-                  lineCode: 'ABC_1',
+                  line_code: 'ABC_1',
                   discussions: [],
                 },
                 right: {
-                  lineCode: 'ABC_1',
+                  line_code: 'ABC_1',
                   discussions: [],
                 },
               },
             ],
-            highlightedDiffLines: [
+            highlighted_diff_lines: [
               {
-                lineCode: 'ABC_1',
+                line_code: 'ABC_1',
                 discussions: [],
               },
             ],
@@ -206,7 +202,7 @@ describe('DiffsStoreMutations', () => {
         original_position: diffPosition,
         position: diffPosition,
         diff_file: {
-          file_hash: state.diffFiles[0].fileHash,
+          file_hash: state.diffFiles[0].file_hash,
         },
       };
 
@@ -219,46 +215,46 @@ describe('DiffsStoreMutations', () => {
         diffPositionByLineCode,
       });
 
-      expect(state.diffFiles[0].parallelDiffLines[0].left.discussions.length).toEqual(1);
-      expect(state.diffFiles[0].parallelDiffLines[0].left.discussions[0].id).toEqual(1);
-      expect(state.diffFiles[0].parallelDiffLines[0].right.discussions).toEqual([]);
+      expect(state.diffFiles[0].parallel_diff_lines[0].left.discussions.length).toEqual(1);
+      expect(state.diffFiles[0].parallel_diff_lines[0].left.discussions[0].id).toEqual(1);
+      expect(state.diffFiles[0].parallel_diff_lines[0].right.discussions).toEqual([]);
 
-      expect(state.diffFiles[0].highlightedDiffLines[0].discussions.length).toEqual(1);
-      expect(state.diffFiles[0].highlightedDiffLines[0].discussions[0].id).toEqual(1);
+      expect(state.diffFiles[0].highlighted_diff_lines[0].discussions.length).toEqual(1);
+      expect(state.diffFiles[0].highlighted_diff_lines[0].discussions[0].id).toEqual(1);
     });
 
     it('should add legacy discussions to the given line', () => {
       const diffPosition = {
-        baseSha: 'ed13df29948c41ba367caa757ab3ec4892509910',
-        headSha: 'b921914f9a834ac47e6fd9420f78db0f83559130',
-        newLine: null,
-        newPath: '500-lines-4.txt',
-        oldLine: 5,
-        oldPath: '500-lines-4.txt',
-        startSha: 'ed13df29948c41ba367caa757ab3ec4892509910',
-        lineCode: 'ABC_1',
+        base_sha: 'ed13df29948c41ba367caa757ab3ec4892509910',
+        head_sha: 'b921914f9a834ac47e6fd9420f78db0f83559130',
+        new_line: null,
+        new_path: '500-lines-4.txt',
+        old_line: 5,
+        old_path: '500-lines-4.txt',
+        start_sha: 'ed13df29948c41ba367caa757ab3ec4892509910',
+        line_code: 'ABC_1',
       };
 
       const state = {
         latestDiff: true,
         diffFiles: [
           {
-            fileHash: 'ABC',
-            parallelDiffLines: [
+            file_hash: 'ABC',
+            parallel_diff_lines: [
               {
                 left: {
-                  lineCode: 'ABC_1',
+                  line_code: 'ABC_1',
                   discussions: [],
                 },
                 right: {
-                  lineCode: 'ABC_1',
+                  line_code: 'ABC_1',
                   discussions: [],
                 },
               },
             ],
-            highlightedDiffLines: [
+            highlighted_diff_lines: [
               {
-                lineCode: 'ABC_1',
+                line_code: 'ABC_1',
                 discussions: [],
               },
             ],
@@ -271,7 +267,7 @@ describe('DiffsStoreMutations', () => {
         diff_discussion: true,
         active: true,
         diff_file: {
-          file_hash: state.diffFiles[0].fileHash,
+          file_hash: state.diffFiles[0].file_hash,
         },
       };
 
@@ -284,11 +280,11 @@ describe('DiffsStoreMutations', () => {
         diffPositionByLineCode,
       });
 
-      expect(state.diffFiles[0].parallelDiffLines[0].left.discussions.length).toEqual(1);
-      expect(state.diffFiles[0].parallelDiffLines[0].left.discussions[0].id).toEqual(1);
+      expect(state.diffFiles[0].parallel_diff_lines[0].left.discussions.length).toEqual(1);
+      expect(state.diffFiles[0].parallel_diff_lines[0].left.discussions[0].id).toEqual(1);
 
-      expect(state.diffFiles[0].highlightedDiffLines[0].discussions.length).toEqual(1);
-      expect(state.diffFiles[0].highlightedDiffLines[0].discussions[0].id).toEqual(1);
+      expect(state.diffFiles[0].highlighted_diff_lines[0].discussions.length).toEqual(1);
+      expect(state.diffFiles[0].highlighted_diff_lines[0].discussions[0].id).toEqual(1);
     });
   });
 
@@ -297,11 +293,11 @@ describe('DiffsStoreMutations', () => {
       const state = {
         diffFiles: [
           {
-            fileHash: 'ABC',
-            parallelDiffLines: [
+            file_hash: 'ABC',
+            parallel_diff_lines: [
               {
                 left: {
-                  lineCode: 'ABC_1',
+                  line_code: 'ABC_1',
                   discussions: [
                     {
                       id: 1,
@@ -314,14 +310,14 @@ describe('DiffsStoreMutations', () => {
                   ],
                 },
                 right: {
-                  lineCode: 'ABC_1',
+                  line_code: 'ABC_1',
                   discussions: [],
                 },
               },
             ],
-            highlightedDiffLines: [
+            highlighted_diff_lines: [
               {
-                lineCode: 'ABC_1',
+                line_code: 'ABC_1',
                 discussions: [
                   {
                     id: 1,
@@ -343,8 +339,8 @@ describe('DiffsStoreMutations', () => {
         lineCode: 'ABC_1',
       });
 
-      expect(state.diffFiles[0].parallelDiffLines[0].left.discussions.length).toEqual(0);
-      expect(state.diffFiles[0].highlightedDiffLines[0].discussions.length).toEqual(0);
+      expect(state.diffFiles[0].parallel_diff_lines[0].left.discussions.length).toEqual(0);
+      expect(state.diffFiles[0].highlighted_diff_lines[0].discussions.length).toEqual(0);
     });
   });
 

spec/javascripts/notes/components/diff_with_note_spec.js

 import Vue from 'vue';
 import DiffWithNote from '~/notes/components/diff_with_note.vue';
-import { convertObjectPropsToCamelCase } from '~/lib/utils/common_utils';
 import { createStore } from '~/mr_notes/stores';
 import { mountComponentWithStore } from 'spec/helpers';
 
@@ -11,7 +10,7 @@ describe('diff_with_note', () => {
   let store;
   let vm;
   const diffDiscussionMock = getJSONFixture(discussionFixture)[0];
-  const diffDiscussion = convertObjectPropsToCamelCase(diffDiscussionMock);
+  const diffDiscussion = diffDiscussionMock;
   const Component = Vue.extend(DiffWithNote);
   const props = {
     discussion: diffDiscussion,
@@ -65,7 +64,7 @@ describe('diff_with_note', () => {
   describe('image diff', () => {
     beforeEach(() => {
       const imageDiffDiscussionMock = getJSONFixture(imageDiscussionFixture)[0];
-      props.discussion = convertObjectPropsToCamelCase(imageDiffDiscussionMock);
+      props.discussion = imageDiffDiscussionMock;
     });
 
     it('shows image diff', () => {