Merge branch 'master' into sh-support-bitbucket-server-import

.gitlab-ci.yml

-image: "dev.gitlab.org:5005/gitlab/gitlab-build-images:ruby-2.4.4-golang-1.9-git-2.17-chrome-67.0-node-8.x-yarn-1.2-postgresql-9.6-graphicsmagick-1.3.29"
+image: "dev.gitlab.org:5005/gitlab/gitlab-build-images:ruby-2.4.4-golang-1.9-git-2.18-chrome-67.0-node-8.x-yarn-1.2-postgresql-9.6-graphicsmagick-1.3.29"
 
 .dedicated-runner: &dedicated-runner
   retry: 1
@@ -86,7 +86,9 @@ stages:
 .rails5: &rails5
   allow_failure: true
   only:
-    - /rails5/
+    variables:
+      - $CI_COMMIT_REF_NAME =~ /rails5/
+      - $RAILS5_ENABLED
   variables:
     BUNDLE_GEMFILE: "Gemfile.rails5"
     RAILS5: "true"
@@ -327,7 +329,7 @@ cloud-native-image:
   cache: {}
   script:
     - gem install gitlab --no-ri --no-rdoc
-    - ./scripts/trigger-build cng
+    - BUILD_TRIGGER_TOKEN=$CI_JOB_TOKEN scripts/trigger-build cng
   only:
     - tags@gitlab-org/gitlab-ce
     - tags@gitlab-org/gitlab-ee
@@ -348,24 +350,6 @@ retrieve-tests-metadata:
     - wget -O $FLAKY_RSPEC_SUITE_REPORT_PATH http://${TESTS_METADATA_S3_BUCKET}.s3.amazonaws.com/$FLAKY_RSPEC_SUITE_REPORT_PATH || rm $FLAKY_RSPEC_SUITE_REPORT_PATH
     - '[[ -f $FLAKY_RSPEC_SUITE_REPORT_PATH ]] || echo "{}" > ${FLAKY_RSPEC_SUITE_REPORT_PATH}'
 
-danger-review:
-  image: registry.gitlab.com/gitlab-org/gitaly/dangercontainer:latest
-  stage: prepare
-  before_script:
-    - source scripts/utils.sh
-    - retry gem install danger --no-ri --no-rdoc
-  cache: {}
-  only:
-    refs:
-      - branches@gitlab-org/gitlab-ce
-      - branches@gitlab-org/gitlab-ee
-  except:
-    variables:
-      - $CI_COMMIT_REF_NAME =~ /^ce-to-ee-.*/
-  script:
-    - git version
-    - danger --fail-on-errors=true
-
 update-tests-metadata:
   <<: *tests-metadata-state
   <<: *only-canonical-masters
@@ -454,6 +438,27 @@ setup-test-env:
       - config/secrets.yml
       - vendor/gitaly-ruby
 
+danger-review:
+  image: registry.gitlab.com/gitlab-org/gitaly/dangercontainer:latest
+  stage: test
+  allow_failure: true
+  before_script:
+    - source scripts/utils.sh
+    - retry gem install danger --no-ri --no-rdoc
+  cache: {}
+  only:
+    refs:
+      - branches@gitlab-org/gitlab-ce
+      - branches@gitlab-org/gitlab-ee
+  except:
+    refs:
+      - master
+    variables:
+      - $CI_COMMIT_REF_NAME =~ /^ce-to-ee-.*/
+  script:
+    - git version
+    - danger --fail-on-errors=true
+
 rspec-pg 0 30: *rspec-metadata-pg
 rspec-pg 1 30: *rspec-metadata-pg
 rspec-pg 2 30: *rspec-metadata-pg

.gitlab/merge_request_templates/Database changes.md

