Commit 34e513d2 authored by GitLab Bot's avatar GitLab Bot
Browse files

Add latest changes from gitlab-org/gitlab@master

parent 81fdd2812315
......@@ -122,5 +122,4 @@
.only-ee:
only:
variables:
- $CI_PROJECT_NAME == "gitlab-ee"
- $CI_PROJECT_NAME == "gitlab" # New name of gitlab-ee after the single codebase migration
- $CI_PROJECT_NAME == "gitlab"
......@@ -35,7 +35,7 @@ def all_changed_files
end
def ee?
ENV['CI_PROJECT_NAME'] == 'gitlab-ee' || File.exist?('../../CHANGELOG-EE.md')
ENV['CI_PROJECT_NAME'] == 'gitlab' || File.exist?('../../CHANGELOG-EE.md')
end
def gitlab_helper
......@@ -52,7 +52,7 @@ def release_automation?
end
def project_name
ee? ? 'gitlab-ee' : 'gitlab-ce'
ee? ? 'gitlab' : 'gitlab-foss'
end
def markdown_list(items)
......
......@@ -86,8 +86,8 @@ def initialize(git:, gitlab:)
describe '#ee?' do
subject { helper.ee? }
it 'returns true if CI_PROJECT_NAME if set to gitlab-ee' do
stub_env('CI_PROJECT_NAME', 'gitlab-ee')
it 'returns true if CI_PROJECT_NAME if set to gitlab' do
stub_env('CI_PROJECT_NAME', 'gitlab')
expect(File).not_to receive(:exist?)
is_expected.to be_truthy
......@@ -118,16 +118,16 @@ def initialize(git:, gitlab:)
describe '#project_name' do
subject { helper.project_name }
it 'returns gitlab-ee if ee? returns true' do
it 'returns gitlab if ee? returns true' do
expect(helper).to receive(:ee?) { true }
is_expected.to eq('gitlab-ee')
is_expected.to eq('gitlab')
end
it 'returns gitlab-ce if ee? returns false' do
expect(helper).to receive(:ee?) { false }
is_expected.to eq('gitlab-ce')
is_expected.to eq('gitlab-foss')
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