Commit

models/issues/comment.go

@@ -146,7 +146,6 @@ var commentStrings = []string{
 	"milestone",
 	"assignees",
 	"change_title",
-	"change_time_estimate",
 	"delete_branch",
 	"start_tracking",
 	"stop_tracking",
@@ -172,6 +171,7 @@ var commentStrings = []string{
 	"change_issue_ref",
 	"pull_scheduled_merge",
 	"pull_cancel_scheduled_merge",
+	"change_time_estimate",
 }
 
 func (t CommentType) String() string {

models/issues/tracked_time.go

@@ -221,7 +221,12 @@ func TotalTimes(options *FindTrackedTimesOptions) (map[*user_model.User]string,
 			}
 			return nil, err
 		}
-		totalTimes[user] = util.SecToTimeExact(total, false)
+
+		if total < 60 {
+			totalTimes[user] = util.SecToTimeExact(total, true)
+		} else {
+			totalTimes[user] = util.SecToTimeExact(total, false)
+		}
 	}
 	return totalTimes, nil
 }

models/issues/tracked_time_test.go

@@ -35,7 +35,7 @@ func TestAddTime(t *testing.T) {
 	assert.Equal(t, int64(3661), tt.Time)
 
 	comment := unittest.AssertExistsAndLoadBean(t, &issues_model.Comment{Type: issues_model.CommentTypeAddTimeManual, PosterID: 3, IssueID: 1})
-	assert.Equal(t, comment.Content, "1 hour 1 minute")
+	assert.Equal(t, comment.TimeTracked, int64(3661))
 }
 
 func TestGetTrackedTimes(t *testing.T) {
@@ -87,7 +87,7 @@ func TestTotalTimes(t *testing.T) {
 	assert.Len(t, total, 1)
 	for user, time := range total {
 		assert.Equal(t, int64(1), user.ID)
-		assert.Equal(t, "6 minutes 40 seconds", time)
+		assert.Equal(t, "6 minutes", time)
 	}
 
 	total, err = issues_model.TotalTimes(&issues_model.FindTrackedTimesOptions{IssueID: 2})