Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-06-27

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

 <script>
+import $ from 'jquery';
 import { mapState, mapGetters, mapActions } from 'vuex';
 import createFlash from '~/flash';
 import { s__ } from '~/locale';
 import noteForm from '../../notes/components/note_form.vue';
 import { getNoteFormData } from '../store/utils';
+import Autosave from '../../autosave';
+import { DIFF_NOTE_TYPE, NOTE_TYPE } from '../constants';
 
 export default {
   components: {
@@ -37,11 +40,28 @@ export default {
       noteableData: state => state.notes.noteableData,
       diffViewType: state => state.diffs.diffViewType,
     }),
-    ...mapGetters(['noteableType', 'getNotesDataByProp']),
+    ...mapGetters(['isLoggedIn', 'noteableType', 'getNoteableData', 'getNotesDataByProp']),
+  },
+  mounted() {
+    if (this.isLoggedIn) {
+      const noteableData = this.getNoteableData;
+      const keys = [
+        NOTE_TYPE,
+        this.noteableType,
+        noteableData.id,
+        noteableData.diff_head_sha,
+        DIFF_NOTE_TYPE,
+        noteableData.source_project_id,
+        this.line.lineCode,
+      ];
+
+      this.autosave = new Autosave($(this.$refs.noteForm.$refs.textarea), keys);
+    }
   },
   methods: {
     ...mapActions(['cancelCommentForm', 'saveNote', 'fetchDiscussions']),
     handleCancelCommentForm() {
+      this.autosave.reset();
       this.cancelCommentForm({
         lineCode: this.line.lineCode,
       });
@@ -82,6 +102,7 @@ export default {
     class="content discussion-form discussion-form-container discussion-notes"
   >
     <note-form
+      ref="noteForm"
       :is-editing="true"
       :line-code="line.lineCode"
       save-button-title="Comment"

app/assets/javascripts/diffs/constants.js

@@ -7,6 +7,7 @@ export const CONTEXT_LINE_TYPE = 'context';
 export const EMPTY_CELL_TYPE = 'empty-cell';
 export const COMMENT_FORM_TYPE = 'commentForm';
 export const DIFF_NOTE_TYPE = 'DiffNote';
+export const NOTE_TYPE = 'Note';
 export const NEW_LINE_TYPE = 'new';
 export const OLD_LINE_TYPE = 'old';
 export const TEXT_DIFF_POSITION_TYPE = 'text';

app/assets/javascripts/lib/utils/common_utils.js

@@ -190,12 +190,25 @@ export const getParameterByName = (name, urlToParse) => {
   return decodeURIComponent(results[2].replace(/\+/g, ' '));
 };
 
+const handleSelectedRange = (range) => {
+  const container = range.commonAncestorContainer;
+  // add context to fragment if needed
+  if (container.tagName === 'OL') {
+    const parentContainer = document.createElement(container.tagName);
+    parentContainer.appendChild(range.cloneContents());
+    return parentContainer;
+  }
+  return range.cloneContents();
+};
+
 export const getSelectedFragment = () => {
   const selection = window.getSelection();
   if (selection.rangeCount === 0) return null;
   const documentFragment = document.createDocumentFragment();
+
   for (let i = 0; i < selection.rangeCount; i += 1) {
-    documentFragment.appendChild(selection.getRangeAt(i).cloneContents());
+    const range = selection.getRangeAt(i);
+    documentFragment.appendChild(handleSelectedRange(range));
   }
   if (documentFragment.textContent.length === 0) return null;
 

app/assets/javascripts/search_autocomplete.js

@@ -289,7 +289,7 @@ export default class SearchAutocomplete {
     }
 
     // If the dropdown is closed, we'll open it
-    if (!this.dropdown.hasClass('open')) {
+    if (!this.dropdown.hasClass('show')) {
       this.loadingSuggestions = false;
       this.dropdownToggle.dropdown('toggle');
       return this.searchInput.removeClass('disabled');
@@ -424,9 +424,9 @@ export default class SearchAutocomplete {
   }
 
   disableAutocomplete() {
-    if (!this.searchInput.hasClass('disabled') && this.dropdown.hasClass('open')) {
+    if (!this.searchInput.hasClass('disabled') && this.dropdown.hasClass('show')) {
       this.searchInput.addClass('disabled');
-      this.dropdown.removeClass('open').trigger('hidden.bs.dropdown');
+      this.dropdown.removeClass('show').trigger('hidden.bs.dropdown');
       this.restoreMenu();
     }
   }

app/workers/admin_email_worker.rb

+# frozen_string_literal: true
+
 class AdminEmailWorker
   include ApplicationWorker
   include CronjobQueue

app/workers/archive_trace_worker.rb

+# frozen_string_literal: true
+
 class ArchiveTraceWorker
   include ApplicationWorker
   include PipelineBackgroundQueue

app/workers/authorized_projects_worker.rb

+# frozen_string_literal: true
+
 class AuthorizedProjectsWorker
   include ApplicationWorker
   prepend WaitableWorker

app/workers/background_migration_worker.rb

+# frozen_string_literal: true
+
 class BackgroundMigrationWorker
   include ApplicationWorker
 

app/workers/build_coverage_worker.rb

+# frozen_string_literal: true
+
 class BuildCoverageWorker
   include ApplicationWorker
   include PipelineQueue

app/workers/build_finished_worker.rb

+# frozen_string_literal: true
+
 class BuildFinishedWorker
   prepend EE::BuildFinishedWorker
   include ApplicationWorker

app/workers/build_hooks_worker.rb

+# frozen_string_literal: true
+
 class BuildHooksWorker
   include ApplicationWorker
   include PipelineQueue

app/workers/build_queue_worker.rb

+# frozen_string_literal: true
+
 class BuildQueueWorker
   include ApplicationWorker
   include PipelineQueue

app/workers/build_success_worker.rb

+# frozen_string_literal: true
+
 class BuildSuccessWorker
   include ApplicationWorker
   include PipelineQueue

app/workers/build_trace_sections_worker.rb

+# frozen_string_literal: true
+
 class BuildTraceSectionsWorker
   include ApplicationWorker
   include PipelineQueue

app/workers/cluster_install_app_worker.rb

+# frozen_string_literal: true
+
 class ClusterInstallAppWorker
   include ApplicationWorker
   include ClusterQueue

app/workers/cluster_provision_worker.rb

+# frozen_string_literal: true
+
 class ClusterProvisionWorker
   include ApplicationWorker
   include ClusterQueue

app/workers/cluster_wait_for_app_installation_worker.rb

+# frozen_string_literal: true
+
 class ClusterWaitForAppInstallationWorker
   include ApplicationWorker
   include ClusterQueue

app/workers/cluster_wait_for_ingress_ip_address_worker.rb

+# frozen_string_literal: true
+
 class ClusterWaitForIngressIpAddressWorker
   include ApplicationWorker
   include ClusterQueue

app/workers/create_gpg_signature_worker.rb

+# frozen_string_literal: true
+
 class CreateGpgSignatureWorker
   include ApplicationWorker
 

app/workers/create_note_diff_file_worker.rb

+# frozen_string_literal: true
+
 class CreateNoteDiffFileWorker
   include ApplicationWorker
 

app/workers/create_pipeline_worker.rb

+# frozen_string_literal: true
+
 class CreatePipelineWorker
   include ApplicationWorker
   include PipelineQueue

app/workers/delete_merged_branches_worker.rb

+# frozen_string_literal: true
+
 class DeleteMergedBranchesWorker
   include ApplicationWorker
 

app/workers/delete_user_worker.rb

+# frozen_string_literal: true
+
 class DeleteUserWorker
   include ApplicationWorker
 

app/workers/email_receiver_worker.rb

+# frozen_string_literal: true
+
 class EmailReceiverWorker
   include ApplicationWorker
 

app/workers/emails_on_push_worker.rb

+# frozen_string_literal: true
+
 class EmailsOnPushWorker
   include ApplicationWorker
 

app/workers/expire_build_artifacts_worker.rb

+# frozen_string_literal: true
+
 class ExpireBuildArtifactsWorker
   include ApplicationWorker
   include CronjobQueue

app/workers/expire_build_instance_artifacts_worker.rb

+# frozen_string_literal: true
+
 class ExpireBuildInstanceArtifactsWorker
   include ApplicationWorker
 

app/workers/expire_job_cache_worker.rb

+# frozen_string_literal: true
+
 class ExpireJobCacheWorker
   include ApplicationWorker
   include PipelineQueue

app/workers/expire_pipeline_cache_worker.rb

+# frozen_string_literal: true
+
 class ExpirePipelineCacheWorker
   include ApplicationWorker
   include PipelineQueue

app/workers/git_garbage_collect_worker.rb

+# frozen_string_literal: true
+
 class GitGarbageCollectWorker
   include ApplicationWorker
 

app/workers/gitlab_shell_worker.rb

+# frozen_string_literal: true
+
 class GitlabShellWorker
   include ApplicationWorker
   include Gitlab::ShellAdapter

app/workers/gitlab_usage_ping_worker.rb

+# frozen_string_literal: true
+
 class GitlabUsagePingWorker
   LEASE_TIMEOUT = 86400
 

app/workers/group_destroy_worker.rb

+# frozen_string_literal: true
+
 class GroupDestroyWorker
   include ApplicationWorker
   include ExceptionBacktrace

app/workers/import_export_project_cleanup_worker.rb

+# frozen_string_literal: true
+
 class ImportExportProjectCleanupWorker
   include ApplicationWorker
   include CronjobQueue

app/workers/invalid_gpg_signature_update_worker.rb

+# frozen_string_literal: true
+
 class InvalidGpgSignatureUpdateWorker
   include ApplicationWorker
 

app/workers/irker_worker.rb

+# frozen_string_literal: true
+
 require 'json'
 require 'socket'
 
@@ -69,8 +71,8 @@ class IrkerWorker
     newbranch = "#{Gitlab.config.gitlab.url}/#{repo_path}/branches"
     newbranch = "\x0302\x1f#{newbranch}\x0f" if @colors
 
-    privmsg = "[#{repo_name}] #{committer} has created a new branch "
-    privmsg += "#{branch}: #{newbranch}"
+    privmsg = "[#{repo_name}] #{committer} has created a new branch " \
+              "#{branch}: #{newbranch}"
     sendtoirker privmsg
   end
 
@@ -112,9 +114,7 @@ class IrkerWorker
     url = compare_url data, project.full_path
     commits = colorize_commits data['total_commits_count']
 
-    new_commits = 'new commit'
-    new_commits += 's' if data['total_commits_count'] > 1
-
+    new_commits = 'new commit'.pluralize(data['total_commits_count'])
     sendtoirker "[#{repo}] #{committer} pushed #{commits} #{new_commits} " \
                 "to #{branch}: #{url}"
   end
@@ -122,8 +122,8 @@ class IrkerWorker
   def compare_url(data, repo_path)
     sha1 = Commit.truncate_sha(data['before'])
     sha2 = Commit.truncate_sha(data['after'])
-    compare_url = "#{Gitlab.config.gitlab.url}/#{repo_path}/compare"
-    compare_url += "/#{sha1}...#{sha2}"
+    compare_url = "#{Gitlab.config.gitlab.url}/#{repo_path}/compare" \
+                  "/#{sha1}...#{sha2}"
     colorize_url compare_url
   end
 
@@ -144,8 +144,7 @@ class IrkerWorker
   def files_count(commit)
     diff_size = commit.raw_deltas.size
 
-    files = "#{diff_size} file"
-    files += 's' if diff_size > 1
+    files = "#{diff_size} file".pluralize(diff_size)
     files
   end
 

app/workers/issue_due_scheduler_worker.rb

+# frozen_string_literal: true
+
 class IssueDueSchedulerWorker
   include ApplicationWorker
   include CronjobQueue

app/workers/merge_worker.rb

+# frozen_string_literal: true
+
 class MergeWorker
   include ApplicationWorker
 

app/workers/namespaceless_project_destroy_worker.rb

+# frozen_string_literal: true
+
 # Worker to destroy projects that do not have a namespace
 #
 # It destroys everything it can without having the info about the namespace it

app/workers/new_issue_worker.rb

+# frozen_string_literal: true
+
 class NewIssueWorker
   include ApplicationWorker
   include NewIssuable

app/workers/new_merge_request_worker.rb

+# frozen_string_literal: true
+
 class NewMergeRequestWorker
   include ApplicationWorker
   include NewIssuable

app/workers/new_note_worker.rb

+# frozen_string_literal: true
+
 class NewNoteWorker
   include ApplicationWorker
 

app/workers/object_storage_upload_worker.rb

+# frozen_string_literal: true
+
 # @Deprecated - remove once the `object_storage_upload` queue is empty
 # The queue has been renamed `object_storage:object_storage_background_upload`
 #

app/workers/pages_domain_verification_cron_worker.rb

+# frozen_string_literal: true
+
 class PagesDomainVerificationCronWorker
   include ApplicationWorker
   include CronjobQueue

app/workers/pages_domain_verification_worker.rb

+# frozen_string_literal: true
+
 class PagesDomainVerificationWorker
   include ApplicationWorker
 

app/workers/pages_worker.rb

+# frozen_string_literal: true
+
 class PagesWorker
   include ApplicationWorker
 

app/workers/pipeline_hooks_worker.rb

+# frozen_string_literal: true
+
 class PipelineHooksWorker
   include ApplicationWorker
   include PipelineQueue

app/workers/pipeline_metrics_worker.rb

+# frozen_string_literal: true
+
 class PipelineMetricsWorker
   include ApplicationWorker
   include PipelineQueue

app/workers/pipeline_notification_worker.rb

+# frozen_string_literal: true
+
 class PipelineNotificationWorker
   include ApplicationWorker
   include PipelineQueue

app/workers/pipeline_process_worker.rb

+# frozen_string_literal: true
+
 class PipelineProcessWorker
   include ApplicationWorker
   include PipelineQueue

app/workers/pipeline_schedule_worker.rb

+# frozen_string_literal: true
+
 class PipelineScheduleWorker
   include ApplicationWorker
   include CronjobQueue

app/workers/pipeline_success_worker.rb

+# frozen_string_literal: true
+
 class PipelineSuccessWorker
   include ApplicationWorker
   include PipelineQueue

app/workers/pipeline_update_worker.rb

+# frozen_string_literal: true
+
 class PipelineUpdateWorker
   include ApplicationWorker
   include PipelineQueue

app/workers/plugin_worker.rb

+# frozen_string_literal: true
+
 class PluginWorker
   include ApplicationWorker
 

app/workers/post_receive.rb

+# frozen_string_literal: true
+
 class PostReceive
   include ApplicationWorker
   prepend EE::PostReceive

app/workers/process_commit_worker.rb

+# frozen_string_literal: true
+
 # Worker for processing individiual commit messages pushed to a repository.
 #
 # Jobs for this worker are scheduled for every commit that is being pushed. As a

app/workers/project_cache_worker.rb

+# frozen_string_literal: true
+
 # Worker for updating any project specific caches.
 class ProjectCacheWorker
   include ApplicationWorker

app/workers/project_destroy_worker.rb

+# frozen_string_literal: true
+
 class ProjectDestroyWorker
   include ApplicationWorker
   include ExceptionBacktrace

app/workers/project_export_worker.rb

+# frozen_string_literal: true
+
 class ProjectExportWorker
   include ApplicationWorker
   include ExceptionBacktrace

app/workers/project_migrate_hashed_storage_worker.rb

+# frozen_string_literal: true
+
 class ProjectMigrateHashedStorageWorker
   include ApplicationWorker
 

app/workers/project_service_worker.rb

+# frozen_string_literal: true
+
 class ProjectServiceWorker
   include ApplicationWorker
 

app/workers/propagate_service_template_worker.rb

+# frozen_string_literal: true
+
 # Worker for updating any project specific caches.
 class PropagateServiceTemplateWorker
   include ApplicationWorker

app/workers/prune_old_events_worker.rb

+# frozen_string_literal: true
+
 class PruneOldEventsWorker
   include ApplicationWorker
   include CronjobQueue

app/workers/reactive_caching_worker.rb

+# frozen_string_literal: true
+
 class ReactiveCachingWorker
   include ApplicationWorker
 

app/workers/rebase_worker.rb

+# frozen_string_literal: true
+
 class RebaseWorker
   include ApplicationWorker
 

app/workers/remove_expired_group_links_worker.rb

+# frozen_string_literal: true
+
 class RemoveExpiredGroupLinksWorker
   include ApplicationWorker
   include CronjobQueue

app/workers/remove_expired_members_worker.rb

+# frozen_string_literal: true
+
 class RemoveExpiredMembersWorker
   include ApplicationWorker
   include CronjobQueue

app/workers/remove_old_web_hook_logs_worker.rb

+# frozen_string_literal: true
+
 class RemoveOldWebHookLogsWorker
   include ApplicationWorker
   include CronjobQueue

app/workers/remove_unreferenced_lfs_objects_worker.rb

+# frozen_string_literal: true
+
 class RemoveUnreferencedLfsObjectsWorker
   include ApplicationWorker
   include CronjobQueue

app/workers/repository_archive_cache_worker.rb

+# frozen_string_literal: true
+
 class RepositoryArchiveCacheWorker
   include ApplicationWorker
   include CronjobQueue

app/workers/repository_fork_worker.rb

+# frozen_string_literal: true
+
 class RepositoryForkWorker
   include ApplicationWorker
   include Gitlab::ShellAdapter

app/workers/repository_import_worker.rb

+# frozen_string_literal: true
+
 class RepositoryImportWorker
   include ApplicationWorker
   include ExceptionBacktrace

app/workers/repository_remove_remote_worker.rb

+# frozen_string_literal: true
+
 class RepositoryRemoveRemoteWorker
   include ApplicationWorker
   include ExclusiveLeaseGuard

app/workers/repository_update_remote_mirror_worker.rb

+# frozen_string_literal: true
+
 class RepositoryUpdateRemoteMirrorWorker
   UpdateAlreadyInProgressError = Class.new(StandardError)
   UpdateError = Class.new(StandardError)

app/workers/requests_profiles_worker.rb

+# frozen_string_literal: true
+
 class RequestsProfilesWorker
   include ApplicationWorker
   include CronjobQueue

app/workers/run_pipeline_schedule_worker.rb

+# frozen_string_literal: true
+
 class RunPipelineScheduleWorker
   include ApplicationWorker
   include PipelineQueue

app/workers/schedule_update_user_activity_worker.rb

+# frozen_string_literal: true
+
 class ScheduleUpdateUserActivityWorker
   include ApplicationWorker
   include CronjobQueue

app/workers/stage_update_worker.rb

+# frozen_string_literal: true
+
 class StageUpdateWorker
   include ApplicationWorker
   include PipelineQueue

app/workers/storage_migrator_worker.rb

+# frozen_string_literal: true
+
 class StorageMigratorWorker
   include ApplicationWorker
 

app/workers/stuck_ci_jobs_worker.rb

+# frozen_string_literal: true
+
 class StuckCiJobsWorker
   include ApplicationWorker
   include CronjobQueue

app/workers/stuck_import_jobs_worker.rb

+# frozen_string_literal: true
+
 class StuckImportJobsWorker
   include ApplicationWorker
   include CronjobQueue

app/workers/stuck_merge_jobs_worker.rb

+# frozen_string_literal: true
+
 class StuckMergeJobsWorker
   include ApplicationWorker
   include CronjobQueue

app/workers/system_hook_push_worker.rb

+# frozen_string_literal: true
+
 class SystemHookPushWorker
   include ApplicationWorker
 

app/workers/trending_projects_worker.rb

+# frozen_string_literal: true
+
 class TrendingProjectsWorker
   include ApplicationWorker
   include CronjobQueue

app/workers/update_head_pipeline_for_merge_request_worker.rb

+# frozen_string_literal: true
+
 class UpdateHeadPipelineForMergeRequestWorker
   include ApplicationWorker
   include PipelineQueue

app/workers/update_merge_requests_worker.rb

+# frozen_string_literal: true
+
 class UpdateMergeRequestsWorker
   include ApplicationWorker
 

app/workers/update_user_activity_worker.rb

+# frozen_string_literal: true
+
 class UpdateUserActivityWorker
   include ApplicationWorker
 

app/workers/upload_checksum_worker.rb

+# frozen_string_literal: true
+
 class UploadChecksumWorker
   include ApplicationWorker
 

app/workers/wait_for_cluster_creation_worker.rb

+# frozen_string_literal: true
+
 class WaitForClusterCreationWorker
   include ApplicationWorker
   include ClusterQueue

app/workers/web_hook_worker.rb

+# frozen_string_literal: true
+
 class WebHookWorker
   include ApplicationWorker
 

changelogs/unreleased/40484-ordered-lists-copy-gfm.yml

+---
+title: Keep lists ordered when copying only list items
+merge_request: 18522
+author: Jan Beckmann
+type: fixed

changelogs/unreleased/48461-search-dropdown-hides-shows-when-typing.yml

+---
+title: Fix loading screen for search autocomplete dropdown
+merge_request:
+author:
+type: fixed

changelogs/unreleased/frozen-string-app-workers.yml

+---
+title: Enable frozen string in app/workers/*.rb
+merge_request: 19944
+author: gfyoung
+type: other

lib/gitlab/git/commit.rb

@@ -493,13 +493,18 @@ module Gitlab
       def tree_entry(path)
         return unless path.present?
 
-        @repository.gitaly_migrate(:commit_tree_entry) do |is_migrated|
-          if is_migrated
-            gitaly_tree_entry(path)
-          else
-            rugged_tree_entry(path)
-          end
-        end
+        # We're only interested in metadata, so limit actual data to 1 byte
+        # since Gitaly doesn't support "send no data" option.
+        entry = @repository.gitaly_commit_client.tree_entry(id, path, 1)
+        return unless entry
+
+        # To be compatible with the rugged format
+        entry = entry.to_h
+        entry.delete(:data)
+        entry[:name] = File.basename(path)
+        entry[:type] = entry[:type].downcase
+
+        entry
       end
 
       def to_gitaly_commit
@@ -562,28 +567,6 @@ module Gitlab
         SERIALIZE_KEYS
       end
 
-      def gitaly_tree_entry(path)
-        # We're only interested in metadata, so limit actual data to 1 byte
-        # since Gitaly doesn't support "send no data" option.
-        entry = @repository.gitaly_commit_client.tree_entry(id, path, 1)
-        return unless entry
-
-        # To be compatible with the rugged format
-        entry = entry.to_h
-        entry.delete(:data)
-        entry[:name] = File.basename(path)
-        entry[:type] = entry[:type].downcase
-
-        entry
-      end
-
-      # Is this the same as Blob.find_entry_by_path ?
-      def rugged_tree_entry(path)
-        rugged_commit.tree.path(path)
-      rescue Rugged::TreeError
-        nil
-      end
-
       def gitaly_commit_author_from_rugged(author_or_committer)
         Gitaly::CommitAuthor.new(
           name: author_or_committer[:name].b,

lib/gitlab/gitaly_client/commit_service.rb

@@ -76,6 +76,13 @@ module Gitlab
       end
 
       def tree_entry(ref, path, limit = nil)
+        if Pathname.new(path).cleanpath.to_s.start_with?('../')
+          # The TreeEntry RPC should return an empty reponse in this case but in
+          # Gitaly 0.107.0 and earlier we get an exception instead. This early return
+          # saves us a Gitaly roundtrip while also avoiding the exception.
+          return
+        end
+
         request = Gitaly::TreeEntryRequest.new(
           repository: @gitaly_repo,
           revision: encode_binary(ref),

spec/javascripts/behaviors/copy_as_gfm_spec.js

@@ -44,4 +44,59 @@ describe('CopyAsGFM', () => {
       callPasteGFM();
     });
   });
+
+  describe('CopyAsGFM.copyGFM', () => {
+    // Stub getSelection to return a purpose-built object.
+    const stubSelection = (html, parentNode) => ({
+      getRangeAt: () => ({
+        commonAncestorContainer: { tagName: parentNode },
+        cloneContents: () => {
+          const fragment = document.createDocumentFragment();
+          const node = document.createElement('div');
+          node.innerHTML = html;
+          Array.from(node.childNodes).forEach((item) => fragment.appendChild(item));
+          return fragment;
+        },
+      }),
+      rangeCount: 1,
+    });
+
+    const clipboardData = {
+      setData() {},
+    };
+
+    const simulateCopy = () => {
+      const e = {
+        originalEvent: {
+          clipboardData,
+        },
+        preventDefault() {},
+        stopPropagation() {},
+      };
+      CopyAsGFM.copyAsGFM(e, CopyAsGFM.transformGFMSelection);
+      return clipboardData;
+    };
+
+    beforeEach(() => spyOn(clipboardData, 'setData'));
+
+    describe('list handling', () => {
+      it('uses correct gfm for unordered lists', () => {
+        const selection = stubSelection('<li>List Item1</li><li>List Item2</li>\n', 'UL');
+        spyOn(window, 'getSelection').and.returnValue(selection);
+        simulateCopy();
+
+        const expectedGFM = '- List Item1\n- List Item2';
+        expect(clipboardData.setData).toHaveBeenCalledWith('text/x-gfm', expectedGFM);
+      });
+
+      it('uses correct gfm for ordered lists', () => {
+        const selection = stubSelection('<li>List Item1</li><li>List Item2</li>\n', 'OL');
+        spyOn(window, 'getSelection').and.returnValue(selection);
+        simulateCopy();
+
+        const expectedGFM = '1. List Item1\n1. List Item2';
+        expect(clipboardData.setData).toHaveBeenCalledWith('text/x-gfm', expectedGFM);
+      });
+    });
+  });
 });

spec/javascripts/diffs/components/diff_line_note_form_spec.js

@@ -19,7 +19,15 @@ describe('DiffLineNoteForm', () => {
       diffLines,
       line: diffLines[0],
       noteTargetLine: diffLines[0],
-    }).$mount();
+    });
+
+    Object.defineProperty(component, 'isLoggedIn', {
+      get() {
+        return true;
+      },
+    });
+
+    component.$mount();
   });
 
   describe('methods', () => {
@@ -56,6 +64,15 @@ describe('DiffLineNoteForm', () => {
     });
   });
 
+  describe('mounted', () => {
+    it('should init autosave', () => {
+      const key = 'autosave/Note/issue///DiffNote//1c497fbb3a46b78edf04cc2a2fa33f67e3ffbe2a_1_1';
+
+      expect(component.autosave).toBeDefined();
+      expect(component.autosave.key).toEqual(key);
+    });
+  });
+
   describe('template', () => {
     it('should have note form', () => {
       const { $el } = component;

spec/models/commit_spec.rb

@@ -514,30 +514,21 @@ eos
   end
 
   describe '#uri_type' do
-    shared_examples 'URI type' do
-      it 'returns the URI type at the given path' do
-        expect(commit.uri_type('files/html')).to be(:tree)
-        expect(commit.uri_type('files/images/logo-black.png')).to be(:raw)
-        expect(project.commit('video').uri_type('files/videos/intro.mp4')).to be(:raw)
-        expect(commit.uri_type('files/js/application.js')).to be(:blob)
-      end
-
-      it "returns nil if the path doesn't exists" do
-        expect(commit.uri_type('this/path/doesnt/exist')).to be_nil
-      end
-
-      it 'is nil if the path is nil or empty' do
-        expect(commit.uri_type(nil)).to be_nil
-        expect(commit.uri_type("")).to be_nil
-      end
+    it 'returns the URI type at the given path' do
+      expect(commit.uri_type('files/html')).to be(:tree)
+      expect(commit.uri_type('files/images/logo-black.png')).to be(:raw)
+      expect(project.commit('video').uri_type('files/videos/intro.mp4')).to be(:raw)
+      expect(commit.uri_type('files/js/application.js')).to be(:blob)
     end
 
-    context 'when Gitaly commit_tree_entry feature is enabled' do
-      it_behaves_like 'URI type'
+    it "returns nil if the path doesn't exists" do
+      expect(commit.uri_type('this/path/doesnt/exist')).to be_nil
+      expect(commit.uri_type('../path/doesnt/exist')).to be_nil
     end
 
-    context 'when Gitaly commit_tree_entry feature is disabled', :disable_gitaly do
-      it_behaves_like 'URI type'
+    it 'is nil if the path is nil or empty' do
+      expect(commit.uri_type(nil)).to be_nil
+      expect(commit.uri_type("")).to be_nil
     end
   end