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
4d5d4317
Commit
4d5d4317
authored
Apr 01, 2020
by
Brandon Labuschagne
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
VSA daterange now uses sameDaySelection
parent
0aff7751
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
8 deletions
+3
-8
ee/app/assets/javascripts/analytics/shared/components/daterange.vue
...ets/javascripts/analytics/shared/components/daterange.vue
+3
-5
locale/gitlab.pot
locale/gitlab.pot
+0
-3
No files found.
ee/app/assets/javascripts/analytics/shared/components/daterange.vue
View file @
4d5d4317
...
@@ -72,9 +72,6 @@ export default {
...
@@ -72,9 +72,6 @@ export default {
const
dayDifference
=
getDayDifference
(
this
.
startDate
,
this
.
endDate
);
const
dayDifference
=
getDayDifference
(
this
.
startDate
,
this
.
endDate
);
return
this
.
includeSelectedDate
?
dayDifference
+
OFFSET_DATE_BY_ONE
:
dayDifference
;
return
this
.
includeSelectedDate
?
dayDifference
+
OFFSET_DATE_BY_ONE
:
dayDifference
;
},
},
effectiveMaxDateRange
()
{
return
this
.
includeSelectedDate
?
this
.
maxDateRange
-
OFFSET_DATE_BY_ONE
:
this
.
maxDateRange
;
},
},
},
};
};
</
script
>
</
script
>
...
@@ -89,8 +86,9 @@ export default {
...
@@ -89,8 +86,9 @@ export default {
:default-start-date=
"startDate"
:default-start-date=
"startDate"
:default-end-date=
"endDate"
:default-end-date=
"endDate"
:default-min-date=
"minDate"
:default-min-date=
"minDate"
:max-date-range=
"
effectiveM
axDateRange"
:max-date-range=
"
m
axDateRange"
:default-max-date=
"maxDate"
:default-max-date=
"maxDate"
:same-day-selection=
"includeSelectedDate"
theme=
"animate-picker"
theme=
"animate-picker"
start-picker-class=
"js-daterange-picker-from d-flex flex-column flex-lg-row align-items-lg-center mr-lg-2 mb-2 mb-md-0"
start-picker-class=
"js-daterange-picker-from d-flex flex-column flex-lg-row align-items-lg-center mr-lg-2 mb-2 mb-md-0"
end-picker-class=
"js-daterange-picker-to d-flex flex-column flex-lg-row align-items-lg-center"
end-picker-class=
"js-daterange-picker-to d-flex flex-column flex-lg-row align-items-lg-center"
...
@@ -100,7 +98,7 @@ export default {
...
@@ -100,7 +98,7 @@ export default {
class=
"daterange-indicator d-flex flex-row flex-lg-row align-items-flex-start align-items-lg-center"
class=
"daterange-indicator d-flex flex-row flex-lg-row align-items-flex-start align-items-lg-center"
>
>
<span
class=
"number-of-days pl-2 pr-1"
>
<span
class=
"number-of-days pl-2 pr-1"
>
<gl-sprintf
:message=
"
__('%
{numberOfDays} days'
)">
<gl-sprintf
:message=
"
n__('1 day', '%d days', numberOfDays
)"
>
<template
#numberOfDays
>
{{
numberOfDays
}}
</
template
>
<template
#numberOfDays
>
{{
numberOfDays
}}
</
template
>
</gl-sprintf>
</gl-sprintf>
</span>
</span>
...
...
locale/gitlab.pot
View file @
4d5d4317
...
@@ -380,9 +380,6 @@ msgstr ""
...
@@ -380,9 +380,6 @@ msgstr ""
msgid "%{name}'s avatar"
msgid "%{name}'s avatar"
msgstr ""
msgstr ""
msgid "%{numberOfDays} days"
msgstr ""
msgid "%{number_commits_behind} commits behind %{default_branch}, %{number_commits_ahead} commits ahead"
msgid "%{number_commits_behind} commits behind %{default_branch}, %{number_commits_ahead} commits ahead"
msgstr ""
msgstr ""
...
...
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