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
0
Merge Requests
0
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
Boxiang Sun
gitlab-ce
Commits
bc6f19a7
Commit
bc6f19a7
authored
Nov 19, 2018
by
Heinrich Lee Yu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Update empty state message
parent
801fc90c
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
7 additions
and
7 deletions
+7
-7
app/views/shared/empty_states/_issues.html.haml
app/views/shared/empty_states/_issues.html.haml
+2
-2
app/views/shared/empty_states/_merge_requests.html.haml
app/views/shared/empty_states/_merge_requests.html.haml
+2
-2
locale/gitlab.pot
locale/gitlab.pot
+1
-1
spec/features/issues_spec.rb
spec/features/issues_spec.rb
+1
-1
spec/features/merge_request/user_sees_empty_state_spec.rb
spec/features/merge_request/user_sees_empty_state_spec.rb
+1
-1
No files found.
app/views/shared/empty_states/_issues.html.haml
View file @
bc6f19a7
...
@@ -11,8 +11,8 @@
...
@@ -11,8 +11,8 @@
-
if
has_filter_bar_param?
-
if
has_filter_bar_param?
%h4
.text-center
%h4
.text-center
=
_
(
"Sorry, your filter produced no results"
)
=
_
(
"Sorry, your filter produced no results"
)
%p
%p
.text-center
=
_
(
"To widen your search, change or remove filters
in the filter bar
above"
)
=
_
(
"To widen your search, change or remove filters above"
)
-
elsif
current_user
-
elsif
current_user
%h4
%h4
=
_
(
"The Issue Tracker is the place to add things that need to be improved or solved in a project"
)
=
_
(
"The Issue Tracker is the place to add things that need to be improved or solved in a project"
)
...
...
app/views/shared/empty_states/_merge_requests.html.haml
View file @
bc6f19a7
...
@@ -11,8 +11,8 @@
...
@@ -11,8 +11,8 @@
-
if
has_filter_bar_param?
-
if
has_filter_bar_param?
%h4
.text-center
%h4
.text-center
=
_
(
"Sorry, your filter produced no results"
)
=
_
(
"Sorry, your filter produced no results"
)
%p
%p
.text-center
=
_
(
"To widen your search, change or remove filters
in the filter bar
above"
)
=
_
(
"To widen your search, change or remove filters above"
)
-
else
-
else
%h4
%h4
=
_
(
"Merge requests are a place to propose changes you've made to a project and discuss those changes with others"
)
=
_
(
"Merge requests are a place to propose changes you've made to a project and discuss those changes with others"
)
...
...
locale/gitlab.pot
View file @
bc6f19a7
...
@@ -6609,7 +6609,7 @@ msgstr ""
...
@@ -6609,7 +6609,7 @@ msgstr ""
msgid "To validate your GitLab CI configurations, go to 'CI/CD → Pipelines' inside your project, and click on the 'CI Lint' button."
msgid "To validate your GitLab CI configurations, go to 'CI/CD → Pipelines' inside your project, and click on the 'CI Lint' button."
msgstr ""
msgstr ""
msgid "To widen your search, change or remove filters
in the filter bar
above"
msgid "To widen your search, change or remove filters above"
msgstr ""
msgstr ""
msgid "Today"
msgid "Today"
...
...
spec/features/issues_spec.rb
View file @
bc6f19a7
...
@@ -15,7 +15,7 @@ describe 'Issues' do
...
@@ -15,7 +15,7 @@ describe 'Issues' do
visit
project_issues_path
(
project
,
milestone_title:
"1.0"
)
visit
project_issues_path
(
project
,
milestone_title:
"1.0"
)
expect
(
page
).
to
have_content
(
'Sorry, your filter produced no results'
)
expect
(
page
).
to
have_content
(
'Sorry, your filter produced no results'
)
expect
(
page
).
to
have_content
(
'To widen your search, change or remove filters
in the filter bar
above'
)
expect
(
page
).
to
have_content
(
'To widen your search, change or remove filters above'
)
end
end
end
end
...
...
spec/features/merge_request/user_sees_empty_state_spec.rb
View file @
bc6f19a7
...
@@ -32,7 +32,7 @@ describe 'Merge request > User sees empty state' do
...
@@ -32,7 +32,7 @@ describe 'Merge request > User sees empty state' do
expect
(
page
).
to
have_selector
(
'.empty-state'
)
expect
(
page
).
to
have_selector
(
'.empty-state'
)
expect
(
page
).
to
have_content
(
'Sorry, your filter produced no results'
)
expect
(
page
).
to
have_content
(
'Sorry, your filter produced no results'
)
expect
(
page
).
to
have_content
(
'To widen your search, change or remove filters
in the filter bar
above'
)
expect
(
page
).
to
have_content
(
'To widen your search, change or remove filters above'
)
end
end
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