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
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
gitlab-ce
Commits
a445630f
Commit
a445630f
authored
Jul 04, 2016
by
Phil Hughes
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Added day name to contributions calendar
Closes #19367
parent
021b6aef
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
8 additions
and
2 deletions
+8
-2
CHANGELOG
CHANGELOG
+1
-0
app/assets/javascripts/lib/utils/datetime_utility.js.coffee
app/assets/javascripts/lib/utils/datetime_utility.js.coffee
+4
-0
app/assets/javascripts/users/calendar.js.coffee
app/assets/javascripts/users/calendar.js.coffee
+3
-2
No files found.
CHANGELOG
View file @
a445630f
...
@@ -11,6 +11,7 @@ v 8.10.0 (unreleased)
...
@@ -11,6 +11,7 @@ v 8.10.0 (unreleased)
- Apply the trusted_proxies config to the rack request object for use with rack_attack
- Apply the trusted_proxies config to the rack request object for use with rack_attack
- Add Sidekiq queue duration to transaction metrics.
- Add Sidekiq queue duration to transaction metrics.
- Let Workhorse serve format-patch diffs
- Let Workhorse serve format-patch diffs
- Added day name to contribution calendar tooltips
- Make images fit to the size of the viewport !4810
- Make images fit to the size of the viewport !4810
- Fix check for New Branch button on Issue page !4630 (winniehell)
- Fix check for New Branch button on Issue page !4630 (winniehell)
- Fix MR-auto-close text added to description. !4836
- Fix MR-auto-close text added to description. !4836
...
...
app/assets/javascripts/lib/utils/datetime_utility.js.coffee
View file @
a445630f
...
@@ -2,10 +2,14 @@
...
@@ -2,10 +2,14 @@
w
.
gl
?=
{}
w
.
gl
?=
{}
w
.
gl
.
utils
?=
{}
w
.
gl
.
utils
?=
{}
w
.
gl
.
utils
.
days
=
[
'Monday'
,
'Tuesday'
,
'Wednesday'
,
'Thursday'
,
'Friday'
,
'Saturday'
,
'Sunday'
]
w
.
gl
.
utils
.
formatDate
=
(
datetime
)
->
w
.
gl
.
utils
.
formatDate
=
(
datetime
)
->
dateFormat
(
datetime
,
'mmm d, yyyy h:MMtt Z'
)
dateFormat
(
datetime
,
'mmm d, yyyy h:MMtt Z'
)
w
.
gl
.
utils
.
getDayName
=
(
date
)
->
this
.
days
[
date
.
getDay
()]
w
.
gl
.
utils
.
localTimeAgo
=
(
$timeagoEls
,
setTimeago
=
true
)
->
w
.
gl
.
utils
.
localTimeAgo
=
(
$timeagoEls
,
setTimeago
=
true
)
->
$timeagoEls
.
each
(
->
$timeagoEls
.
each
(
->
$el
=
$
(
@
)
$el
=
$
(
@
)
...
...
app/assets/javascripts/users/calendar.js.coffee
View file @
a445630f
...
@@ -87,14 +87,15 @@ class @Calendar
...
@@ -87,14 +87,15 @@ class @Calendar
.
attr
'width'
,
@
daySize
.
attr
'width'
,
@
daySize
.
attr
'height'
,
@
daySize
.
attr
'height'
,
@
daySize
.
attr
'title'
,
(
stamp
)
=>
.
attr
'title'
,
(
stamp
)
=>
date
=
new
Date
(
stamp
.
date
)
contribText
=
'No contributions'
contribText
=
'No contributions'
if
stamp
.
count
>
0
if
stamp
.
count
>
0
contribText
=
"
#{
stamp
.
count
}
contribution
#{
if
stamp
.
count
>
1
then
's'
else
''
}
"
contribText
=
"
#{
stamp
.
count
}
contribution
#{
if
stamp
.
count
>
1
then
's'
else
''
}
"
date
=
dateFormat
(
stamp
.
date
,
'mmm d, yyyy'
)
date
Text
=
dateFormat
(
date
,
'mmm d, yyyy'
)
"
#{
contribText
}
<br />
#{
date
}
"
"
#{
contribText
}
<br />
#{
gl
.
utils
.
getDayName
(
date
)
}
#{
dateText
}
"
.
attr
'class'
,
'user-contrib-cell js-tooltip'
.
attr
'class'
,
'user-contrib-cell js-tooltip'
.
attr
'fill'
,
(
stamp
)
=>
.
attr
'fill'
,
(
stamp
)
=>
if
stamp
.
count
isnt
0
if
stamp
.
count
isnt
0
...
...
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