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
24c3b460
Commit
24c3b460
authored
May 08, 2020
by
Coung Ngo
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Make edit board text sentence case
The text in the edit board dialog had inconsistent case
parent
5ee1e505
Changes
17
Hide whitespace changes
Inline
Side-by-side
Showing
17 changed files
with
51 additions
and
49 deletions
+51
-49
app/assets/javascripts/boards/components/board_sidebar.js
app/assets/javascripts/boards/components/board_sidebar.js
+1
-1
app/assets/javascripts/labels_select.js
app/assets/javascripts/labels_select.js
+3
-3
app/assets/javascripts/milestone_select.js
app/assets/javascripts/milestone_select.js
+4
-4
changelogs/unreleased/cngo-make-edit-board-text-sentence-case.yml
...gs/unreleased/cngo-make-edit-board-text-sentence-case.yml
+5
-0
ee/app/assets/javascripts/boards/components/board_scope.vue
ee/app/assets/javascripts/boards/components/board_scope.vue
+1
-1
ee/app/assets/javascripts/boards/components/milestone_select.vue
...assets/javascripts/boards/components/milestone_select.vue
+2
-2
ee/app/assets/javascripts/boards/components/weight_select.vue
...pp/assets/javascripts/boards/components/weight_select.vue
+1
-1
ee/app/assets/javascripts/boards/mixins/extra_milestones.js
ee/app/assets/javascripts/boards/mixins/extra_milestones.js
+1
-1
ee/app/views/shared/epic/_search_bar.html.haml
ee/app/views/shared/epic/_search_bar.html.haml
+1
-1
ee/spec/features/boards/scoped_issue_board_spec.rb
ee/spec/features/boards/scoped_issue_board_spec.rb
+5
-5
ee/spec/frontend/boards/components/weight_select_spec.js
ee/spec/frontend/boards/components/weight_select_spec.js
+4
-4
ee/spec/javascripts/boards/milestone_select_spec.js
ee/spec/javascripts/boards/milestone_select_spec.js
+10
-10
locale/gitlab.pot
locale/gitlab.pot
+9
-12
spec/features/boards/sidebar_spec.rb
spec/features/boards/sidebar_spec.rb
+1
-1
spec/features/issues/bulk_assignment_labels_spec.rb
spec/features/issues/bulk_assignment_labels_spec.rb
+1
-1
spec/features/issues/update_issues_spec.rb
spec/features/issues/update_issues_spec.rb
+1
-1
spec/features/merge_requests/user_mass_updates_spec.rb
spec/features/merge_requests/user_mass_updates_spec.rb
+1
-1
No files found.
app/assets/javascripts/boards/components/board_sidebar.js
View file @
24c3b460
...
...
@@ -51,7 +51,7 @@ export default Vue.extend({
return
Object
.
keys
(
this
.
issue
).
length
;
},
milestoneTitle
()
{
return
this
.
issue
.
milestone
?
this
.
issue
.
milestone
.
title
:
__
(
'
No
M
ilestone
'
);
return
this
.
issue
.
milestone
?
this
.
issue
.
milestone
.
title
:
__
(
'
No
m
ilestone
'
);
},
canRemove
()
{
return
!
this
.
list
.
preset
;
...
...
app/assets/javascripts/labels_select.js
View file @
24c3b460
...
...
@@ -186,13 +186,13 @@ export default class LabelsSelect {
if
(
showNo
)
{
extraData
.
unshift
({
id
:
0
,
title
:
__
(
'
No
L
abel
'
),
title
:
__
(
'
No
l
abel
'
),
});
}
if
(
showAny
)
{
extraData
.
unshift
({
isAny
:
true
,
title
:
__
(
'
Any
L
abel
'
),
title
:
__
(
'
Any
l
abel
'
),
});
}
if
(
extraData
.
length
)
{
...
...
@@ -294,7 +294,7 @@ export default class LabelsSelect {
if
(
selected
&&
selected
.
id
===
0
)
{
this
.
selected
=
[];
return
__
(
'
No
L
abel
'
);
return
__
(
'
No
l
abel
'
);
}
else
if
(
isSelected
)
{
this
.
selected
.
push
(
title
);
}
else
if
(
!
isSelected
&&
title
)
{
...
...
app/assets/javascripts/milestone_select.js
View file @
24c3b460
...
...
@@ -56,7 +56,7 @@ export default class MilestoneSelect {
const
$loading
=
$block
.
find
(
'
.block-loading
'
).
fadeOut
();
selectedMilestoneDefault
=
showAny
?
''
:
null
;
selectedMilestoneDefault
=
showNo
&&
defaultNo
?
__
(
'
No
M
ilestone
'
)
:
selectedMilestoneDefault
;
showNo
&&
defaultNo
?
__
(
'
No
m
ilestone
'
)
:
selectedMilestoneDefault
;
selectedMilestone
=
$dropdown
.
data
(
'
selected
'
)
||
selectedMilestoneDefault
;
if
(
issueUpdateURL
)
{
...
...
@@ -74,14 +74,14 @@ export default class MilestoneSelect {
extraOptions
.
push
({
id
:
null
,
name
:
null
,
title
:
__
(
'
Any
M
ilestone
'
),
title
:
__
(
'
Any
m
ilestone
'
),
});
}
if
(
showNo
)
{
extraOptions
.
push
({
id
:
-
1
,
name
:
__
(
'
No
M
ilestone
'
),
title
:
__
(
'
No
M
ilestone
'
),
name
:
__
(
'
No
m
ilestone
'
),
title
:
__
(
'
No
m
ilestone
'
),
});
}
if
(
showUpcoming
)
{
...
...
changelogs/unreleased/cngo-make-edit-board-text-sentence-case.yml
0 → 100644
View file @
24c3b460
---
title
:
Make edit board text sentence case
merge_request
:
31418
author
:
type
:
fixed
ee/app/assets/javascripts/boards/components/board_scope.vue
View file @
24c3b460
...
...
@@ -118,7 +118,7 @@ export default {
ability-name=
"issue"
@
onLabelClick=
"handleLabelClick"
>
{{
__
(
'
Any
L
abel
'
)
}}
{{
__
(
'
Any
l
abel
'
)
}}
</board-labels-select>
<assignee-select
...
...
ee/app/assets/javascripts/boards/components/milestone_select.vue
View file @
24c3b460
...
...
@@ -3,8 +3,8 @@
import
{
GlLoadingIcon
}
from
'
@gitlab/ui
'
;
import
MilestoneSelect
from
'
~/milestone_select
'
;
const
ANY_MILESTONE
=
'
Any
M
ilestone
'
;
const
NO_MILESTONE
=
'
No
M
ilestone
'
;
const
ANY_MILESTONE
=
'
Any
m
ilestone
'
;
const
NO_MILESTONE
=
'
No
m
ilestone
'
;
export
default
{
components
:
{
...
...
ee/app/assets/javascripts/boards/components/weight_select.vue
View file @
24c3b460
<
script
>
import
{
GlDeprecatedButton
,
GlDropdown
,
GlDropdownItem
}
from
'
@gitlab/ui
'
;
const
ANY_WEIGHT
=
'
Any
W
eight
'
;
const
ANY_WEIGHT
=
'
Any
w
eight
'
;
const
NO_WEIGHT
=
'
None
'
;
export
default
{
...
...
ee/app/assets/javascripts/boards/mixins/extra_milestones.js
View file @
24c3b460
...
...
@@ -3,7 +3,7 @@ import { __ } from '~/locale';
export
default
[
{
id
:
null
,
title
:
__
(
'
Any
M
ilestone
'
),
title
:
__
(
'
Any
m
ilestone
'
),
},
{
id
:
-
2
,
...
...
ee/app/views/shared/epic/_search_bar.html.haml
View file @
24c3b460
...
...
@@ -71,7 +71,7 @@
%ul
{
data:
{
dropdown:
true
}
}
%li
.filter-dropdown-item
{
data:
{
value:
'none'
}
}
%button
.btn.btn-link
{
type:
'button'
}
=
_
(
"No
L
abel"
)
=
_
(
"No
l
abel"
)
%li
.divider.droplab-item-ignore
%ul
.filter-dropdown
{
data:
{
dynamic:
true
,
dropdown:
true
}
}
%li
.filter-dropdown-item
{
type:
'button'
}
...
...
ee/spec/features/boards/scoped_issue_board_spec.rb
View file @
24c3b460
...
...
@@ -48,15 +48,15 @@ describe 'Scoped issue boards', :js do
expect
(
page
).
to
have_selector
(
'.board-card'
,
count:
1
)
end
it
'creates board filtering by No
M
ilestone'
do
create_board_milestone
(
'No
M
ilestone'
)
it
'creates board filtering by No
m
ilestone'
do
create_board_milestone
(
'No
m
ilestone'
)
expect
(
find
(
'.tokens-container'
)).
to
have_content
(
""
)
expect
(
page
).
to
have_selector
(
'.board-card'
,
count:
2
)
end
it
'creates board filtering by Any
M
ilestone'
do
create_board_milestone
(
'Any
M
ilestone'
)
it
'creates board filtering by Any
m
ilestone'
do
create_board_milestone
(
'Any
m
ilestone'
)
expect
(
find
(
'.tokens-container'
)).
to
have_content
(
""
)
expect
(
page
).
to
have_selector
(
'.board-card'
,
count:
3
)
...
...
@@ -232,7 +232,7 @@ describe 'Scoped issue boards', :js do
end
it
'sets board to any milestone'
do
update_board_milestone
(
'Any
M
ilestone'
)
update_board_milestone
(
'Any
m
ilestone'
)
expect
(
find
(
'.tokens-container'
)).
not_to
have_content
(
milestone
.
title
)
...
...
ee/spec/frontend/boards/components/weight_select_spec.js
View file @
24c3b460
...
...
@@ -36,8 +36,8 @@ describe('WeightSelect', () => {
createComponent
();
});
it
(
'
displays "Any
W
eight"
'
,
()
=>
{
expect
(
valueContainer
().
text
()).
toEqual
(
'
Any
W
eight
'
);
it
(
'
displays "Any
w
eight"
'
,
()
=>
{
expect
(
valueContainer
().
text
()).
toEqual
(
'
Any
w
eight
'
);
});
it
(
'
hides the weight dropdown
'
,
()
=>
{
...
...
@@ -98,10 +98,10 @@ describe('WeightSelect', () => {
describe
(
'
when a new weight value is selected
'
,
()
=>
{
it
.
each
`
weight | text
${
null
}
|
${
'
Any
W
eight
'
}
${
null
}
|
${
'
Any
w
eight
'
}
${
0
}
|
${
'
0
'
}
${
1
}
|
${
'
1
'
}
${
-
1
}
|
${
'
Any
W
eight
'
}
${
-
1
}
|
${
'
Any
w
eight
'
}
${
-
2
}
|
${
'
None
'
}
`
(
'
$weight displays as "$text"
'
,
({
weight
,
text
})
=>
{
createComponent
({
board
:
{
weight
}
});
...
...
ee/spec/javascripts/boards/milestone_select_spec.js
View file @
24c3b460
...
...
@@ -67,14 +67,14 @@ describe('Milestone select component', () => {
});
describe
(
'
selected value
'
,
()
=>
{
it
(
'
defaults to Any
M
ilestone
'
,
()
=>
{
expect
(
selectedText
()).
toContain
(
'
Any
M
ilestone
'
);
it
(
'
defaults to Any
m
ilestone
'
,
()
=>
{
expect
(
selectedText
()).
toContain
(
'
Any
m
ilestone
'
);
});
it
(
'
shows No
M
ilestone
'
,
done
=>
{
it
(
'
shows No
m
ilestone
'
,
done
=>
{
vm
.
board
.
milestone_id
=
0
;
Vue
.
nextTick
(()
=>
{
expect
(
selectedText
()).
toContain
(
'
No
M
ilestone
'
);
expect
(
selectedText
()).
toContain
(
'
No
m
ilestone
'
);
done
();
});
});
...
...
@@ -103,7 +103,7 @@ describe('Milestone select component', () => {
mock
.
restore
();
});
it
(
'
sets Any
M
ilestone
'
,
done
=>
{
it
(
'
sets Any
m
ilestone
'
,
done
=>
{
vm
.
board
.
milestone_id
=
0
;
vm
.
$el
.
querySelector
(
'
.edit-link
'
).
click
();
...
...
@@ -112,13 +112,13 @@ describe('Milestone select component', () => {
});
setTimeout
(()
=>
{
expect
(
activeDropdownItem
(
0
)).
toEqual
(
'
Any
M
ilestone
'
);
expect
(
selectedText
()).
toEqual
(
'
Any
M
ilestone
'
);
expect
(
activeDropdownItem
(
0
)).
toEqual
(
'
Any
m
ilestone
'
);
expect
(
selectedText
()).
toEqual
(
'
Any
m
ilestone
'
);
done
();
});
});
it
(
'
sets No
M
ilestone
'
,
done
=>
{
it
(
'
sets No
m
ilestone
'
,
done
=>
{
vm
.
$el
.
querySelector
(
'
.edit-link
'
).
click
();
setTimeout
(()
=>
{
...
...
@@ -126,8 +126,8 @@ describe('Milestone select component', () => {
});
setTimeout
(()
=>
{
expect
(
activeDropdownItem
(
0
)).
toEqual
(
'
No
M
ilestone
'
);
expect
(
selectedText
()).
toEqual
(
'
No
M
ilestone
'
);
expect
(
activeDropdownItem
(
0
)).
toEqual
(
'
No
m
ilestone
'
);
expect
(
selectedText
()).
toEqual
(
'
No
m
ilestone
'
);
done
();
});
});
...
...
locale/gitlab.pot
View file @
24c3b460
...
...
@@ -2312,12 +2312,6 @@ msgstr ""
msgid "Any Author"
msgstr ""
msgid "Any Label"
msgstr ""
msgid "Any Milestone"
msgstr ""
msgid "Any branch"
msgstr ""
...
...
@@ -2327,9 +2321,15 @@ msgstr ""
msgid "Any encrypted tokens"
msgstr ""
msgid "Any label"
msgstr ""
msgid "Any member with Developer or higher permissions to the project."
msgstr ""
msgid "Any milestone"
msgstr ""
msgid "Any namespace"
msgstr ""
...
...
@@ -13892,12 +13892,6 @@ msgstr ""
msgid "No Epic"
msgstr ""
msgid "No Label"
msgstr ""
msgid "No Milestone"
msgstr ""
msgid "No Scopes"
msgstr ""
...
...
@@ -13994,6 +13988,9 @@ msgstr ""
msgid "No jobs to show"
msgstr ""
msgid "No label"
msgstr ""
msgid "No labels with such name or description"
msgstr ""
...
...
spec/features/boards/sidebar_spec.rb
View file @
24c3b460
...
...
@@ -217,7 +217,7 @@ describe 'Issue Boards', :js do
wait_for_requests
click_link
"No
M
ilestone"
click_link
"No
m
ilestone"
wait_for_requests
...
...
spec/features/issues/bulk_assignment_labels_spec.rb
View file @
24c3b460
...
...
@@ -274,7 +274,7 @@ describe 'Issues > Labels bulk assignment' do
expect
(
find
(
"#issue_
#{
issue2
.
id
}
"
)).
to
have_content
'First Release'
check
'check-all-issues'
open_milestone_dropdown
([
'No
M
ilestone'
])
open_milestone_dropdown
([
'No
m
ilestone'
])
update_issues
expect
(
find
(
"#issue_
#{
issue1
.
id
}
"
)).
to
have_content
'bug'
...
...
spec/features/issues/update_issues_spec.rb
View file @
24c3b460
...
...
@@ -95,7 +95,7 @@ describe 'Multiple issue updating from issues#index', :js do
find
(
'#check-all-issues'
).
click
find
(
'.issues-bulk-update .js-milestone-select'
).
click
find
(
'.dropdown-menu-milestone a'
,
text:
"No
M
ilestone"
).
click
find
(
'.dropdown-menu-milestone a'
,
text:
"No
m
ilestone"
).
click
click_update_issues_button
expect
(
find
(
'.issue:first-child'
)).
not_to
have_content
milestone
.
title
...
...
spec/features/merge_requests/user_mass_updates_spec.rb
View file @
24c3b460
...
...
@@ -91,7 +91,7 @@ describe 'Merge requests > User mass updates', :js do
end
it
'removes milestone from the merge request'
do
change_milestone
(
"No
M
ilestone"
)
change_milestone
(
"No
m
ilestone"
)
expect
(
find
(
'.merge-request'
)).
not_to
have_content
milestone
.
title
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