@@ -34,17 +34,17 @@ When removing columns, tables, indexes or other structures:
 ## General checklist
 
 - [ ] [Changelog entry](https://docs.gitlab.com/ee/development/changelog.html) added, if necessary
-- [ ] [Documentation created/updated](https://docs.gitlab.com/ee/development/doc_styleguide.html)
-- [ ] API support added
-- [ ] Tests added for this feature/bug
-- Conform by the [code review guidelines](https://docs.gitlab.com/ee/development/code_review.html)
-  - [ ] Has been reviewed by a Backend maintainer
-  - [ ] Has been reviewed by a Database specialist
-- [ ] Conform by the [merge request performance guides](https://docs.gitlab.com/ee/development/merge_request_performance_guidelines.html)
-- [ ] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ee/blob/master/CONTRIBUTING.md#style-guides)
+- [ ] [Documentation created/updated](https://docs.gitlab.com/ee/development/documentation/index.html#contributing-to-docs)
+- [ ] [API support added](https://docs.gitlab.com/ee/development/api_styleguide.html)
+- [ ] [Tests added for this feature/bug](https://docs.gitlab.com/ee/development/testing_guide/index.html)
+- Conforms to the [code review guidelines](https://docs.gitlab.com/ee/development/code_review.html)
+  - [ ] Has been reviewed by a Backend [maintainer](https://about.gitlab.com/handbook/engineering/#maintainer)
+  - [ ] Has been reviewed by a Database [specialist](https://about.gitlab.com/team/structure/#specialist)
+- [ ] Conforms to the [merge request performance guidelines](https://docs.gitlab.com/ee/development/merge_request_performance_guidelines.html)
+- [ ] Conforms to the [style guides](https://gitlab.com/gitlab-org/gitlab-ee/blob/master/CONTRIBUTING.md#style-guides)
 - [ ] If you have multiple commits, please combine them into a few logically organized commits by [squashing them](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)
-- [ ] Internationalization required/considered
-- [ ] If paid feature, have we considered GitLab.com plan and how it works for groups and is there a design for promoting it to users who aren't on the correct plan
-- [ ] End-to-end tests pass (`package-and-qa` manual pipeline job)
+- [ ] [Internationalization required/considered](https://docs.gitlab.com/ee/development/i18n/index.html)
+- [ ] For a paid feature, have we considered GitLab.com plans, how it works for groups, and is there a design for promoting it to users who aren't on the correct plan?
+- [ ] [End-to-end tests](https://docs.gitlab.com/ee/development/testing_guide/end_to_end_tests.html#testing-code-in-merge-requests) pass (`package-and-qa` manual pipeline job)
 
 /label ~database

.gitlab/merge_request_templates/Documentation.md

-<!--See the general Documentation guidelines https://docs.gitlab.com/ce/development/writing_documentation.html -->
+<!--See the general Documentation guidelines https://docs.gitlab.com/ee/development/documentation/index.html -->
 
 ## What does this MR do?
 
@@ -13,17 +13,17 @@ Closes
 ## Moving docs to a new location?
 
 Read the guidelines:
-https://docs.gitlab.com/ce/development/writing_documentation.html#changing-document-location
+https://docs.gitlab.com/ee/development/documentation/#changing-document-location
 
 - [ ] Make sure the old link is not removed and has its contents replaced with
       a link to the new location.
 - [ ] Make sure internal links pointing to the document in question are not broken.
-- [ ] Search and replace any links referring to old docs in GitLab Rails app,
+- [ ] Search and replace any links referring to the old docs in the GitLab Rails app,
       specifically under the `app/views/` and `ee/app/views` (for GitLab EE) directories.
-- [ ] Make sure to add [`redirect_from`](https://docs.gitlab.com/ce/development/writing_documentation.html#redirections-for-pages-with-disqus-comments)
+- [ ] Make sure to add [`redirect_from`](https://docs.gitlab.com/ee/development/documentation/index.html#redirections-for-pages-with-disqus-comments)
       to the new document if there are any Disqus comments on the old document thread.
-- [ ] If working on CE and the `ee-compat-check` jobs fails, submit an MR to EE
-      with the changes as well (https://docs.gitlab.com/ce/development/writing_documentation.html#cherry-picking-from-ce-to-ee).
+- [ ] If working on CE and the `ee-compat-check` jobs fails, [submit an MR to EE
+      with the changes](https://docs.gitlab.com/ee/development/documentation/index.html#cherry-picking-from-ce-to-ee) as well.
 - [ ] Ping one of the technical writers for review.
 
 /label ~Documentation

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

@@ -85,6 +85,9 @@ export default {
       }
       return __('Show latest version');
     },
+    canCurrentUserFork() {
+      return this.currentUser.canFork === true && this.currentUser.canCreateMergeRequest;
+    },
   },
   watch: {
     diffViewType() {
@@ -192,7 +195,7 @@ export default {
           v-for="file in diffFiles"
           :key="file.newPath"
           :file="file"
-          :current-user="currentUser"
+          :can-current-user-fork="canCurrentUserFork"
         />
       </div>
       <no-changes v-else />

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

@@ -18,8 +18,8 @@ export default {
       type: Object,
       required: true,
     },
-    currentUser: {
-      type: Object,
+    canCurrentUserFork: {
+      type: Boolean,
       required: true,
     },
   },
@@ -87,7 +87,7 @@ export default {
     class="diff-file file-holder"
   >
     <diff-file-header
-      :current-user="currentUser"
+      :can-current-user-fork="canCurrentUserFork"
       :diff-file="file"
       :collapsible="true"
       :expanded="!isCollapsed"

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

@@ -39,8 +39,8 @@ export default {
       required: false,
       default: true,
     },
-    currentUser: {
-      type: Object,
+    canCurrentUserFork: {
+      type: Boolean,
       required: true,
     },
   },
@@ -228,7 +228,7 @@ export default {
 
         <edit-button
           v-if="!diffFile.deletedFile"
-          :current-user="currentUser"
+          :can-current-user-fork="canCurrentUserFork"
           :edit-path="diffFile.editPath"
           :can-modify-blob="diffFile.canModifyBlob"
           @showForkMessage="showForkMessage"

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

@@ -13,12 +13,8 @@ export default {
     noteForm,
   },
   props: {
-    diffFile: {
-      type: Object,
-      required: true,
-    },
-    diffLines: {
-      type: Array,
+    diffFileHash: {
+      type: String,
       required: true,
     },
     line: {
@@ -40,6 +36,7 @@ export default {
       noteableData: state => state.notes.noteableData,
       diffViewType: state => state.diffs.diffViewType,
     }),
+    ...mapGetters('diffs', ['getDiffFileByHash']),
     ...mapGetters(['isLoggedIn', 'noteableType', 'getNoteableData', 'getNotesDataByProp']),
   },
   mounted() {
@@ -68,13 +65,14 @@ export default {
       });
     },
     handleSaveNote(note) {
+      const selectedDiffFile = this.getDiffFileByHash(this.diffFileHash);
       const postData = getNoteFormData({
         note,
         noteableData: this.noteableData,
         noteableType: this.noteableType,
         noteTargetLine: this.noteTargetLine,
         diffViewType: this.diffViewType,
-        diffFile: this.diffFile,
+        diffFile: selectedDiffFile,
         linePosition: this.position,
       });
 

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

@@ -24,8 +24,12 @@ export default {
       type: Object,
       required: true,
     },
-    diffFile: {
-      type: Object,
+    fileHash: {
+      type: String,
+      required: true,
+    },
+    contextLinesPath: {
+      type: String,
       required: true,
     },
     diffViewType: {
@@ -120,14 +124,14 @@ export default {
     :class="classNameMap"
   >
     <diff-line-gutter-content
-      :file-hash="diffFile.fileHash"
+      :file-hash="fileHash"
+      :context-lines-path="contextLinesPath"
       :line-type="normalizedLine.type"
       :line-code="normalizedLine.lineCode"
       :line-position="linePosition"
       :line-number="lineNumber"
       :meta-data="normalizedLine.metaData"
       :show-comment-button="showCommentButton"
-      :context-lines-path="diffFile.contextLinesPath"
       :is-bottom="isBottom"
       :is-match-line="isMatchLine"
       :is-context-line="isContentLine"

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

@@ -5,8 +5,8 @@ export default {
       type: String,
       required: true,
     },
-    currentUser: {
-      type: Object,
+    canCurrentUserFork: {
+      type: Boolean,
       required: true,
     },
     canModifyBlob: {
@@ -17,12 +17,12 @@ export default {
   },
   methods: {
     handleEditClick(evt) {
-      if (!this.currentUser || this.canModifyBlob) {
+      if (!this.canCurrentUserFork || this.canModifyBlob) {
         // if we can Edit, do default Edit button behavior
         return;
       }
 
-      if (this.currentUser.canFork && this.currentUser.canCreateMergeRequest) {
+      if (this.canCurrentUserFork) {
         evt.preventDefault();
         this.$emit('showForkMessage');
       }

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

@@ -13,12 +13,8 @@ export default {
       type: Object,
       required: true,
     },
-    diffFile: {
-      type: Object,
-      required: true,
-    },
-    diffLines: {
-      type: Array,
+    diffFileHash: {
+      type: String,
       required: true,
     },
     lineIndex: {
@@ -58,10 +54,9 @@ export default {
         />
         <diff-line-note-form
           v-if="diffLineCommentForms[line.lineCode]"
-          :diff-file="diffFile"
-          :diff-lines="diffLines"
+          :diff-file-hash="diffFileHash"
           :line="line"
-          :note-target-line="diffLines[lineIndex]"
+          :note-target-line="line"
         />
       </div>
     </td>

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

@@ -16,8 +16,12 @@ export default {
     DiffTableCell,
   },
   props: {
-    diffFile: {
-      type: Object,
+    fileHash: {
+      type: String,
+      required: true,
+    },
+    contextLinesPath: {
+      type: String,
       required: true,
     },
     line: {
@@ -50,7 +54,7 @@ export default {
     inlineRowId() {
       const { lineCode, oldLine, newLine } = this.line;
 
-      return lineCode || `${this.diffFile.fileHash}_${oldLine}_${newLine}`;
+      return lineCode || `${this.fileHash}_${oldLine}_${newLine}`;
     },
   },
   created() {
@@ -78,7 +82,8 @@ export default {
     @mouseout="handleMouseMove"
   >
     <diff-table-cell
-      :diff-file="diffFile"
+      :file-hash="fileHash"
+      :context-lines-path="contextLinesPath"
       :line="line"
       :line-type="oldLineType"
       :is-bottom="isBottom"
@@ -87,7 +92,8 @@ export default {
       class="diff-line-num old_line"
     />
     <diff-table-cell
-      :diff-file="diffFile"
+      :file-hash="fileHash"
+      :context-lines-path="contextLinesPath"
       :line="line"
       :line-type="newLineType"
       :is-bottom="isBottom"

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

@@ -60,15 +60,15 @@ export default {
         v-for="(line, index) in normalizedDiffLines"
       >
         <inline-diff-table-row
-          :diff-file="diffFile"
+          :file-hash="diffFile.fileHash"
+          :context-lines-path="diffFile.contextLinesPath"
           :line="line"
           :is-bottom="index + 1 === diffLinesLength"
           :key="line.lineCode"
         />
         <inline-diff-comment-row
           v-if="shouldRenderCommentRow(line)"
-          :diff-file="diffFile"
-          :diff-lines="normalizedDiffLines"
+          :diff-file-hash="diffFile.fileHash"
           :line="line"
           :line-index="index"
           :key="index"

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

@@ -13,12 +13,8 @@ export default {
       type: Object,
       required: true,
     },
-    diffFile: {
-      type: Object,
-      required: true,
-    },
-    diffLines: {
-      type: Array,
+    diffFileHash: {
+      type: String,
       required: true,
     },
     lineIndex: {
@@ -91,10 +87,9 @@ export default {
       <diff-line-note-form
         v-if="diffLineCommentForms[leftLineCode] &&
         diffLineCommentForms[leftLineCode]"
-        :diff-file="diffFile"
-        :diff-lines="diffLines"
+        :diff-file-hash="diffFileHash"
         :line="line.left"
-        :note-target-line="diffLines[lineIndex].left"
+        :note-target-line="line.left"
         position="left"
       />
     </td>
@@ -112,10 +107,9 @@ export default {
       <diff-line-note-form
         v-if="diffLineCommentForms[rightLineCode] &&
         diffLineCommentForms[rightLineCode] && line.right.type"
-        :diff-file="diffFile"
-        :diff-lines="diffLines"
+        :diff-file-hash="diffFileHash"
         :line="line.right"
-        :note-target-line="diffLines[lineIndex].right"
+        :note-target-line="line.right"
         position="right"
       />
     </td>

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

@@ -19,8 +19,12 @@ export default {
     DiffTableCell,
   },
   props: {
-    diffFile: {
-      type: Object,
+    fileHash: {
+      type: String,
+      required: true,
+    },
+    contextLinesPath: {
+      type: String,
       required: true,
     },
     line: {
@@ -103,7 +107,8 @@ export default {
     @mouseout="handleMouseMove"
   >
     <diff-table-cell
-      :diff-file="diffFile"
+      :file-hash="fileHash"
+      :context-lines-path="contextLinesPath"
       :line="line"
       :line-type="oldLineType"
       :line-position="linePositionLeft"
@@ -123,7 +128,8 @@ export default {
     >
     </td>
     <diff-table-cell
-      :diff-file="diffFile"
+      :file-hash="fileHash"
+      :context-lines-path="contextLinesPath"
       :line="line"
       :line-type="newLineType"
       :line-position="linePositionRight"

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

@@ -93,17 +93,17 @@ export default {
           v-for="(line, index) in parallelDiffLines"
         >
           <parallel-diff-table-row
-            :diff-file="diffFile"
+            :file-hash="diffFile.fileHash"
+            :context-lines-path="diffFile.contextLinesPath"
             :line="line"
             :is-bottom="index + 1 === diffLinesLength"
             :key="index"
           />
           <parallel-diff-comment-row
             v-if="shouldRenderCommentRow(line)"
-            :key="line.left.lineCode || line.right.lineCode"
+            :key="`dcr-${index}`"
             :line="line"
-            :diff-file="diffFile"
-            :diff-lines="parallelDiffLines"
+            :diff-file-hash="diffFile.fileHash"
             :line-index="index"
           />
         </template>

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

@@ -57,4 +57,8 @@ export const getDiffFileDiscussions = (state, getters, rootState, rootGetters) =
   ) || [];
 
 // prevent babel-plugin-rewire from generating an invalid default during karma∂ tests
+export const getDiffFileByHash = state => fileHash =>
+  state.diffFiles.find(file => file.fileHash === fileHash);
+
+// prevent babel-plugin-rewire from generating an invalid default during karma tests
 export default () => {};

app/assets/javascripts/ide/components/new_dropdown/button.vue

@@ -38,6 +38,7 @@ export default {
   <button
     :aria-label="label"
     type="button"
+    class="btn-blank"
     @click.stop.prevent="clicked"
   >
     <icon

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

 <script>
-  import { mapState, mapActions } from 'vuex';
-  import imageDiffHelper from '~/image_diff/helpers/index';
-  import { convertObjectPropsToCamelCase } from '~/lib/utils/common_utils';
-  import DiffFileHeader from '~/diffs/components/diff_file_header.vue';
-  import SkeletonLoadingContainer from '~/vue_shared/components/skeleton_loading_container.vue';
-  import { trimFirstCharOfLineContent } from '~/diffs/store/utils';
+import { mapState, mapActions } from 'vuex';
+import imageDiffHelper from '~/image_diff/helpers/index';
+import { convertObjectPropsToCamelCase } from '~/lib/utils/common_utils';
+import DiffFileHeader from '~/diffs/components/diff_file_header.vue';
+import SkeletonLoadingContainer from '~/vue_shared/components/skeleton_loading_container.vue';
+import { trimFirstCharOfLineContent } from '~/diffs/store/utils';
 
-  export default {
+export default {
   components: {
     DiffFileHeader,
     SkeletonLoadingContainer,
@@ -27,8 +27,7 @@
       noteableData: state => state.notes.noteableData,
     }),
     hasTruncatedDiffLines() {
-        return this.discussion.truncatedDiffLines &&
-          this.discussion.truncatedDiffLines.length !== 0;
+      return this.discussion.truncatedDiffLines && this.discussion.truncatedDiffLines.length !== 0;
     },
     isDiscussionsExpanded() {
       return true; // TODO: @fatihacet - Fix this.
@@ -49,9 +48,6 @@
     imageDiffHtml() {
       return this.discussion.imageDiffHtml;
     },
-      currentUser() {
-        return this.noteableData.current_user;
-      },
     userColorScheme() {
       return window.gon.user_color_scheme;
     },
@@ -88,7 +84,7 @@
         });
     },
   },
-  };
+};
 </script>
 
 <template>
@@ -99,7 +95,7 @@
   >
     <diff-file-header
       :diff-file="diffFile"
-      :current-user="currentUser"
+      :can-current-user-fork="false"
       :discussions-expanded="isDiscussionsExpanded"
       :expanded="!isCollapsed"
     />

app/assets/javascripts/pipelines/components/stage.vue

@@ -175,6 +175,7 @@ export default {
       <span
         :aria-label="stage.title"
         aria-hidden="true"
+        class="no-pointer-events"
       >
         <icon :name="borderlessIcon" />
       </span>

app/assets/javascripts/vue_shared/components/memory_graph.vue

@@ -126,7 +126,7 @@ export default {
         :cx="dotX"
         :cy="dotY"
         r="1.5"
-        tranform="translate(0 -1)"
+        transform="translate(0 -1)"
       />
     </svg>
   </div>

app/assets/stylesheets/bootstrap_migration.scss

@@ -110,7 +110,7 @@ code {
   padding: 2px 4px;
   color: $red-600;
   background-color: $red-100;
-  border-radius: 3px;
+  border-radius: $border-radius-default;
 
   .code > & {
     background-color: inherit;
@@ -128,7 +128,8 @@ table {
   border-spacing: 0;
 }
 
-.tooltip {
+.tooltip,
+.no-pointer-events {
   // Fix bootstrap4 bug whereby tooltips flicker when they are hovered over their borders
   pointer-events: none;
 }

app/assets/stylesheets/framework/gfm.scss

@@ -9,12 +9,8 @@
 
 .gfm-project_member {
   padding: 0 2px;
-  border-radius: #{$border-radius-default / 2};
-  background-color: $user-mention-bg;
-
-  &:hover {
-    background-color: $user-mention-bg-hover;
-  }
+  background-color: $blue-100;
+  border-radius: $border-radius-default;
 }
 
 .gfm-color_chip {

app/assets/stylesheets/pages/merge_requests.scss

@@ -551,6 +551,7 @@
     @include media-breakpoint-up(lg) {
       .branch-actions {
         align-self: center;
+        margin-left: $gl-padding;
       }
     }
   }

app/controllers/projects/wikis_controller.rb

@@ -116,7 +116,12 @@ class Projects::WikisController < Projects::ApplicationController
 
     # Call #wiki to make sure the Wiki Repo is initialized
     @project_wiki.wiki
+
+    @sidebar_page = @project_wiki.find_sidebar(params[:version_id])
+
+    unless @sidebar_page # Fallback to default sidebar
       @sidebar_wiki_entries = WikiPage.group_by_directory(@project_wiki.pages(limit: 15))
+    end
   rescue ProjectWiki::CouldNotCreateWikiError
     flash[:notice] = "Could not create Wiki Repository at this time. Please try again later."
     redirect_to project_path(@project)

app/finders/projects_finder.rb

@@ -16,6 +16,7 @@
 #     personal: boolean
 #     search: string
 #     non_archived: boolean
+#     archived: 'only' or boolean
 #
 class ProjectsFinder < UnionFinder
   include CustomAttributesFilter
@@ -130,7 +131,7 @@ class ProjectsFinder < UnionFinder
   def by_archived(projects)
     if params[:non_archived]
       projects.non_archived
-    elsif params.key?(:archived) # Back-compatibility with the places where `params[:archived]` can be set explicitly to `false`
+    elsif params.key?(:archived)
       if params[:archived] == 'only'
         projects.archived
       elsif Gitlab::Utils.to_boolean(params[:archived])

app/helpers/projects_helper.rb

@@ -413,20 +413,6 @@ module ProjectsHelper
     @ref || @repository.try(:root_ref)
   end
 
-  # Gitaly migration: https://gitlab.com/gitlab-org/gitaly/issues/1235
-  def sanitize_repo_path(project, message)
-    return '' unless message.present?
-
-    exports_path = File.join(Settings.shared['path'], 'tmp/project_exports')
-    filtered_message = message.strip.gsub(exports_path, "[REPO EXPORT PATH]")
-
-    disk_path = Gitlab::GitalyClient::StorageSettings.allow_disk_access do
-      Gitlab.config.repositories.storages[project.repository_storage].legacy_disk_path
-    end
-
-    filtered_message.gsub(disk_path.chomp('/'), "[REPOS PATH]")
-  end
-
   def project_child_container_class(view_path)
     view_path == "projects/issues/issues" ? "prepend-top-default" : "project-show-#{view_path}"
   end

app/helpers/submodule_helper.rb

@@ -8,7 +8,7 @@ module SubmoduleHelper
     url = repository.submodule_url_for(ref, submodule_item.path)
 
     if url == '.' || url == './'
-      url = File.join(Gitlab.config.gitlab.url, @project.full_path)
+      url = File.join(Gitlab.config.gitlab.url, repository.project.full_path)
     end
 
     if url =~ %r{([^/:]+)/([^/]+(?:\.git)?)\Z}
@@ -31,7 +31,7 @@ module SubmoduleHelper
         [namespace_project_path(namespace, project),
          namespace_project_tree_path(namespace, project, submodule_item.id)]
       elsif relative_self_url?(url)
-        relative_self_links(url, submodule_item.id)
+        relative_self_links(url, submodule_item.id, repository.project)
       elsif github_dot_com_url?(url)
         standard_links('github.com', namespace, project, submodule_item.id)
       elsif gitlab_dot_com_url?(url)
@@ -73,7 +73,7 @@ module SubmoduleHelper
     [base, [base, '/tree/', commit].join('')]
   end
 
-  def relative_self_links(url, commit)
+  def relative_self_links(url, commit, project)
     url.rstrip!
     # Map relative links to a namespace and project
     # For example:
@@ -85,7 +85,7 @@ module SubmoduleHelper
     namespace = components.pop.gsub(/^\.\.$/, '')
 
     if namespace.empty?
-      namespace = @project.namespace.full_path
+      namespace = project.namespace.full_path
     end
 
     begin

app/models/deployment.rb

@@ -92,10 +92,6 @@ class Deployment < ActiveRecord::Base
     @stop_action ||= manual_actions.find_by(name: on_stop)
   end
 
-  def stop_action?
-    stop_action.present?
-  end
-
   def formatted_deployment_time
     created_at.to_time.in_time_zone.to_s(:medium)
   end

app/models/environment.rb

@@ -117,7 +117,7 @@ class Environment < ActiveRecord::Base
     external_url.gsub(%r{\A.*?://}, '')
   end
 
-  def stop_action?
+  def stop_action_available?
     available? && stop_action.present?
   end
 

app/models/note.rb

@@ -202,7 +202,7 @@ class Note < ActiveRecord::Base
   end
 
   def hook_attrs
-    attributes
+    Gitlab::HookData::NoteBuilder.new(self).build
   end
 
   def for_commit?

app/models/project.rb

@@ -2173,12 +2173,15 @@ class Project < ActiveRecord::Base
       merge_requests = source_of_merge_requests.opened
                          .where(allow_collaboration: true)
 
+      # Issue for N+1: https://gitlab.com/gitlab-org/gitlab-ce/issues/49322
+      Gitlab::GitalyClient.allow_n_plus_1_calls do
         if branch_name
           merge_requests.find_by(source_branch: branch_name)&.can_be_merged_by?(user)
         else
           merge_requests.any? { |merge_request| merge_request.can_be_merged_by?(user) }
         end
       end
+    end
 
     if RequestStore.active?
       RequestStore.fetch("project-#{id}:branch-#{branch_name}:user-#{user.id}:branch_allows_collaboration") do

app/models/project_wiki.rb

+# frozen_string_literal: true
+
 class ProjectWiki
   include Gitlab::ShellAdapter
   include Storage::LegacyProjectWiki
@@ -9,6 +11,7 @@ class ProjectWiki
   }.freeze unless defined?(MARKUPS)
 
   CouldNotCreateWikiError = Class.new(StandardError)
+  SIDEBAR = '_sidebar'
 
   # Returns a string describing what went wrong after
   # an operation fails.
@@ -98,6 +101,10 @@ class ProjectWiki
     end
   end
 
+  def find_sidebar(version = nil)
+    find_page(SIDEBAR, version)
+  end
+
   def find_file(name, version = nil)
     wiki.file(name, version)
   end

app/models/wiki_page.rb

@@ -60,7 +60,7 @@ class WikiPage
   attr_accessor :attributes
 
   def hook_attrs
-    attributes
+    Gitlab::HookData::WikiPageBuilder.new(self).build
   end
 
   def initialize(wiki, page = nil, persisted = false)

app/policies/environment_policy.rb

@@ -2,11 +2,12 @@ class EnvironmentPolicy < BasePolicy
   delegate { @subject.project }
 
   condition(:stop_with_deployment_allowed) do
-    @subject.stop_action? && can?(:create_deployment) && can?(:update_build, @subject.stop_action)
+    @subject.stop_action_available? &&
+      can?(:create_deployment) && can?(:update_build, @subject.stop_action)
   end
 
   condition(:stop_with_update_allowed) do
-    !@subject.stop_action? && can?(:update_environment, @subject)
+    !@subject.stop_action_available? && can?(:update_environment, @subject)
   end
 
   rule { stop_with_deployment_allowed | stop_with_update_allowed }.enable :stop_environment

app/serializers/environment_entity.rb

@@ -7,7 +7,7 @@ class EnvironmentEntity < Grape::Entity
   expose :external_url
   expose :environment_type
   expose :last_deployment, using: DeploymentEntity
-  expose :stop_action?, as: :has_stop_action
+  expose :stop_action_available?, as: :has_stop_action
 
   expose :metrics_path, if: -> (environment, _) { environment.has_metrics? } do |environment|
     metrics_project_environment_path(environment.project, environment)

app/services/access_token_validation_service.rb

+# frozen_string_literal: true
+
 class AccessTokenValidationService
   # Results:
   VALID = :valid

app/services/after_branch_delete_service.rb

+# frozen_string_literal: true
+
 ##
 # Branch can be deleted either by DeleteBranchService
 # or by GitPushService.

app/services/akismet_service.rb

+# frozen_string_literal: true
+
 class AkismetService
   attr_accessor :owner, :text, :options
 

app/services/application_settings/base_service.rb

+# frozen_string_literal: true
+
 module ApplicationSettings
   class BaseService < ::BaseService
     def initialize(application_setting, user, params = {})

app/services/application_settings/update_service.rb

+# frozen_string_literal: true
+
 module ApplicationSettings
   class UpdateService < ApplicationSettings::BaseService
     attr_reader :params, :application_setting

app/services/applications/create_service.rb

+# frozen_string_literal: true
+
 module Applications
   class CreateService
     def initialize(current_user, params)

app/services/audit_event_service.rb

+# frozen_string_literal: true
+
 class AuditEventService
   def initialize(author, entity, details = {})
     @author, @entity, @details = author, entity, details

app/services/auth/container_registry_authentication_service.rb

+# frozen_string_literal: true
+
 module Auth
   class ContainerRegistryAuthenticationService < BaseService
     AUDIENCE = 'container_registry'.freeze

app/services/badges/base_service.rb

+# frozen_string_literal: true
+
 module Badges
   class BaseService
     protected

app/services/badges/build_service.rb

+# frozen_string_literal: true
+
 module Badges
   class BuildService < Badges::BaseService
     # returns the created badge

app/services/badges/create_service.rb

+# frozen_string_literal: true
+
 module Badges
   class CreateService < Badges::BaseService
     # returns the created badge

app/services/badges/update_service.rb

+# frozen_string_literal: true
+
 module Badges
   class UpdateService < Badges::BaseService
     # returns the updated badge

app/services/base_count_service.rb

+# frozen_string_literal: true
+
 # Base class for services that count a single resource such as the number of
 # issues for a project.
 class BaseCountService

app/services/base_renderer.rb

+# frozen_string_literal: true
+
 class BaseRenderer
   attr_reader :current_user
 

app/services/base_service.rb

+# frozen_string_literal: true
+
 class BaseService
   include Gitlab::Allowable
 

app/services/boards/base_service.rb

+# frozen_string_literal: true
+
 module Boards
   class BaseService < ::BaseService
     # Parent can either a group or a project

app/services/boards/create_service.rb

+# frozen_string_literal: true
+
 module Boards
   class CreateService < Boards::BaseService
     def execute

app/services/boards/issues/create_service.rb

+# frozen_string_literal: true
+
 module Boards
   module Issues
     class CreateService < Boards::BaseService

app/services/boards/issues/list_service.rb

+# frozen_string_literal: true
+
 module Boards
   module Issues
     class ListService < Boards::BaseService

app/services/boards/issues/move_service.rb

+# frozen_string_literal: true
+
 module Boards
   module Issues
     class MoveService < Boards::BaseService

app/services/boards/list_service.rb

+# frozen_string_literal: true
+
 module Boards
   class ListService < Boards::BaseService
     def execute

app/services/boards/lists/create_service.rb

+# frozen_string_literal: true
+
 module Boards
   module Lists
     class CreateService < Boards::BaseService

app/services/boards/lists/destroy_service.rb

+# frozen_string_literal: true
+
 module Boards
   module Lists
     class DestroyService < Boards::BaseService

app/services/boards/lists/generate_service.rb

+# frozen_string_literal: true
+
 module Boards
   module Lists
     class GenerateService < Boards::BaseService

app/services/boards/lists/list_service.rb

+# frozen_string_literal: true
+
 module Boards
   module Lists
     class ListService < Boards::BaseService

app/services/boards/lists/move_service.rb

+# frozen_string_literal: true
+
 module Boards
   module Lists
     class MoveService < Boards::BaseService

app/services/chat_names/authorize_user_service.rb

+# frozen_string_literal: true
+
 module ChatNames
   class AuthorizeUserService
     include Gitlab::Routing

app/services/chat_names/find_user_service.rb

+# frozen_string_literal: true
+
 module ChatNames
   class FindUserService
     def initialize(service, params)

app/services/ci/create_pipeline_schedule_service.rb

+# frozen_string_literal: true
+
 module Ci
   class CreatePipelineScheduleService < BaseService
     def execute

app/services/ci/create_pipeline_service.rb

+# frozen_string_literal: true
+
 module Ci
   class CreatePipelineService < BaseService
     attr_reader :pipeline

app/services/ci/ensure_stage_service.rb

+# frozen_string_literal: true
+
 module Ci
   ##
   # We call this service everytime we persist a CI/CD job.

app/services/ci/extract_sections_from_build_trace_service.rb

+# frozen_string_literal: true
+
 module Ci
   class ExtractSectionsFromBuildTraceService < BaseService
     def execute(build)

app/services/ci/fetch_kubernetes_token_service.rb

+# frozen_string_literal: true
+
 ##
 # TODO:
 # Almost components in this class were copied from app/models/project_services/kubernetes_service.rb

app/services/ci/pipeline_trigger_service.rb

+# frozen_string_literal: true
+
 module Ci
   class PipelineTriggerService < BaseService
     include Gitlab::Utils::StrongMemoize

app/services/ci/play_build_service.rb

+# frozen_string_literal: true
+
 module Ci
   class PlayBuildService < ::BaseService
     def execute(build)

app/services/ci/process_pipeline_service.rb

+# frozen_string_literal: true
+
 module Ci
   class ProcessPipelineService < BaseService
     attr_reader :pipeline

app/services/ci/register_job_service.rb

+# frozen_string_literal: true
+
 module Ci
   # This class responsible for assigning
   # proper pending build to runner on runner API request

app/services/ci/retry_build_service.rb

+# frozen_string_literal: true
+
 module Ci
   class RetryBuildService < ::BaseService
     CLONE_ACCESSORS = %i[pipeline project ref tag options commands name

app/services/ci/retry_pipeline_service.rb

+# frozen_string_literal: true
+
 module Ci
   class RetryPipelineService < ::BaseService
     include Gitlab::OptimisticLocking

app/services/ci/stop_environments_service.rb

+# frozen_string_literal: true
+
 module Ci
   class StopEnvironmentsService < BaseService
     attr_reader :ref
@@ -8,7 +10,7 @@ module Ci
       return unless @ref.present?
 
       environments.each do |environment|
-        next unless environment.stop_action?
+        next unless environment.stop_action_available?
         next unless can?(current_user, :stop_environment, environment)
 
         environment.stop_with_action!(current_user)

app/services/ci/update_build_queue_service.rb

+# frozen_string_literal: true
+
 module Ci
   class UpdateBuildQueueService
     def execute(build)

app/services/ci/update_runner_service.rb

+# frozen_string_literal: true
+
 module Ci
   class UpdateRunnerService
     attr_reader :runner

app/services/clusters/applications/base_helm_service.rb

+# frozen_string_literal: true
+
 module Clusters
   module Applications
     class BaseHelmService

app/services/clusters/applications/check_ingress_ip_address_service.rb

+# frozen_string_literal: true
+
 module Clusters
   module Applications
     class CheckIngressIpAddressService < BaseHelmService

app/services/clusters/applications/check_installation_progress_service.rb

+# frozen_string_literal: true
+
 module Clusters
   module Applications
     class CheckInstallationProgressService < BaseHelmService

app/services/clusters/applications/install_service.rb

+# frozen_string_literal: true
+
 module Clusters
   module Applications
     class InstallService < BaseHelmService

app/services/clusters/applications/schedule_installation_service.rb

+# frozen_string_literal: true
+
 module Clusters
   module Applications
     class ScheduleInstallationService < ::BaseService

app/services/clusters/create_service.rb

+# frozen_string_literal: true
+
 module Clusters
   class CreateService < BaseService
     attr_reader :access_token

app/services/clusters/gcp/fetch_operation_service.rb

+# frozen_string_literal: true
+
 module Clusters
   module Gcp
     class FetchOperationService

app/services/clusters/gcp/finalize_creation_service.rb

+# frozen_string_literal: true
+
 module Clusters
   module Gcp
     class FinalizeCreationService

app/services/clusters/gcp/provision_service.rb

+# frozen_string_literal: true
+
 module Clusters
   module Gcp
     class ProvisionService

app/services/clusters/gcp/verify_provision_status_service.rb

+# frozen_string_literal: true
+
 module Clusters
   module Gcp
     class VerifyProvisionStatusService

app/services/clusters/update_service.rb

+# frozen_string_literal: true
+
 module Clusters
   class UpdateService < BaseService
     def execute(cluster)

app/services/cohorts_service.rb

+# frozen_string_literal: true
+
 class CohortsService
   MONTHS_INCLUDED = 12
 

app/services/commits/change_service.rb

+# frozen_string_literal: true
+
 module Commits
   class ChangeService < Commits::CreateService
     def initialize(*args)

app/services/commits/cherry_pick_service.rb

+# frozen_string_literal: true
+
 module Commits
   class CherryPickService < ChangeService
     def create_commit!

app/services/commits/create_service.rb

+# frozen_string_literal: true
+
 module Commits
   class CreateService < ::BaseService
     ValidationError = Class.new(StandardError)

app/services/commits/revert_service.rb

+# frozen_string_literal: true
+
 module Commits
   class RevertService < ChangeService
     def create_commit!

app/services/compare_service.rb

+# frozen_string_literal: true
+
 require 'securerandom'
 
 # Compare 2 refs for one repo or between repositories

app/services/concerns/exclusive_lease_guard.rb

+# frozen_string_literal: true
+
 #
 # Concern that helps with getting an exclusive lease for running a block
 # of code.

app/services/concerns/issues/resolve_discussions.rb

+# frozen_string_literal: true
+
 module Issues
   module ResolveDiscussions
     include Gitlab::Utils::StrongMemoize

app/services/concerns/update_visibility_level.rb

+# frozen_string_literal: true
+
 module UpdateVisibilityLevel
   def valid_visibility_level_change?(target, new_visibility)
     # check that user is allowed to set specified visibility_level

app/services/concerns/users/new_user_notifier.rb

+# frozen_string_literal: true
+
 module Users
   module NewUserNotifier
     def notify_new_user(user, reset_token)

app/services/concerns/users/participable_service.rb

+# frozen_string_literal: true
+
 module Users
   module ParticipableService
     extend ActiveSupport::Concern

app/services/create_branch_service.rb

+# frozen_string_literal: true
+
 class CreateBranchService < BaseService
   def execute(branch_name, ref)
     create_master_branch if project.empty_repo?