Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-07-18

# Conflicts:
#	app/assets/javascripts/vue_shared/components/reports/issues_list.vue
#	app/assets/javascripts/vue_shared/components/reports/report_issues.vue
#	locale/gitlab.pot
#	spec/javascripts/vue_shared/components/reports/report_section_spec.js

[ci skip]

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

 <script>
+<<<<<<< HEAD
 import IssuesBlock from '~/vue_shared/components/reports/report_issues.vue';
 
 import SastContainerInfo from 'ee/vue_shared/security_reports/components/sast_container_info.vue';
 import { SAST_CONTAINER } from 'ee/vue_shared/security_reports//store/constants';
+=======
+import IssuesBlock from './report_issues.vue';
+>>>>>>> upstream/master
 
 /**
  * Renders block of issues
@@ -11,9 +15,13 @@ import { SAST_CONTAINER } from 'ee/vue_shared/security_reports//store/constants'
 export default {
   components: {
     IssuesBlock,
+<<<<<<< HEAD
     SastContainerInfo,
   },
   sastContainer: SAST_CONTAINER,
+=======
+  },
+>>>>>>> upstream/master
   props: {
     unresolvedIssues: {
       type: Array,
@@ -59,7 +67,10 @@ export default {
 </script>
 <template>
   <div class="report-block-container">
+<<<<<<< HEAD
     <sast-container-info v-if="type === $options.sastContainer" />
+=======
+>>>>>>> upstream/master
 
     <issues-block
       v-if="unresolvedIssues.length"

app/assets/javascripts/vue_shared/components/reports/report_issues.vue

 <script>
 import Icon from '~/vue_shared/components/icon.vue';
 
+<<<<<<< HEAD
 import PerformanceIssue from 'ee/vue_merge_request_widget/components/performance_issue_body.vue';
 import CodequalityIssue from 'ee/vue_merge_request_widget/components/codequality_issue_body.vue';
 import LicenseIssue from 'ee/vue_merge_request_widget/components/license_issue_body.vue';
@@ -9,23 +10,31 @@ import SastContainerIssue from 'ee/vue_shared/security_reports/components/sast_c
 import DastIssue from 'ee/vue_shared/security_reports/components/dast_issue_body.vue';
 import { SAST, DAST, SAST_CONTAINER } from 'ee/vue_shared/security_reports/store/constants';
 
+=======
+>>>>>>> upstream/master
 export default {
   name: 'ReportIssues',
   components: {
     Icon,
+<<<<<<< HEAD
     SastIssue,
     SastContainerIssue,
     DastIssue,
     PerformanceIssue,
     CodequalityIssue,
     LicenseIssue,
+=======
+>>>>>>> upstream/master
   },
   props: {
     issues: {
       type: Array,
       required: true,
     },
+<<<<<<< HEAD
     // security || codequality || performance || docker || dast || license
+=======
+>>>>>>> upstream/master
     type: {
       type: String,
       required: true,
@@ -55,6 +64,7 @@ export default {
     isStatusNeutral() {
       return this.status === 'neutral';
     },
+<<<<<<< HEAD
     isTypeCodequality() {
       return this.type === 'codequality';
     },
@@ -73,6 +83,8 @@ export default {
     isTypeDast() {
       return this.type === DAST;
     },
+=======
+>>>>>>> upstream/master
   },
 };
 </script>
@@ -94,6 +106,7 @@ export default {
           class="report-block-list-icon append-right-5"
         >
           <icon
+<<<<<<< HEAD
             v-if="isTypeLicense"
             :size="24"
             name="status_created_borderless"
@@ -101,11 +114,14 @@ export default {
           />
           <icon
             v-else
+=======
+>>>>>>> upstream/master
             :name="iconName"
             :size="32"
           />
         </div>
 
+<<<<<<< HEAD
         <sast-issue
           v-if="isTypeSast"
           :issue="issue"
@@ -140,6 +156,8 @@ export default {
           v-else-if="isTypeLicense"
           :issue="issue"
         />
+=======
+>>>>>>> upstream/master
       </li>
     </ul>
   </div>

app/helpers/search_helper.rb

@@ -107,7 +107,8 @@ module SearchHelper
         category: "Groups",
         id: group.id,
         label: "#{search_result_sanitize(group.full_name)}",
-        url: group_path(group)
+        url: group_path(group),
+        avatar_url: group.avatar_url || ''
       }
     end
   end
@@ -121,7 +122,8 @@ module SearchHelper
         id: p.id,
         value: "#{search_result_sanitize(p.name)}",
         label: "#{search_result_sanitize(p.full_name)}",
-        url: project_path(p)
+        url: project_path(p),
+        avatar_url: p.avatar_url || ''
       }
     end
   end

app/models/merge_request_diff.rb

@@ -182,7 +182,7 @@ class MergeRequestDiff < ActiveRecord::Base
   end
 
   def diffs(diff_options = nil)
-    if without_files? && comparison = diff_refs.compare_in(project)
+    if without_files? && comparison = diff_refs&.compare_in(project)
       # It should fetch the repository when diffs are cleaned by the system.
       # We don't keep these for storage overload purposes.
       # See https://gitlab.com/gitlab-org/gitlab-ce/issues/37639

app/services/lfs/file_transformer.rb

+# frozen_string_literal: true
+
 module Lfs
   # Usage: Calling `new_file` check to see if a file should be in LFS and
   #        return a transformed result with `content` and `encoding` to commit.

app/services/lfs/lock_file_service.rb

+# frozen_string_literal: true
+
 module Lfs
   class LockFileService < BaseService
     prepend EE::Lfs::LockFileService

app/services/lfs/locks_finder_service.rb

+# frozen_string_literal: true
+
 module Lfs
   class LocksFinderService < BaseService
     def execute

app/services/lfs/unlock_file_service.rb

+# frozen_string_literal: true
+
 module Lfs
   class UnlockFileService < BaseService
     prepend EE::Lfs::UnlockFileService

app/services/mattermost/create_team_service.rb

+# frozen_string_literal: true
+
 module Mattermost
   class CreateTeamService < ::BaseService
     def initialize(group, current_user)

app/services/members/approve_access_request_service.rb

+# frozen_string_literal: true
+
 module Members
   class ApproveAccessRequestService < Members::BaseService
     prepend EE::Members::ApproveAccessRequestService

app/services/members/base_service.rb

+# frozen_string_literal: true
+
 module Members
   class BaseService < ::BaseService
     # current_user - The user that performs the action

app/services/members/create_service.rb

+# frozen_string_literal: true
+
 module Members
   class CreateService < Members::BaseService
     prepend EE::Members::CreateService

app/services/members/destroy_service.rb

+# frozen_string_literal: true
+
 module Members
   class DestroyService < Members::BaseService
     prepend EE::Members::DestroyService

app/services/members/request_access_service.rb

+# frozen_string_literal: true
+
 module Members
   class RequestAccessService < Members::BaseService
     def execute(source)

app/services/members/update_service.rb

+# frozen_string_literal: true
+
 module Members
   class UpdateService < Members::BaseService
     prepend EE::Members::UpdateService

app/services/merge_requests/add_todo_when_build_fails_service.rb

+# frozen_string_literal: true
+
 module MergeRequests
   class AddTodoWhenBuildFailsService < MergeRequests::BaseService
     # Adds a todo to the parent merge_request when a CI build fails

app/services/merge_requests/assign_issues_service.rb

+# frozen_string_literal: true
+
 module MergeRequests
   class AssignIssuesService < BaseService
     def assignable_issues

app/services/merge_requests/base_service.rb

+# frozen_string_literal: true
+
 module MergeRequests
   class BaseService < ::IssuableBaseService
     prepend EE::MergeRequests::BaseService

app/services/merge_requests/build_service.rb

+# frozen_string_literal: true
+
 module MergeRequests
   class BuildService < MergeRequests::BaseService
     prepend EE::MergeRequests::BuildService
@@ -141,7 +143,8 @@ module MergeRequests
       closes_issue = "Closes #{issue.to_reference}"
 
       if description.present?
-        merge_request.description += closes_issue.prepend("\n\n")
+        descr_parts = [merge_request.description, closes_issue]
+        merge_request.description = descr_parts.join("\n\n")
       else
         merge_request.description = closes_issue
       end
@@ -165,9 +168,11 @@ module MergeRequests
       return if merge_request.title.present?
 
       if issue_iid.present?
-        merge_request.title = "Resolve #{issue.to_reference}"
+        title_parts = ["Resolve #{issue.to_reference}"]
         branch_title = source_branch.downcase.remove(issue_iid.downcase).titleize.humanize
-        merge_request.title += " \"#{branch_title}\"" if branch_title.present?
+
+        title_parts << "\"#{branch_title}\"" if branch_title.present?
+        merge_request.title = title_parts.join(' ')
       end
     end
 

app/services/merge_requests/close_service.rb

+# frozen_string_literal: true
+
 module MergeRequests
   class CloseService < MergeRequests::BaseService
     def execute(merge_request, commit = nil)

app/services/merge_requests/conflicts/base_service.rb

+# frozen_string_literal: true
+
 module MergeRequests
   module Conflicts
     class BaseService

app/services/merge_requests/conflicts/list_service.rb

+# frozen_string_literal: true
+
 module MergeRequests
   module Conflicts
     class ListService < MergeRequests::Conflicts::BaseService

app/services/merge_requests/conflicts/resolve_service.rb

+# frozen_string_literal: true
+
 module MergeRequests
   module Conflicts
     class ResolveService < MergeRequests::Conflicts::BaseService

app/services/merge_requests/create_from_issue_service.rb

+# frozen_string_literal: true
+
 module MergeRequests
   class CreateFromIssueService < MergeRequests::CreateService
     def initialize(project, user, params)

app/services/merge_requests/create_service.rb

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

app/services/merge_requests/delete_non_latest_diffs_service.rb

+# frozen_string_literal: true
+
 module MergeRequests
   class DeleteNonLatestDiffsService
     BATCH_SIZE = 10

app/services/merge_requests/ff_merge_service.rb

+# frozen_string_literal: true
+
 module MergeRequests
   # MergeService class
   #

app/services/merge_requests/get_urls_service.rb

+# frozen_string_literal: true
+
 module MergeRequests
   class GetUrlsService < BaseService
     attr_reader :project

app/services/merge_requests/merge_service.rb

+# frozen_string_literal: true
+
 module MergeRequests
   # MergeService class
   #

app/services/merge_requests/merge_when_pipeline_succeeds_service.rb

+# frozen_string_literal: true
+
 module MergeRequests
   class MergeWhenPipelineSucceedsService < MergeRequests::BaseService
     # Marks the passed `merge_request` to be merged when the pipeline succeeds or

app/services/merge_requests/post_merge_service.rb

+# frozen_string_literal: true
+
 module MergeRequests
   # PostMergeService class
   #

app/services/merge_requests/rebase_service.rb

+# frozen_string_literal: true
+
 module MergeRequests
   class RebaseService < MergeRequests::WorkingCopyBaseService
     REBASE_ERROR = 'Rebase failed. Please rebase locally'.freeze

app/services/merge_requests/refresh_service.rb

+# frozen_string_literal: true
+
 module MergeRequests
   class RefreshService < MergeRequests::BaseService
     prepend EE::MergeRequests::RefreshService

app/services/merge_requests/reload_diffs_service.rb

+# frozen_string_literal: true
+
 module MergeRequests
   class ReloadDiffsService
     def initialize(merge_request, current_user)

app/services/merge_requests/reopen_service.rb

+# frozen_string_literal: true
+
 module MergeRequests
   class ReopenService < MergeRequests::BaseService
     def execute(merge_request)

app/services/merge_requests/resolved_discussion_notification_service.rb

+# frozen_string_literal: true
+
 module MergeRequests
   class ResolvedDiscussionNotificationService < MergeRequests::BaseService
     def execute(merge_request)

app/services/merge_requests/squash_service.rb

+# frozen_string_literal: true
+
 module MergeRequests
   class SquashService < MergeRequests::WorkingCopyBaseService
     def execute(merge_request)

app/services/merge_requests/update_service.rb

+# frozen_string_literal: true
+
 module MergeRequests
   class UpdateService < MergeRequests::BaseService
     prepend ::EE::MergeRequests::UpdateService

app/services/merge_requests/working_copy_base_service.rb

+# frozen_string_literal: true
+
 module MergeRequests
   class WorkingCopyBaseService < MergeRequests::BaseService
     attr_reader :merge_request

app/services/milestones/base_service.rb

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

app/services/milestones/close_service.rb

+# frozen_string_literal: true
+
 module Milestones
   class CloseService < Milestones::BaseService
     def execute(milestone)

app/services/milestones/create_service.rb

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

app/services/milestones/destroy_service.rb

+# frozen_string_literal: true
+
 module Milestones
   class DestroyService < Milestones::BaseService
     def execute(milestone)

app/services/milestones/promote_service.rb

+# frozen_string_literal: true
+
 module Milestones
   class PromoteService < Milestones::BaseService
     prepend EE::Milestones::PromoteService

app/services/milestones/reopen_service.rb

+# frozen_string_literal: true
+
 module Milestones
   class ReopenService < Milestones::BaseService
     def execute(milestone)

app/services/milestones/update_service.rb

+# frozen_string_literal: true
+
 module Milestones
   class UpdateService < Milestones::BaseService
     def execute(milestone)

app/services/notes/build_service.rb

+# frozen_string_literal: true
+
 module Notes
   class BuildService < ::BaseService
     prepend ::EE::Notes::BuildService

app/services/notes/create_service.rb

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

app/services/notes/destroy_service.rb

+# frozen_string_literal: true
+
 module Notes
   class DestroyService < BaseService
     def execute(note)

app/services/notes/post_process_service.rb

+# frozen_string_literal: true
+
 module Notes
   class PostProcessService
     attr_accessor :note

app/services/notes/quick_actions_service.rb

+# frozen_string_literal: true
+
 module Notes
   class QuickActionsService < BaseService
     UPDATE_SERVICES = {

app/services/notes/render_service.rb

+# frozen_string_literal: true
+
 module Notes
   class RenderService < BaseRenderer
     # Renders a collection of Note instances.

app/services/notes/resolve_service.rb

+# frozen_string_literal: true
+
 module Notes
   class ResolveService < ::BaseService
     def execute(note)

app/services/notes/update_service.rb

+# frozen_string_literal: true
+
 module Notes
   class UpdateService < BaseService
     def execute(note)

app/services/projects/after_import_service.rb

+# frozen_string_literal: true
+
 module Projects
   class AfterImportService
     RESERVED_REF_PREFIXES = Repository::RESERVED_REFS_NAMES.map { |n| File.join('refs', n, '/') }

app/services/projects/autocomplete_service.rb

+# frozen_string_literal: true
+
 module Projects
   class AutocompleteService < BaseService
     def issues

app/services/projects/base_move_relations_service.rb

+# frozen_string_literal: true
+
 module Projects
   class BaseMoveRelationsService < BaseService
     attr_reader :source_project

app/services/projects/batch_count_service.rb

+# frozen_string_literal: true
+
 # Service class for getting and caching the number of elements of several projects
 # Warning: do not user this service with a really large set of projects
 # because the service use maps to retrieve the project ids.

app/services/projects/batch_forks_count_service.rb

+# frozen_string_literal: true
+
 # Service class for getting and caching the number of forks of several projects
 # Warning: do not user this service with a really large set of projects
 # because the service use maps to retrieve the project ids

app/services/projects/batch_open_issues_count_service.rb

+# frozen_string_literal: true
+
 # Service class for getting and caching the number of issues of several projects
 # Warning: do not user this service with a really large set of projects
 # because the service use maps to retrieve the project ids

app/services/projects/count_service.rb

+# frozen_string_literal: true
+
 module Projects
   # Base class for the various service classes that count project data (e.g.
   # issues or forks).

app/services/projects/create_from_template_service.rb

+# frozen_string_literal: true
+
 module Projects
   class CreateFromTemplateService < BaseService
     def initialize(user, params)

app/services/projects/create_service.rb

+# frozen_string_literal: true
+
 module Projects
   class CreateService < BaseService
     prepend ::EE::Projects::CreateService

app/services/projects/destroy_service.rb

+# frozen_string_literal: true
+
 module Projects
   class DestroyService < BaseService
     include Gitlab::ShellAdapter

app/services/projects/download_service.rb

+# frozen_string_literal: true
+
 module Projects
   class DownloadService < BaseService
     WHITELIST = [

app/services/projects/enable_deploy_key_service.rb

+# frozen_string_literal: true
+
 module Projects
   class EnableDeployKeyService < BaseService
     def execute

app/services/projects/fork_service.rb

+# frozen_string_literal: true
+
 module Projects
   class ForkService < BaseService
     def execute(fork_to_project = nil)

app/services/projects/forks_count_service.rb

+# frozen_string_literal: true
+
 module Projects
   # Service class for getting and caching the number of forks of a project.
   class ForksCountService < Projects::CountService

app/services/projects/gitlab_projects_import_service.rb

+# frozen_string_literal: true
+
 # This service is an adapter used to for the GitLab Import feature, and
 # creating a project from a template.
 # The latter will under the hood just import an archive supplied by GitLab.

app/services/projects/group_links/create_service.rb

+# frozen_string_literal: true
+
 module Projects
   module GroupLinks
     class CreateService < BaseService

app/services/projects/group_links/destroy_service.rb

+# frozen_string_literal: true
+
 module Projects
   module GroupLinks
     class DestroyService < BaseService

app/services/projects/hashed_storage/migrate_attachments_service.rb

+# frozen_string_literal: true
+
 module Projects
   module HashedStorage
     AttachmentMigrationError = Class.new(StandardError)

app/services/projects/hashed_storage/migrate_repository_service.rb

+# frozen_string_literal: true
+
 module Projects
   module HashedStorage
     class MigrateRepositoryService < BaseService

app/services/projects/hashed_storage_migration_service.rb

+# frozen_string_literal: true
+
 module Projects
   class HashedStorageMigrationService < BaseService
     attr_reader :logger

app/services/projects/housekeeping_service.rb

+# frozen_string_literal: true
+
 # Projects::HousekeepingService class
 #
 # Used for git housekeeping

app/services/projects/import_export/export_service.rb

+# frozen_string_literal: true
+
 module Projects
   module ImportExport
     class ExportService < BaseService

app/services/projects/import_service.rb

+# frozen_string_literal: true
+
 module Projects
   class ImportService < BaseService
     include Gitlab::ShellAdapter

app/services/projects/lfs_pointers/lfs_download_link_list_service.rb

+# frozen_string_literal: true
+
 # This service lists the download link from a remote source based on the
 # oids provided
 module Projects

app/services/projects/lfs_pointers/lfs_download_service.rb

+# frozen_string_literal: true
+
 # This service downloads and links lfs objects from a remote URL
 module Projects
   module LfsPointers

app/services/projects/lfs_pointers/lfs_import_service.rb

+# frozen_string_literal: true
+
 # This service manages the whole worflow of discovering the Lfs files in a
 # repository, linking them to the project and downloading (and linking) the non
 # existent ones.

app/services/projects/lfs_pointers/lfs_link_service.rb

+# frozen_string_literal: true
+
 # Given a list of oids, this services links the existent Lfs Objects to the project
 module Projects
   module LfsPointers

app/services/projects/lfs_pointers/lfs_list_service.rb

+# frozen_string_literal: true
+
 # This service list all existent Lfs objects in a repository
 module Projects
   module LfsPointers

app/services/projects/move_access_service.rb

+# frozen_string_literal: true
+
 module Projects
   class MoveAccessService < BaseMoveRelationsService
     def execute(source_project, remove_remaining_elements: true)

app/services/projects/move_deploy_keys_projects_service.rb

+# frozen_string_literal: true
+
 module Projects
   class MoveDeployKeysProjectsService < BaseMoveRelationsService
     def execute(source_project, remove_remaining_elements: true)

app/services/projects/move_forks_service.rb

+# frozen_string_literal: true
+
 module Projects
   class MoveForksService < BaseMoveRelationsService
     def execute(source_project, remove_remaining_elements: true)

app/services/projects/move_lfs_objects_projects_service.rb

+# frozen_string_literal: true
+
 module Projects
   class MoveLfsObjectsProjectsService < BaseMoveRelationsService
     def execute(source_project, remove_remaining_elements: true)

app/services/projects/move_notification_settings_service.rb

+# frozen_string_literal: true
+
 module Projects
   class MoveNotificationSettingsService < BaseMoveRelationsService
     def execute(source_project, remove_remaining_elements: true)

app/services/projects/move_project_authorizations_service.rb

+# frozen_string_literal: true
+
 # NOTE: This service cannot be used directly because it is part of a
 # a bigger process. Instead, use the service MoveAccessService which moves
 # project memberships, project group links, authorizations and refreshes

app/services/projects/move_project_group_links_service.rb

+# frozen_string_literal: true
+
 # NOTE: This service cannot be used directly because it is part of a
 # a bigger process. Instead, use the service MoveAccessService which moves
 # project memberships, project group links, authorizations and refreshes

app/services/projects/move_project_members_service.rb

+# frozen_string_literal: true
+
 # NOTE: This service cannot be used directly because it is part of a
 # a bigger process. Instead, use the service MoveAccessService which moves
 # project memberships, project group links, authorizations and refreshes

app/services/projects/move_users_star_projects_service.rb

+# frozen_string_literal: true
+
 module Projects
   class MoveUsersStarProjectsService < BaseMoveRelationsService
     def execute(source_project, remove_remaining_elements: true)

app/services/projects/open_issues_count_service.rb

+# frozen_string_literal: true
+
 module Projects
   # Service class for counting and caching the number of open issues of a
   # project.

app/services/projects/open_merge_requests_count_service.rb

+# frozen_string_literal: true
+
 module Projects
   # Service class for counting and caching the number of open merge requests of
   # a project.

app/services/projects/overwrite_project_service.rb

+# frozen_string_literal: true
+
 module Projects
   class OverwriteProjectService < BaseService
     def execute(source_project)

app/services/projects/participants_service.rb

+# frozen_string_literal: true
+
 module Projects
   class ParticipantsService < BaseService
     include Users::ParticipableService

app/services/projects/propagate_service_template.rb

+# frozen_string_literal: true
+
 module Projects
   class PropagateServiceTemplate
     BATCH_SIZE = 100

app/services/projects/transfer_service.rb

+# frozen_string_literal: true
+
 # Projects::TransferService class
 #
 # Used for transfer project to another namespace

app/services/projects/unlink_fork_service.rb

+# frozen_string_literal: true
+
 module Projects
   class UnlinkForkService < BaseService
     def execute

app/services/projects/update_pages_configuration_service.rb

+# frozen_string_literal: true
+
 module Projects
   class UpdatePagesConfigurationService < BaseService
     attr_reader :project

app/services/projects/update_pages_service.rb

+# frozen_string_literal: true
+
 module Projects
   class UpdatePagesService < BaseService
     InvalidStateError = Class.new(StandardError)