Merge branch 'master' into feature/issue-5092

Author: xor-gate

.drone.yml

@@ -56,7 +56,7 @@ pipeline:
       event: [ push, tag, pull_request ]
 
   build-without-gcc:
-    image: golang:1.11
+    image: golang:1.9
     pull: true
     commands:
       - go build -o gitea_no_gcc # test if build succeeds without the sqlite tag
@@ -117,18 +117,18 @@ pipeline:
     when:
       event: [ tag ]
 
-  test-sqlite:
-    image: golang:1.11
-    pull: true
-    group: test
-    environment:
-      TAGS: bindata
-    commands:
-      - curl -s https://packagecloud.io/install/repositories/github/git-lfs/script.deb.sh | bash
-      - apt-get install -y git-lfs
-      - make test-sqlite
-    when:
-      event: [ push, tag, pull_request ]
+      #  test-sqlite:
+      #    image: golang:1.11
+      #    pull: true
+      #    group: test
+      #    environment:
+      #      TAGS: bindata
+      #    commands:
+      #      - curl -s https://packagecloud.io/install/repositories/github/git-lfs/script.deb.sh | bash
+      #      - apt-get install -y git-lfs
+      #      - make test-sqlite
+      #    when:
+      #      event: [ push, tag, pull_request ]
 
   test-mysql:
     image: golang:1.11

Gopkg.lock

@@ -41,7 +41,7 @@ ignored = ["google.golang.org/appengine*"]
 
 [[override]]
   name = "github.com/mattn/go-sqlite3"
-  revision = "f3aa5ce89995fab8c7777f7821f689d9ac81c80f"
+  revision = "c7c4067b79cc51e6dfdcef5c702e74b1e0fa7c75"
 
 [[override]]
   name = "github.com/gorilla/mux"

Gopkg.toml

@@ -85,6 +85,8 @@ MAX_DISPLAY_FILE_SIZE = 8388608
 SHOW_USER_EMAIL = true
 ; Set the default theme for the Gitea install
 DEFAULT_THEME = gitea
+; Set the color range to use for heatmap (default to `['#f4f4f4', '#459928']` but can use `['#2d303b', '#80bb46']` with the theme `arc-green`)
+HEATMAP_COLOR_RANGE = `['#f4f4f4', '#459928']`
 
 [ui.admin]
 ; Number of users that are displayed on one page

custom/conf/app.ini.sample

