Commit 916a69ea authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Merge branch 'dz-update-source-code-project' into 'master'

Rename gitlab-ee to gitlab in version check helper

See merge request gitlab-org/gitlab!16931
parents bbc86eb2 699e4492
...@@ -19,7 +19,7 @@ module VersionCheckHelper ...@@ -19,7 +19,7 @@ module VersionCheckHelper
end end
def source_code_project def source_code_project
'gitlab-ce' 'gitlab-foss'
end end
end end
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
module EE module EE
module VersionCheckHelper module VersionCheckHelper
def source_code_project def source_code_project
'gitlab-ee' 'gitlab'
end end
end end
end end
...@@ -12,7 +12,7 @@ describe EE::VersionCheckHelper do ...@@ -12,7 +12,7 @@ describe EE::VersionCheckHelper do
end end
it 'links to an ee-commit' do it 'links to an ee-commit' do
expect(helper.link_to_version).to include('https://gitlab.com/gitlab-org/gitlab-ee/commits/deadbeef') expect(helper.link_to_version).to include('https://gitlab.com/gitlab-org/gitlab/commits/deadbeef')
end end
end end
...@@ -22,7 +22,7 @@ describe EE::VersionCheckHelper do ...@@ -22,7 +22,7 @@ describe EE::VersionCheckHelper do
end end
it 'links to an ee-tag' do it 'links to an ee-tag' do
expect(helper.link_to_version).to include('https://gitlab.com/gitlab-org/gitlab-ee/-/tags/v8.0.2-ee') expect(helper.link_to_version).to include('https://gitlab.com/gitlab-org/gitlab/-/tags/v8.0.2-ee')
end end
end end
end end
......
...@@ -31,7 +31,7 @@ describe 'help/index' do ...@@ -31,7 +31,7 @@ describe 'help/index' do
render render
expect(rendered).to match '8.0.2' expect(rendered).to match '8.0.2'
expect(rendered).to have_link('8.0.2', href: %r{https://gitlab.com/gitlab-org/gitlab-(ce|ee)/-/tags/v8.0.2}) expect(rendered).to have_link('8.0.2', href: %r{https://gitlab.com/gitlab-org/(gitlab|gitlab-foss)/-/tags/v8.0.2})
end end
it 'shows a link to the commit for pre-releases' do it 'shows a link to the commit for pre-releases' do
...@@ -40,7 +40,7 @@ describe 'help/index' do ...@@ -40,7 +40,7 @@ describe 'help/index' do
render render
expect(rendered).to match '8.0.2' expect(rendered).to match '8.0.2'
expect(rendered).to have_link('abcdefg', href: %r{https://gitlab.com/gitlab-org/gitlab-(ce|ee)/commits/abcdefg}) expect(rendered).to have_link('abcdefg', href: %r{https://gitlab.com/gitlab-org/(gitlab|gitlab-foss)/commits/abcdefg})
end end
end end
end end
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment