group runners
This commit is contained in:
parent
a6c15c5b97
commit
748f8fef45
|
@ -26,9 +26,9 @@
|
||||||
|
|
||||||
- if can?(current_user, :admin_pipeline, @project.group)
|
- if can?(current_user, :admin_pipeline, @project.group)
|
||||||
- group_link = link_to _('Group CI/CD settings'), group_settings_ci_cd_path(@project.group)
|
- group_link = link_to _('Group CI/CD settings'), group_settings_ci_cd_path(@project.group)
|
||||||
= _('Group masters can register group runners in the %{link}').html_safe % { link: group_link }
|
= _('Group maintainers can register group runners in the %{link}').html_safe % { link: group_link }
|
||||||
- else
|
- else
|
||||||
= _('Ask your group master to setup a group Runner.')
|
= _('Ask your group maintainer to setup a group Runner.')
|
||||||
|
|
||||||
- else
|
- else
|
||||||
%h4.underlined-title
|
%h4.underlined-title
|
||||||
|
|
|
@ -439,7 +439,7 @@ msgstr ""
|
||||||
msgid "Artifacts"
|
msgid "Artifacts"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
msgid "Ask your group master to setup a group Runner."
|
msgid "Ask your group maintainer to setup a group Runner."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
msgid "Assign custom color like #FF0000"
|
msgid "Assign custom color like #FF0000"
|
||||||
|
@ -2237,7 +2237,7 @@ msgstr ""
|
||||||
msgid "Group Runners"
|
msgid "Group Runners"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
msgid "Group masters can register group runners in the %{link}"
|
msgid "Group maintainers can register group runners in the %{link}"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
msgid "GroupSettings|Prevent sharing a project within %{group} with other groups"
|
msgid "GroupSettings|Prevent sharing a project within %{group} with other groups"
|
||||||
|
|
|
@ -184,7 +184,7 @@ feature 'Runners' do
|
||||||
|
|
||||||
given(:group) { create :group }
|
given(:group) { create :group }
|
||||||
|
|
||||||
context 'as project and group master' do
|
context 'as project and group maintainer' do
|
||||||
background do
|
background do
|
||||||
group.add_master(user)
|
group.add_master(user)
|
||||||
end
|
end
|
||||||
|
@ -197,13 +197,13 @@ feature 'Runners' do
|
||||||
|
|
||||||
expect(page).to have_content 'This group does not provide any group Runners yet'
|
expect(page).to have_content 'This group does not provide any group Runners yet'
|
||||||
|
|
||||||
expect(page).to have_content 'Group masters can register group runners in the Group CI/CD settings'
|
expect(page).to have_content 'Group maintainers can register group runners in the Group CI/CD settings'
|
||||||
expect(page).not_to have_content 'Ask your group master to setup a group Runner'
|
expect(page).not_to have_content 'Ask your group maintainer to setup a group Runner'
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
context 'as project master' do
|
context 'as project maintainer' do
|
||||||
context 'project without a group' do
|
context 'project without a group' do
|
||||||
given(:project) { create :project }
|
given(:project) { create :project }
|
||||||
|
|
||||||
|
@ -223,8 +223,8 @@ feature 'Runners' do
|
||||||
|
|
||||||
expect(page).to have_content 'This group does not provide any group Runners yet.'
|
expect(page).to have_content 'This group does not provide any group Runners yet.'
|
||||||
|
|
||||||
expect(page).not_to have_content 'Group masters can register group runners in the Group CI/CD settings'
|
expect(page).not_to have_content 'Group maintainers can register group runners in the Group CI/CD settings'
|
||||||
expect(page).to have_content 'Ask your group master to setup a group Runner.'
|
expect(page).to have_content 'Ask your group maintainer to setup a group Runner.'
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue