diff options
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/award_emoji/_awards_block.html.haml | 1 | ||||
| -rw-r--r-- | app/views/projects/graphs/charts.html.haml | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/app/views/award_emoji/_awards_block.html.haml b/app/views/award_emoji/_awards_block.html.haml index 793ddef2c58..a063fe54c99 100644 --- a/app/views/award_emoji/_awards_block.html.haml +++ b/app/views/award_emoji/_awards_block.html.haml @@ -16,5 +16,4 @@ %span{ class: "award-control-icon award-control-icon-neutral" }= sprite_icon('slight-smile') %span{ class: "award-control-icon award-control-icon-positive" }= sprite_icon('smiley') %span{ class: "award-control-icon award-control-icon-super-positive" }= sprite_icon('smile') - = icon('spinner spin', class: "award-control-icon award-control-icon-loading") = yield diff --git a/app/views/projects/graphs/charts.html.haml b/app/views/projects/graphs/charts.html.haml index b38449b3ab9..cb76e89f736 100644 --- a/app/views/projects/graphs/charts.html.haml +++ b/app/views/projects/graphs/charts.html.haml @@ -20,6 +20,7 @@ - end_time = capture do #{@commits_graph.end_date.strftime('%b %d')} = (_("Commit statistics for %{ref} %{start_time} - %{end_time}") % { ref: "<strong>#{h @ref}</strong>", start_time: start_time, end_time: end_time }).html_safe + = _("Excluding merge commits. Limited to %{limit} commits.") % {limit: number_with_delimiter(@commits_limit, delimiter: ',')} .col-md-6 .tree-ref-container |