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
998c396d
Commit
998c396d
authored
Nov 07, 2021
by
Marcia Ramos
Committed by
Thong Kuah
Nov 07, 2021
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Review Adv Search admin UI text
Changelog: changed
parent
9e34f971
Changes
4
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
92 additions
and
80 deletions
+92
-80
ee/app/views/admin/application_settings/_elasticsearch_form.html.haml
.../admin/application_settings/_elasticsearch_form.html.haml
+32
-26
ee/spec/features/admin/admin_settings_spec.rb
ee/spec/features/admin/admin_settings_spec.rb
+1
-1
ee/spec/views/admin/application_settings/_elasticsearch_form.html.haml_spec.rb
...pplication_settings/_elasticsearch_form.html.haml_spec.rb
+5
-5
locale/gitlab.pot
locale/gitlab.pot
+54
-48
No files found.
ee/app/views/admin/application_settings/_elasticsearch_form.html.haml
View file @
998c396d
This diff is collapsed.
Click to expand it.
ee/spec/features/admin/admin_settings_spec.rb
View file @
998c396d
...
...
@@ -115,7 +115,7 @@ RSpec.describe 'Admin updates EE-only settings' do
expect
(
page
).
not_to
have_content
(
'Namespaces to index'
)
expect
(
page
).
not_to
have_content
(
'Projects to index'
)
check
'Limit
namespaces and projects that can be indexed
'
check
'Limit
the number of namespaces and projects that can be indexed.
'
expect
(
page
).
to
have_content
(
'Namespaces to index'
)
expect
(
page
).
to
have_content
(
'Projects to index'
)
...
...
ee/spec/views/admin/application_settings/_elasticsearch_form.html.haml_spec.rb
View file @
998c396d
...
...
@@ -237,11 +237,11 @@ RSpec.describe 'admin/application_settings/_elasticsearch_form' do
it
'does not show the retry migration card'
do
render
expect
(
rendered
).
not_to
include
(
'
There is a halted Elasticsearch migration
'
)
expect
(
rendered
).
not_to
include
(
'
Elasticsearch migration halted
'
)
expect
(
rendered
).
not_to
include
(
'Retry migration'
)
end
context
'when
there is a halted migration
'
do
context
'when
Elasticsearch migration halted
'
do
let
(
:migration
)
{
Elastic
::
DataMigrationService
.
migrations
.
last
}
before
do
...
...
@@ -253,7 +253,7 @@ RSpec.describe 'admin/application_settings/_elasticsearch_form' do
it
'shows the retry migration card'
do
render
expect
(
rendered
).
to
include
(
'
There is a halted Elasticsearch migration
'
)
expect
(
rendered
).
to
include
(
'
Elasticsearch migration halted
'
)
expect
(
rendered
).
to
have_css
(
'a'
,
text:
'Retry migration'
)
expect
(
rendered
).
not_to
have_css
(
'a[disabled="disabled"]'
,
text:
'Retry migration'
)
end
...
...
@@ -267,7 +267,7 @@ RSpec.describe 'admin/application_settings/_elasticsearch_form' do
it
'shows the retry migration card with retry button disabled'
do
render
expect
(
rendered
).
to
include
(
'
There is a halted Elasticsearch migration
'
)
expect
(
rendered
).
to
include
(
'
Elasticsearch migration halted
'
)
expect
(
rendered
).
to
have_css
(
'a[disabled="disabled"]'
,
text:
'Retry migration'
)
end
end
...
...
@@ -281,7 +281,7 @@ RSpec.describe 'admin/application_settings/_elasticsearch_form' do
it
'does not show the retry migration card'
do
render
expect
(
rendered
).
not_to
include
(
'
There is a halted Elasticsearch migration
'
)
expect
(
rendered
).
not_to
include
(
'
Elasticsearch migration halted
'
)
expect
(
rendered
).
not_to
include
(
'Retry migration'
)
end
end
...
...
locale/gitlab.pot
View file @
998c396d
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