Add latest changes from gitlab-org/gitlab@master

10 files changed, 18 insertions, 5 deletions

diff --git a/spec/helpers/avatars_helper_spec.rb b/spec/helpers/avatars_helper_spec.rb
index 77182a59c1c..8b6817efcc4 100644
--- a/spec/helpers/avatars_helper_spec.rb
+++ b/spec/helpers/avatars_helper_spec.rb
@@ -193,6 +193,7 @@ describe AvatarsHelper do
 
   describe '#user_avatar_without_link' do
     let(:options) { { user: user } }
+
     subject { helper.user_avatar_without_link(options) }
 
     it 'displays user avatar' do
diff --git a/spec/helpers/blob_helper_spec.rb b/spec/helpers/blob_helper_spec.rb
index 4996e27c2e6..2d0c4723648 100644
--- a/spec/helpers/blob_helper_spec.rb
+++ b/spec/helpers/blob_helper_spec.rb
@@ -56,7 +56,7 @@ describe BlobHelper do
       stub_feature_flags(web_ide_default: false)
       link = helper.edit_blob_button(project, 'master', 'README.md')
 
-      expect(Capybara.string(link).find_link('Edit')[:href]).to eq("/#{project.full_path}/edit/master/README.md")
+      expect(Capybara.string(link).find_link('Edit')[:href]).to eq("/#{project.full_path}/-/edit/master/README.md")
     end
 
     it 'returns a link with a Web IDE route' do
@@ -69,7 +69,7 @@ describe BlobHelper do
       stub_feature_flags(web_ide_default: false)
       link = helper.edit_blob_button(project, 'master', 'README.md', link_opts: { mr_id: 10 })
 
-      expect(Capybara.string(link).find_link('Edit')[:href]).to eq("/#{project.full_path}/edit/master/README.md?mr_id=10")
+      expect(Capybara.string(link).find_link('Edit')[:href]).to eq("/#{project.full_path}/-/edit/master/README.md?mr_id=10")
     end
   end
 
diff --git a/spec/helpers/events_helper_spec.rb b/spec/helpers/events_helper_spec.rb
index 63a37a1f113..fa553710274 100644
--- a/spec/helpers/events_helper_spec.rb
+++ b/spec/helpers/events_helper_spec.rb
@@ -5,6 +5,7 @@ require 'spec_helper'
 describe EventsHelper do
   describe '#event_commit_title' do
     let(:message) { 'foo & bar ' + 'A' * 70 + '\n' + 'B' * 80 }
+
     subject { helper.event_commit_title(message) }
 
     it 'returns the first line, truncated to 70 chars' do
diff --git a/spec/helpers/groups_helper_spec.rb b/spec/helpers/groups_helper_spec.rb
index 8b33277ea18..ac2f028f937 100644
--- a/spec/helpers/groups_helper_spec.rb
+++ b/spec/helpers/groups_helper_spec.rb
@@ -127,6 +127,7 @@ describe GroupsHelper do
         sub_sub_owner: sub_sub_owner
       }
     end
+
     subject { helper.share_with_group_lock_help_text(sub_subgroup) }
 
     where(:root_share_with_group_locked, :subgroup_share_with_group_locked, :sub_subgroup_share_with_group_locked, :current_user, :help_text, :linked_ancestor) do
@@ -194,6 +195,7 @@ describe GroupsHelper do
   describe '#group_container_registry_nav' do
     let(:group) { create(:group, :public) }
     let(:user) { create(:user) }
+
     before do
       stub_container_registry_config(enabled: true)
       allow(helper).to receive(:current_user) { user }
@@ -229,6 +231,7 @@ describe GroupsHelper do
   describe '#group_sidebar_links' do
     let(:group) { create(:group, :public) }
     let(:user) { create(:user) }
+
     before do
       group.add_owner(user)
       allow(helper).to receive(:current_user) { user }
diff --git a/spec/helpers/issuables_helper_spec.rb b/spec/helpers/issuables_helper_spec.rb
index 9249c625135..a39110d0aa7 100644
--- a/spec/helpers/issuables_helper_spec.rb
+++ b/spec/helpers/issuables_helper_spec.rb
@@ -278,6 +278,7 @@ describe IssuablesHelper do
   describe '#assignee_sidebar_data' do
     let(:user) { create(:user) }
     let(:merge_request) { nil }
+
     subject { helper.assignee_sidebar_data(user, merge_request: merge_request) }
 
     it 'returns hash of assignee data' do
