Add latest changes from gitlab-org/gitlab@master

spec/helpers/markup_helper_spec.rb

+# frozen_string_literal: true
+
 require 'spec_helper'
 describe MarkupHelper do
@@ -408,12 +410,12 @@ describe MarkupHelper do
       it 'preserves a link href when link text is truncated' do
         text = 'The quick brown fox jumped over the lazy dog' # 44 chars
-        input = "#{text}#{text}#{text} " # 133 chars
         link_url = 'http://example.com/foo/bar/baz' # 30 chars
-        input << link_url
-        object = create_object(input)
+        input = "#{text}#{text}#{text} #{link_url}" # 163 chars
         expected_link_text = 'http://example...</a>'
+        object = create_object(input)
+
         expect(first_line_in_markdown(object, attribute, 150, project: project)).to match(link_url)
         expect(first_line_in_markdown(object, attribute, 150, project: project)).to match(expected_link_text)
       end

spec/helpers/members_helper_spec.rb

+# frozen_string_literal: true
+
 require 'spec_helper'
 describe MembersHelper do

spec/helpers/milestones_helper_spec.rb

+# frozen_string_literal: true
+
 require 'spec_helper'
 describe MilestonesHelper do

spec/helpers/milestones_routing_helper_spec.rb

+# frozen_string_literal: true
+
 require 'spec_helper'
 describe MilestonesRoutingHelper do

spec/helpers/namespaces_helper_spec.rb

+# frozen_string_literal: true
+
 require 'spec_helper'
 describe NamespacesHelper do

spec/helpers/nav_helper_spec.rb

+# frozen_string_literal: true
+
 require 'spec_helper'
 describe NavHelper, :do_not_mock_admin_mode do

spec/helpers/notes_helper_spec.rb

+# frozen_string_literal: true
+
 require "spec_helper"
 describe NotesHelper do

spec/helpers/notifications_helper_spec.rb

+# frozen_string_literal: true
+
 require 'spec_helper'
 describe NotificationsHelper do

spec/helpers/page_layout_helper_spec.rb

+# frozen_string_literal: true
+
 require 'spec_helper'
 describe PageLayoutHelper do

spec/helpers/pagination_helper_spec.rb

+# frozen_string_literal: true
+
 require 'spec_helper'
 describe PaginationHelper do

spec/helpers/preferences_helper_spec.rb

+# frozen_string_literal: true
+
 require 'spec_helper'
 describe PreferencesHelper do

spec/helpers/profiles_helper_spec.rb

+# frozen_string_literal: true
+
 require 'spec_helper'
 describe ProfilesHelper do

spec/helpers/rss_helper_spec.rb

+# frozen_string_literal: true
+
 require 'spec_helper'
 describe RssHelper do

spec/helpers/runners_helper_spec.rb

+# frozen_string_literal: true
+
 require 'spec_helper'
 describe RunnersHelper do

spec/helpers/search_helper_spec.rb

+# frozen_string_literal: true
+
 require 'spec_helper'
 describe SearchHelper do

spec/helpers/sidekiq_helper_spec.rb

+# frozen_string_literal: true
+
 require 'spec_helper'
 describe SidekiqHelper do

spec/helpers/snippets_helper_spec.rb

+# frozen_string_literal: true
+
 require 'spec_helper'
 describe SnippetsHelper do

spec/helpers/storage_helper_spec.rb

+# frozen_string_literal: true
+
 require "spec_helper"
 describe StorageHelper do

spec/helpers/submodule_helper_spec.rb

+# frozen_string_literal: true
+
 require 'spec_helper'
 describe SubmoduleHelper do

spec/helpers/tab_helper_spec.rb

+# frozen_string_literal: true
+
 require 'spec_helper'
 describe TabHelper do