@@ -123,10 +123,10 @@ func createOrUpdateIssueNotifications(e Engine, issue *Issue, notificationAuthor
 
 	for _, watch := range watches {
 		issue.Repo.Units = nil
-		if issue.IsPull && !issue.Repo.CheckUnitUser(watch.UserID, false, UnitTypePullRequests) {
+		if issue.IsPull && !issue.Repo.checkUnitUser(e, watch.UserID, false, UnitTypePullRequests) {
 			continue
 		}
-		if !issue.IsPull && !issue.Repo.CheckUnitUser(watch.UserID, false, UnitTypeIssues) {
+		if !issue.IsPull && !issue.Repo.checkUnitUser(e, watch.UserID, false, UnitTypeIssues) {
 			continue
 		}
 

models/notification.go

@@ -215,7 +215,11 @@ func (t *Team) RemoveRepository(repoID int64) error {
 
 // UnitEnabled returns if the team has the given unit type enabled
 func (t *Team) UnitEnabled(tp UnitType) bool {
-	if err := t.getUnits(x); err != nil {
+	return t.unitEnabled(x, tp)
+}
+
+func (t *Team) unitEnabled(e Engine, tp UnitType) bool {
+	if err := t.getUnits(e); err != nil {
 		log.Warn("Error loading repository (ID: %d) units: %s", t.ID, err.Error())
 	}
 

models/org_team.go

@@ -321,7 +321,11 @@ func (repo *Repository) getUnits(e Engine) (err error) {
 
 // CheckUnitUser check whether user could visit the unit of this repository
 func (repo *Repository) CheckUnitUser(userID int64, isAdmin bool, unitType UnitType) bool {
-	if err := repo.getUnitsByUserID(x, userID, isAdmin); err != nil {
+	return repo.checkUnitUser(x, userID, isAdmin, unitType)
+}
+
+func (repo *Repository) checkUnitUser(e Engine, userID int64, isAdmin bool, unitType UnitType) bool {
+	if err := repo.getUnitsByUserID(e, userID, isAdmin); err != nil {
 		return false
 	}
 
@@ -369,7 +373,7 @@ func (repo *Repository) getUnitsByUserID(e Engine, userID int64, isAdmin bool) (
 	var newRepoUnits = make([]*RepoUnit, 0, len(repo.Units))
 	for _, u := range repo.Units {
 		for _, team := range teams {
-			if team.UnitEnabled(u.Type) {
+			if team.unitEnabled(e, u.Type) {
 				newRepoUnits = append(newRepoUnits, u)
 				break
 			}

models/repo.go

@@ -16,7 +16,8 @@ type UserHeatmapData struct {
 }
 
 // GetUserHeatmapDataByUser returns an array of UserHeatmapData
-func GetUserHeatmapDataByUser(user *User) (hdata []*UserHeatmapData, err error) {
+func GetUserHeatmapDataByUser(user *User) ([]*UserHeatmapData, error) {
+	hdata := make([]*UserHeatmapData, 0)
 	var groupBy string
 	switch {
 	case setting.UseSQLite3:
@@ -29,12 +30,12 @@ func GetUserHeatmapDataByUser(user *User) (hdata []*UserHeatmapData, err error)
 		groupBy = "dateadd(DAY,0, datediff(day,0, dateadd(s, created_unix, '19700101')))"
 	}
 
-	err = x.Select(groupBy+" as timestamp, count(user_id) as contributions").
+	err := x.Select(groupBy+" as timestamp, count(user_id) as contributions").
 		Table("action").
 		Where("user_id = ?", user.ID).
 		And("created_unix > ?", (util.TimeStampNow() - 31536000)).
 		GroupBy("timestamp").
 		OrderBy("timestamp").
 		Find(&hdata)
-	return
+	return hdata, err
 }

models/user_heatmap.go

@@ -5,29 +5,48 @@
 package models
 
 import (
-	"github.com/stretchr/testify/assert"
+	"encoding/json"
 	"testing"
+
+	"github.com/stretchr/testify/assert"
 )
 
 func TestGetUserHeatmapDataByUser(t *testing.T) {
+	testCases := []struct {
+		userID      int64
+		CountResult int
+		JSONResult  string
+	}{
+		{2, 1, `[{"timestamp":1540080000,"contributions":1}]`},
+		{3, 0, `[]`},
+	}
 	// Prepare
 	assert.NoError(t, PrepareTestDatabase())
 
-	// Insert some action
-	user := AssertExistsAndLoadBean(t, &User{ID: 2}).(*User)
-
-	// get the action for comparison
-	actions, err := GetFeeds(GetFeedsOptions{
-		RequestedUser:    user,
-		RequestingUserID: user.ID,
-		IncludePrivate:   true,
-		OnlyPerformedBy:  false,
-		IncludeDeleted:   true,
-	})
-	assert.NoError(t, err)
-
-	// Get the heatmap and compare
-	heatmap, err := GetUserHeatmapDataByUser(user)
-	assert.NoError(t, err)
-	assert.Equal(t, len(actions), len(heatmap))
+	for _, tc := range testCases {
+
+		// Insert some action
+		user := AssertExistsAndLoadBean(t, &User{ID: tc.userID}).(*User)
+
+		// get the action for comparison
+		actions, err := GetFeeds(GetFeedsOptions{
+			RequestedUser:    user,
+			RequestingUserID: user.ID,
+			IncludePrivate:   true,
+			OnlyPerformedBy:  false,
+			IncludeDeleted:   true,
+		})
+		assert.NoError(t, err)
+
+		// Get the heatmap and compare
+		heatmap, err := GetUserHeatmapDataByUser(user)
+		assert.NoError(t, err)
+		assert.Equal(t, len(actions), len(heatmap))
+		assert.Equal(t, tc.CountResult, len(heatmap))
+
+		//Test JSON rendering
+		jsonData, err := json.Marshal(heatmap)
+		assert.NoError(t, err)
+		assert.Equal(t, tc.JSONResult, string(jsonData))
+	}
 }

models/user_heatmap_test.go

@@ -300,6 +300,7 @@ var (
 		MaxDisplayFileSize  int64
 		ShowUserEmail       bool
 		DefaultTheme        string
+		HeatmapColorRange   string
 
 		Admin struct {
 			UserPagingNum   int
@@ -326,6 +327,7 @@ var (
 		ThemeColorMetaTag:   `#6cc644`,
 		MaxDisplayFileSize:  8388608,
 		DefaultTheme:        `gitea`,
+		HeatmapColorRange:   `['#f4f4f4', '#459928']`,
 		Admin: struct {
 			UserPagingNum   int
 			RepoPagingNum   int

modules/setting/setting.go

@@ -193,6 +193,9 @@ func NewFuncMap() []template.FuncMap {
 		"DefaultTheme": func() string {
 			return setting.UI.DefaultTheme
 		},
+		"HeatmapColorRange": func() string {
+			return setting.UI.HeatmapColorRange
+		},
 		"dict": func(values ...interface{}) (map[string]interface{}, error) {
 			if len(values) == 0 {
 				return nil, errors.New("invalid dict call")

modules/templates/helper.go

@@ -320,6 +320,7 @@ starred=スター付きリポジトリ
 following=フォロー中
 follow=フォロー
 unfollow=フォロー解除
+heatmap.loading=ヒートマップを読み込み中…
 
 form.name_reserved=ユーザー名 '%s' は予約されています。
 form.name_pattern_not_allowed='%s' の形式はユーザー名に使用できません。

options/locale/locale_ja-JP.ini

@@ -8,7 +8,7 @@ sign_in=Acessar
 sign_in_with=Acessar com
 sign_out=Sair
 sign_up=Cadastrar
-link_account=Conectar Conta
+link_account=Conectar conta
 link_account_signin_or_signup=Acesse para conectar sua conta existente à sua nova conta, ou cadastre-se para uma nova conta.
 register=Cadastrar
 website=Site
@@ -320,6 +320,7 @@ starred=Repositórios favoritos
 following=Seguindo
 follow=Seguir
 unfollow=Deixar de seguir
+heatmap.loading=Carregando mapa de calor...
 
 form.name_reserved=O nome de usuário '%s' está reservado.
 form.name_pattern_not_allowed=O padrão de '%s' não é permitido em um nome de usuário.

options/locale/locale_pt-BR.ini

@@ -65,7 +65,7 @@
 			var heatmap = calendarHeatmap()
 				.data(chartData)
 				.selector('#user-heatmap')
-				.colorRange(['#f4f4f4', '#459928'])
+				.colorRange({{SafeJS HeatmapColorRange}})
 				.tooltipEnabled(true);
 			heatmap();
 		});