Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/app/views
diff options
context:
space:
mode:
authorBM5k <me@bm5k.com>2016-12-01 00:28:42 +0300
committerBM5k <me@bm5k.com>2016-12-04 00:39:35 +0300
commit48895aa40dd2bfc13453b0b28c6d122f4e1c58be (patch)
tree9dd960eca4ef57b87d6e4c37c6007573e5d673b0 /app/views
parent24e5a1e8db943be346b4f7f4fb49326ad0e5eb9e (diff)
change the date label to match the date used
Diffstat (limited to 'app/views')
-rw-r--r--app/views/projects/blame/show.html.haml2
-rw-r--r--app/views/projects/commits/_commit.html.haml2
2 files changed, 2 insertions, 2 deletions
diff --git a/app/views/projects/blame/show.html.haml b/app/views/projects/blame/show.html.haml
index cadfe5a3e30..f63802ac88b 100644
--- a/app/views/projects/blame/show.html.haml
+++ b/app/views/projects/blame/show.html.haml
@@ -31,7 +31,7 @@
&nbsp;
.light
= commit_author_link(commit, avatar: false)
- authored
+ committed
#{time_ago_with_tooltip(commit.committed_date)}
%td.line-numbers
- line_count = blame_group[:lines].count
diff --git a/app/views/projects/commits/_commit.html.haml b/app/views/projects/commits/_commit.html.haml
index 12096941209..a940515fadf 100644
--- a/app/views/projects/commits/_commit.html.haml
+++ b/app/views/projects/commits/_commit.html.haml
@@ -37,5 +37,5 @@
= preserve(markdown(commit.description, pipeline: :single_line, author: commit.author))
= commit_author_link(commit, avatar: false, size: 24)
- authored
+ committed
#{time_ago_with_tooltip(commit.committed_date)}