diff --git a/spec/helpers/labels_helper_spec.rb b/spec/helpers/labels_helper_spec.rb
index e2dff05cfaa..7ad554fd618 100644
--- a/spec/helpers/labels_helper_spec.rb
+++ b/spec/helpers/labels_helper_spec.rb
@@ -274,6 +274,7 @@ describe LabelsHelper do
 
   describe '#label_status_tooltip' do
     let(:status) { 'unsubscribed'.inquiry }
+
     subject { label_status_tooltip(label.present(issuable_subject: nil), status) }
 
     context 'with a project label' do
diff --git a/spec/helpers/markup_helper_spec.rb b/spec/helpers/markup_helper_spec.rb
index 5ca5f5703cf..6227a5f5662 100644
--- a/spec/helpers/markup_helper_spec.rb
+++ b/spec/helpers/markup_helper_spec.rb
@@ -44,6 +44,7 @@ describe MarkupHelper do
 
     describe "override default project" do
       let(:actual) { issue.to_reference }
+
       set(:second_project) { create(:project, :public) }
       set(:second_issue) { create(:issue, project: second_project) }
 
@@ -55,6 +56,7 @@ describe MarkupHelper do
 
     describe 'uploads' do
       let(:text) { "![ImageTest](/uploads/test.png)" }
+
       set(:group) { create(:group) }
 
       subject { helper.markdown(text) }
@@ -101,7 +103,7 @@ describe MarkupHelper do
         let(:requested_path) { 'files/images/README.md' }
 
         it 'returns the correct HTML for the image' do
-          expanded_path = "/#{project.full_path}/raw/master/files/images/#{image_file}"
+          expanded_path = "/#{project.full_path}/-/raw/master/files/images/#{image_file}"
 
           expect(subject.css('a')[0].attr('href')).to eq(expanded_path)
           expect(subject.css('img')[0].attr('data-src')).to eq(expanded_path)
diff --git a/spec/helpers/merge_requests_helper_spec.rb b/spec/helpers/merge_requests_helper_spec.rb
index 6bd567eab57..8db8c37038e 100644
--- a/spec/helpers/merge_requests_helper_spec.rb
+++ b/spec/helpers/merge_requests_helper_spec.rb
@@ -54,6 +54,7 @@ describe MergeRequestsHelper do
   describe '#format_mr_branch_names' do
     describe 'within the same project' do
       let(:merge_request) { create(:merge_request) }
+
       subject { format_mr_branch_names(merge_request) }
 
       it { is_expected.to eq([merge_request.source_branch, merge_request.target_branch]) }
diff --git a/spec/helpers/projects_helper_spec.rb b/spec/helpers/projects_helper_spec.rb
index 0db54599ede..46228d0d1c2 100644
--- a/spec/helpers/projects_helper_spec.rb
+++ b/spec/helpers/projects_helper_spec.rb
@@ -313,6 +313,7 @@ describe ProjectsHelper do
   describe '#link_to_project' do
     let(:group)   { create(:group, name: 'group name with space') }
     let(:project) { create(:project, group: group, name: 'project name with space') }
+
     subject { link_to_project(project) }
 
     it 'returns an HTML link to the project' do
@@ -544,6 +545,7 @@ describe ProjectsHelper do
 
   describe '#git_user_name' do
     let(:user) { double(:user, name: 'John "A" Doe53') }
+
     before do
       allow(helper).to receive(:current_user).and_return(user)
     end
@@ -566,6 +568,7 @@ describe ProjectsHelper do
 
     context 'user logged in' do
       let(:user) { create(:user) }
+
       before do
         allow(helper).to receive(:current_user).and_return(user)
       end
diff --git a/spec/helpers/submodule_helper_spec.rb b/spec/helpers/submodule_helper_spec.rb
index fcfce0eaf31..9046c1e9fb4 100644
--- a/spec/helpers/submodule_helper_spec.rb
+++ b/spec/helpers/submodule_helper_spec.rb
@@ -95,7 +95,7 @@ describe SubmoduleHelper do
         allow(repo).to receive(:project).and_return(project)
 
         stub_url('./')
-        expect(subject).to eq(["/master-project/#{project.path}", "/master-project/#{project.path}/tree/hash"])
+        expect(subject).to eq(["/master-project/#{project.path}", "/master-project/#{project.path}/-/tree/hash"])
       end
     end
 
@@ -166,7 +166,7 @@ describe SubmoduleHelper do
         allow(repo).to receive(:submodule_url_for).and_return(relative_path)
         result = subject
 
-        expect(result).to eq([expected_path, "#{expected_path}/tree/#{submodule_item.id}"])
+        expect(result).to eq([expected_path, "#{expected_path}/-/tree/#{submodule_item.id}"])
       end
 
       it 'handles project under same group' do