Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
e8baeb7f
Commit
e8baeb7f
authored
Oct 26, 2019
by
GitLab Bot
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add latest changes from gitlab-org/gitlab@master
parent
71c6369c
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
25 additions
and
0 deletions
+25
-0
app/views/shared/_auto_devops_implicitly_enabled_banner.html.haml
...s/shared/_auto_devops_implicitly_enabled_banner.html.haml
+4
-0
changelogs/unreleased/dz-ask-users-to-enable-registry.yml
changelogs/unreleased/dz-ask-users-to-enable-registry.yml
+5
-0
locale/gitlab.pot
locale/gitlab.pot
+3
-0
spec/features/projects/show/user_interacts_with_auto_devops_banner_spec.rb
...jects/show/user_interacts_with_auto_devops_banner_spec.rb
+13
-0
No files found.
app/views/shared/_auto_devops_implicitly_enabled_banner.html.haml
View file @
e8baeb7f
...
...
@@ -7,3 +7,7 @@
=
link_to
_
(
'Settings'
),
project_settings_ci_cd_path
(
project
),
class:
'alert-link'
|
=
link_to
_
(
'Dismiss'
),
'#'
,
class:
'hide-auto-devops-implicitly-enabled-banner alert-link'
,
data:
{
project_id:
project
.
id
}
-
unless
Gitlab
.
config
.
registry
.
enabled
%div
=
icon
(
'exclamation-triangle'
)
=
_
(
'Container registry is not enabled on this GitLab instance. Ask an administrator to enable it in order for AutoDevOps to work.'
)
changelogs/unreleased/dz-ask-users-to-enable-registry.yml
0 → 100644
View file @
e8baeb7f
---
title
:
Add extra sentence about registry to AutoDevOps popup
merge_request
:
19092
author
:
type
:
changed
locale/gitlab.pot
View file @
e8baeb7f
...
...
@@ -4391,6 +4391,9 @@ msgstr ""
msgid "Container registry images"
msgstr ""
msgid "Container registry is not enabled on this GitLab instance. Ask an administrator to enable it in order for AutoDevOps to work."
msgstr ""
msgid "ContainerRegistry|Container Registry"
msgstr ""
...
...
spec/features/projects/show/user_interacts_with_auto_devops_banner_spec.rb
View file @
e8baeb7f
...
...
@@ -57,5 +57,18 @@ describe 'Project > Show > User interacts with auto devops implicitly enabled ba
expect
(
page
).
not_to
have_css
(
'.auto-devops-implicitly-enabled-banner'
)
end
end
context
'when AutoDevOps enabled but container registry is disabled'
do
before
do
stub_application_setting
(
auto_devops_enabled:
true
)
stub_container_registry_config
(
enabled:
false
)
visit
project_path
(
project
)
end
it
'shows message that container registry is disabled'
do
expect
(
page
).
to
have_content
(
'Container registry is not enabled on this GitLab instance'
)
end
end
end
end
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment