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
fb0aeeca
Commit
fb0aeeca
authored
4 years ago
by
Gilang Gumilar
Committed by
Jose Ivan Vargas
4 years ago
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Replace bootstrap alerts in ee/app/views/admin/licenses/new.html.haml
parent
74708609
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
25 additions
and
3 deletions
+25
-3
changelogs/unreleased/233699-replace-bootstrap-alerts-in-ee-app-views-admin-licenses-new-html-h.yml
...trap-alerts-in-ee-app-views-admin-licenses-new-html-h.yml
+5
-0
ee/app/views/admin/licenses/new.html.haml
ee/app/views/admin/licenses/new.html.haml
+11
-3
ee/spec/features/admin/licenses/admin_uploads_license_spec.rb
...pec/features/admin/licenses/admin_uploads_license_spec.rb
+1
-0
locale/gitlab.pot
locale/gitlab.pot
+8
-0
No files found.
changelogs/unreleased/233699-replace-bootstrap-alerts-in-ee-app-views-admin-licenses-new-html-h.yml
0 → 100644
View file @
fb0aeeca
---
title
:
Replace bootstrap alerts in ee/app/views/admin/licenses/new.html.haml
merge_request
:
41275
author
:
Gilang Gumilar
type
:
changed
This diff is collapsed.
Click to expand it.
ee/app/views/admin/licenses/new.html.haml
View file @
fb0aeeca
...
...
@@ -10,9 +10,17 @@
=
form_for
@license
,
url:
admin_license_path
,
html:
{
multipart:
true
,
class:
'fieldset-form'
}
do
|
f
|
-
if
@license
.
errors
.
any?
#error_explanation
.alert.alert-danger
-
@license
.
errors
.
full_messages
.
each
do
|
msg
|
%p
=
msg
.gl-alert.gl-alert-danger.gl-mb-5
=
sprite_icon
(
'warning'
,
size:
16
,
css_class:
'gl-icon gl-alert-icon gl-alert-icon-no-title'
)
.gl-alert-body
%p
=
_
(
'The form contains the following errors:'
)
%details
%summary
=
n_
(
'%d error found:'
,
'%d errors found:'
,
@license
.
errors
.
full_messages
.
length
)
%
@license
.
errors
.
full_messages
.
length
%ul
-
@license
.
errors
.
full_messages
.
each
do
|
msg
|
%li
=
msg
.form-group.row
.col-sm-2
...
...
This diff is collapsed.
Click to expand it.
ee/spec/features/admin/licenses/admin_uploads_license_spec.rb
View file @
fb0aeeca
...
...
@@ -136,6 +136,7 @@ RSpec.describe "Admin uploads license", :js do
it
"doesn't upload license"
do
attach_and_upload
(
path
)
find
(
'.gl-alert details'
).
click
expect
(
page
).
to
have_content
(
"This license has already expired."
)
end
end
...
...
This diff is collapsed.
Click to expand it.
locale/gitlab.pot
View file @
fb0aeeca
...
...
@@ -180,6 +180,11 @@ msgid_plural "%d errors"
msgstr[0] ""
msgstr[1] ""
msgid "%d error found:"
msgid_plural "%d errors found:"
msgstr[0] ""
msgstr[1] ""
msgid "%d exporter"
msgid_plural "%d exporters"
msgstr[0] ""
...
...
@@ -27085,6 +27090,9 @@ msgstr ""
msgid "The form contains the following error:"
msgstr ""
msgid "The form contains the following errors:"
msgstr ""
msgid "The form contains the following warning:"
msgstr ""
...
...
This diff is collapsed.
Click to expand it.
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