+ {{template "base/alert" .}}
+
+ {{end}}
{{avatar $.Context .Org 140 "org-avatar"}}
diff --git a/tests/integration/api_block_test.go b/tests/integration/api_block_test.go
new file mode 100644
index 0000000000..2118080c7a
--- /dev/null
+++ b/tests/integration/api_block_test.go
@@ -0,0 +1,101 @@
+// Copyright 2023 The Forgejo Authors. All rights reserved.
+// SPDX-License-Identifier: MIT
+
+package integration
+
+import (
+ "fmt"
+ "net/http"
+ "testing"
+
+ auth_model "code.gitea.io/gitea/models/auth"
+ "code.gitea.io/gitea/models/unittest"
+ user_model "code.gitea.io/gitea/models/user"
+ api "code.gitea.io/gitea/modules/structs"
+ "code.gitea.io/gitea/tests"
+
+ "github.com/stretchr/testify/assert"
+)
+
+func TestAPIUserBlock(t *testing.T) {
+ defer tests.PrepareTestEnv(t)()
+
+ user := "user4"
+ session := loginUser(t, user)
+ token := getTokenForLoggedInUser(t, session, auth_model.AccessTokenScopeWriteUser)
+
+ t.Run("BlockUser", func(t *testing.T) {
+ defer tests.PrintCurrentTest(t)()
+
+ req := NewRequest(t, "PUT", fmt.Sprintf("/api/v1/user/block/user2?token=%s", token))
+ MakeRequest(t, req, http.StatusNoContent)
+
+ unittest.AssertExistsAndLoadBean(t, &user_model.BlockedUser{UserID: 4, BlockID: 2})
+ })
+
+ t.Run("ListBlocked", func(t *testing.T) {
+ defer tests.PrintCurrentTest(t)()
+
+ req := NewRequest(t, "GET", fmt.Sprintf("/api/v1/user/list_blocked?token=%s", token))
+ resp := MakeRequest(t, req, http.StatusOK)
+
+ // One user just got blocked and the other one is defined in the fixtures.
+ assert.Equal(t, "2", resp.Header().Get("X-Total-Count"))
+
+ var blockedUsers []api.BlockedUser
+ DecodeJSON(t, resp, &blockedUsers)
+ assert.Len(t, blockedUsers, 2)
+ assert.EqualValues(t, 1, blockedUsers[0].BlockID)
+ assert.EqualValues(t, 2, blockedUsers[1].BlockID)
+ })
+
+ t.Run("UnblockUser", func(t *testing.T) {
+ defer tests.PrintCurrentTest(t)()
+
+ req := NewRequest(t, "PUT", fmt.Sprintf("/api/v1/user/unblock/user2?token=%s", token))
+ MakeRequest(t, req, http.StatusNoContent)
+
+ unittest.AssertNotExistsBean(t, &user_model.BlockedUser{UserID: 4, BlockID: 2})
+ })
+}
+
+func TestAPIOrgBlock(t *testing.T) {
+ defer tests.PrepareTestEnv(t)()
+
+ user := "user5"
+ org := "user6"
+ session := loginUser(t, user)
+ token := getTokenForLoggedInUser(t, session, auth_model.AccessTokenScopeWriteOrganization)
+
+ t.Run("BlockUser", func(t *testing.T) {
+ defer tests.PrintCurrentTest(t)()
+
+ req := NewRequest(t, "PUT", fmt.Sprintf("/api/v1/orgs/%s/block/user2?token=%s", org, token))
+ MakeRequest(t, req, http.StatusNoContent)
+
+ unittest.AssertExistsAndLoadBean(t, &user_model.BlockedUser{UserID: 6, BlockID: 2})
+ })
+
+ t.Run("ListBlocked", func(t *testing.T) {
+ defer tests.PrintCurrentTest(t)()
+
+ req := NewRequest(t, "GET", fmt.Sprintf("/api/v1/orgs/%s/list_blocked?token=%s", org, token))
+ resp := MakeRequest(t, req, http.StatusOK)
+
+ assert.Equal(t, "1", resp.Header().Get("X-Total-Count"))
+
+ var blockedUsers []api.BlockedUser
+ DecodeJSON(t, resp, &blockedUsers)
+ assert.Len(t, blockedUsers, 1)
+ assert.EqualValues(t, 2, blockedUsers[0].BlockID)
+ })
+
+ t.Run("UnblockUser", func(t *testing.T) {
+ defer tests.PrintCurrentTest(t)()
+
+ req := NewRequest(t, "PUT", fmt.Sprintf("/api/v1/orgs/%s/unblock/user2?token=%s", org, token))
+ MakeRequest(t, req, http.StatusNoContent)
+
+ unittest.AssertNotExistsBean(t, &user_model.BlockedUser{UserID: 6, BlockID: 2})
+ })
+}
diff --git a/tests/integration/api_user_follow_test.go b/tests/integration/api_user_follow_test.go
index 62717af90e..bf6560b103 100644
--- a/tests/integration/api_user_follow_test.go
+++ b/tests/integration/api_user_follow_test.go
@@ -19,7 +19,7 @@ func TestAPIFollow(t *testing.T) {
defer tests.PrepareTestEnv(t)()
user1 := "user4"
- user2 := "user1"
+ user2 := "user10"
session1 := loginUser(t, user1)
token1 := getTokenForLoggedInUser(t, session1, auth_model.AccessTokenScopeReadUser)
diff --git a/tests/integration/block_test.go b/tests/integration/block_test.go
new file mode 100644
index 0000000000..b8001f4968
--- /dev/null
+++ b/tests/integration/block_test.go
@@ -0,0 +1,212 @@
+// Copyright 2023 The Forgejo Authors. All rights reserved.
+// SPDX-License-Identifier: MIT
+
+package integration
+
+import (
+ "fmt"
+ "net/http"
+ "net/url"
+ "path"
+ "strconv"
+ "testing"
+
+ "code.gitea.io/gitea/models/db"
+ issue_model "code.gitea.io/gitea/models/issues"
+ repo_model "code.gitea.io/gitea/models/repo"
+ "code.gitea.io/gitea/models/unittest"
+ user_model "code.gitea.io/gitea/models/user"
+ "code.gitea.io/gitea/modules/translation"
+ "code.gitea.io/gitea/tests"
+
+ "github.com/stretchr/testify/assert"
+)
+
+func BlockUser(t *testing.T, doer, blockedUser *user_model.User) {
+ t.Helper()
+
+ unittest.AssertNotExistsBean(t, &user_model.BlockedUser{BlockID: blockedUser.ID, UserID: doer.ID})
+
+ session := loginUser(t, doer.Name)
+ req := NewRequestWithValues(t, "POST", "/"+blockedUser.Name, map[string]string{
+ "_csrf": GetCSRF(t, session, "/"+blockedUser.Name),
+ "action": "block",
+ })
+ resp := session.MakeRequest(t, req, http.StatusOK)
+
+ type redirect struct {
+ Redirect string `json:"redirect"`
+ }
+
+ var respBody redirect
+ DecodeJSON(t, resp, &respBody)
+ assert.EqualValues(t, "/"+blockedUser.Name, respBody.Redirect)
+ assert.True(t, unittest.BeanExists(t, &user_model.BlockedUser{BlockID: blockedUser.ID, UserID: doer.ID}))
+}
+
+func TestBlockUser(t *testing.T) {
+ defer tests.PrepareTestEnv(t)()
+
+ doer := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 8})
+ blockedUser := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 1})
+ BlockUser(t, doer, blockedUser)
+
+ // Unblock user.
+ session := loginUser(t, doer.Name)
+ req := NewRequestWithValues(t, "POST", "/"+blockedUser.Name, map[string]string{
+ "_csrf": GetCSRF(t, session, "/"+blockedUser.Name),
+ "action": "unblock",
+ })
+ resp := session.MakeRequest(t, req, http.StatusSeeOther)
+
+ loc := resp.Header().Get("Location")
+ assert.EqualValues(t, "/"+blockedUser.Name, loc)
+ unittest.AssertNotExistsBean(t, &user_model.BlockedUser{BlockID: blockedUser.ID, UserID: doer.ID})
+}
+
+func TestBlockIssueCreation(t *testing.T) {
+ defer tests.PrepareTestEnv(t)()
+
+ doer := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 2})
+ blockedUser := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 1})
+ repo := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{ID: 2, OwnerID: doer.ID})
+ BlockUser(t, doer, blockedUser)
+
+ session := loginUser(t, blockedUser.Name)
+ req := NewRequest(t, "GET", "/"+repo.OwnerName+"/"+repo.Name+"/issues/new")
+ resp := session.MakeRequest(t, req, http.StatusOK)
+
+ htmlDoc := NewHTMLParser(t, resp.Body)
+ link, exists := htmlDoc.doc.Find("form.ui.form").Attr("action")
+ assert.True(t, exists)
+ req = NewRequestWithValues(t, "POST", link, map[string]string{
+ "_csrf": htmlDoc.GetCSRF(),
+ "title": "Title",
+ "content": "Hello!",
+ })
+
+ resp = session.MakeRequest(t, req, http.StatusOK)
+ htmlDoc = NewHTMLParser(t, resp.Body)
+ assert.Contains(t,
+ htmlDoc.doc.Find(".ui.negative.message").Text(),
+ translation.NewLocale("en-US").Tr("repo.issues.blocked_by_user"),
+ )
+}
+
+func TestBlockIssueReaction(t *testing.T) {
+ defer tests.PrepareTestEnv(t)()
+
+ doer := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 2})
+ blockedUser := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 1})
+ repo := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{ID: 2})
+ issue := unittest.AssertExistsAndLoadBean(t, &issue_model.Issue{ID: 4, PosterID: doer.ID, RepoID: repo.ID})
+ issueURL := fmt.Sprintf("/%s/%s/issues/%d", url.PathEscape(repo.OwnerName), url.PathEscape(repo.Name), issue.Index)
+
+ BlockUser(t, doer, blockedUser)
+
+ session := loginUser(t, blockedUser.Name)
+ req := NewRequest(t, "GET", issueURL)
+ resp := session.MakeRequest(t, req, http.StatusOK)
+ htmlDoc := NewHTMLParser(t, resp.Body)
+
+ req = NewRequestWithValues(t, "POST", path.Join(issueURL, "/reactions/react"), map[string]string{
+ "_csrf": htmlDoc.GetCSRF(),
+ "content": "eyes",
+ })
+ resp = session.MakeRequest(t, req, http.StatusOK)
+ type reactionResponse struct {
+ Empty bool `json:"empty"`
+ }
+
+ var respBody reactionResponse
+ DecodeJSON(t, resp, &respBody)
+
+ assert.EqualValues(t, true, respBody.Empty)
+}
+
+func TestBlockCommentReaction(t *testing.T) {
+ defer tests.PrepareTestEnv(t)()
+
+ doer := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 5})
+ blockedUser := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 1})
+ repo := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{ID: 1})
+ issue := unittest.AssertExistsAndLoadBean(t, &issue_model.Issue{ID: 1, RepoID: repo.ID})
+ comment := unittest.AssertExistsAndLoadBean(t, &issue_model.Comment{ID: 3, PosterID: doer.ID, IssueID: issue.ID})
+ _ = comment.LoadIssue(db.DefaultContext)
+ issueURL := fmt.Sprintf("/%s/%s/issues/%d", url.PathEscape(repo.OwnerName), url.PathEscape(repo.Name), issue.Index)
+
+ BlockUser(t, doer, blockedUser)
+
+ session := loginUser(t, blockedUser.Name)
+ req := NewRequest(t, "GET", issueURL)
+ resp := session.MakeRequest(t, req, http.StatusOK)
+ htmlDoc := NewHTMLParser(t, resp.Body)
+
+ req = NewRequestWithValues(t, "POST", path.Join(repo.Link(), "/comments/", strconv.FormatInt(comment.ID, 10), "/reactions/react"), map[string]string{
+ "_csrf": htmlDoc.GetCSRF(),
+ "content": "eyes",
+ })
+ resp = session.MakeRequest(t, req, http.StatusOK)
+ type reactionResponse struct {
+ Empty bool `json:"empty"`
+ }
+
+ var respBody reactionResponse
+ DecodeJSON(t, resp, &respBody)
+
+ assert.EqualValues(t, true, respBody.Empty)
+}
+
+// TestBlockFollow ensures that the doer and blocked user cannot follow each other.
+func TestBlockFollow(t *testing.T) {
+ defer tests.PrepareTestEnv(t)()
+ doer := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 5})
+ blockedUser := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 1})
+
+ BlockUser(t, doer, blockedUser)
+
+ // Doer cannot follow blocked user.
+ session := loginUser(t, doer.Name)
+ req := NewRequestWithValues(t, "POST", "/"+blockedUser.Name, map[string]string{
+ "_csrf": GetCSRF(t, session, "/"+blockedUser.Name),
+ "action": "follow",
+ })
+ session.MakeRequest(t, req, http.StatusSeeOther)
+
+ unittest.AssertNotExistsBean(t, &user_model.Follow{UserID: doer.ID, FollowID: blockedUser.ID})
+
+ // Blocked user cannot follow doer.
+ session = loginUser(t, blockedUser.Name)
+ req = NewRequestWithValues(t, "POST", "/"+doer.Name, map[string]string{
+ "_csrf": GetCSRF(t, session, "/"+doer.Name),
+ "action": "follow",
+ })
+ session.MakeRequest(t, req, http.StatusSeeOther)
+
+ unittest.AssertNotExistsBean(t, &user_model.Follow{UserID: blockedUser.ID, FollowID: doer.ID})
+}
+
+// TestBlockUserFromOrganization ensures that an organisation can block and unblock an user.
+func TestBlockUserFromOrganization(t *testing.T) {
+ defer tests.PrepareTestEnv(t)()
+
+ doer := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 15})
+ blockedUser := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 1})
+ org := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 17, Type: user_model.UserTypeOrganization})
+ unittest.AssertNotExistsBean(t, &user_model.BlockedUser{BlockID: blockedUser.ID, UserID: org.ID})
+
+ session := loginUser(t, doer.Name)
+ req := NewRequestWithValues(t, "POST", org.OrganisationLink()+"/settings/blocked_users/block", map[string]string{
+ "_csrf": GetCSRF(t, session, org.OrganisationLink()+"/settings/blocked_users"),
+ "uname": blockedUser.Name,
+ })
+ session.MakeRequest(t, req, http.StatusSeeOther)
+ assert.True(t, unittest.BeanExists(t, &user_model.BlockedUser{BlockID: blockedUser.ID, UserID: org.ID}))
+
+ req = NewRequestWithValues(t, "POST", org.OrganisationLink()+"/settings/blocked_users/unblock", map[string]string{
+ "_csrf": GetCSRF(t, session, org.OrganisationLink()+"/settings/blocked_users"),
+ "user_id": strconv.FormatInt(blockedUser.ID, 10),
+ })
+ session.MakeRequest(t, req, http.StatusSeeOther)
+ unittest.AssertNotExistsBean(t, &user_model.BlockedUser{BlockID: blockedUser.ID, UserID: org.ID})
+}
diff --git a/web_src/css/org.css b/web_src/css/org.css
index 9711ed25ad..30322a2c99 100644
--- a/web_src/css/org.css
+++ b/web_src/css/org.css
@@ -191,30 +191,35 @@
}
.organization.teams .repositories .item,
-.organization.teams .members .item {
+.organization.teams .members .item,
+.organization.settings .blocked-users .item {
padding: 10px 19px;
}
.organization.teams .repositories .item:not(:last-child),
-.organization.teams .members .item:not(:last-child) {
+.organization.teams .members .item:not(:last-child),
+.organization.settings .blocked-users .item:not(:last-child) {
border-bottom: 1px solid var(--color-secondary);
}
.organization.teams .repositories .item .button,
-.organization.teams .members .item .button {
+.organization.teams .members .item .button,
+.organization.settings .blocked-users .item button {
padding: 9px 10px;
margin: 0;
}
.organization.teams #add-repo-form input,
.organization.teams #repo-multiple-form input,
-.organization.teams #add-member-form input {
+.organization.teams #add-member-form input,
+.organization.settings #block-user-form input {
margin-left: 0;
}
.organization.teams #add-repo-form .ui.button,
.organization.teams #repo-multiple-form .ui.button,
-.organization.teams #add-member-form .ui.button {
+.organization.teams #add-member-form .ui.button,
+.organization.settings #block-user-form .ui.button {
margin-left: 5px;
margin-top: -3px;
}
diff --git a/web_src/css/user.css b/web_src/css/user.css
index 54a966e7cb..71b4232b58 100644
--- a/web_src/css/user.css
+++ b/web_src/css/user.css
@@ -34,7 +34,11 @@
margin-right: 5px;
}
-.user.profile .ui.card .extra.content > ul > li.follow .ui.button {
+.user.profile .ui.card .extra.content > ul > li.follow .ui.button,
+.user.profile .ui.card .extra.content > ul > li.block .ui.button {
+ align-items: center;
+ display: flex;
+ justify-content: center;
width: 100%;
}
diff --git a/templates/org/settings/blocked_users.tmpl b/templates/org/settings/blocked_users.tmpl
new file mode 100644
index 0000000000..e551ee5d67
--- /dev/null
+++ b/templates/org/settings/blocked_users.tmpl
@@ -0,0 +1,40 @@
+{{template "org/settings/layout_head" (dict "ctxData" . "pageClass" "organization settings blocked-users")}}
+
{{end}}
+
+ {{.locale.Tr "settings.blocked_users"}}
+
{{.locale.Tr "org.settings.delete"}}
diff --git a/templates/swagger/v1_json.tmpl b/templates/swagger/v1_json.tmpl
index 8465594b21..1c708835b6 100644
--- a/templates/swagger/v1_json.tmpl
+++ b/templates/swagger/v1_json.tmpl
@@ -1595,6 +1595,42 @@
}
}
},
+ "/orgs/{org}/block/{username}": {
+ "put": {
+ "produces": [
+ "application/json"
+ ],
+ "tags": [
+ "organization"
+ ],
+ "summary": "Blocks a user from the organization",
+ "operationId": "orgBlockUser",
+ "parameters": [
+ {
+ "type": "string",
+ "description": "name of the org",
+ "name": "org",
+ "in": "path",
+ "required": true
+ },
+ {
+ "type": "string",
+ "description": "username of the user",
+ "name": "username",
+ "in": "path",
+ "required": true
+ }
+ ],
+ "responses": {
+ "204": {
+ "$ref": "#/responses/empty"
+ },
+ "404": {
+ "$ref": "#/responses/notFound"
+ }
+ }
+ }
+ },
"/orgs/{org}/hooks": {
"get": {
"produces": [
@@ -1959,6 +1995,44 @@
}
}
},
+ "/orgs/{org}/list_blocked": {
+ "get": {
+ "produces": [
+ "application/json"
+ ],
+ "tags": [
+ "organization"
+ ],
+ "summary": "List the organization's blocked users",
+ "operationId": "orgListBlockedUsers",
+ "parameters": [
+ {
+ "type": "string",
+ "description": "name of the org",
+ "name": "org",
+ "in": "path",
+ "required": true
+ },
+ {
+ "type": "integer",
+ "description": "page number of results to return (1-based)",
+ "name": "page",
+ "in": "query"
+ },
+ {
+ "type": "integer",
+ "description": "page size of results",
+ "name": "limit",
+ "in": "query"
+ }
+ ],
+ "responses": {
+ "200": {
+ "$ref": "#/responses/BlockedUserList"
+ }
+ }
+ }
+ },
"/orgs/{org}/members": {
"get": {
"produces": [
@@ -2423,6 +2497,42 @@
}
}
},
+ "/orgs/{org}/unblock/{username}": {
+ "put": {
+ "produces": [
+ "application/json"
+ ],
+ "tags": [
+ "organization"
+ ],
+ "summary": "Unblock a user from the organization",
+ "operationId": "orgUnblockUser",
+ "parameters": [
+ {
+ "type": "string",
+ "description": "name of the org",
+ "name": "org",
+ "in": "path",
+ "required": true
+ },
+ {
+ "type": "string",
+ "description": "username of the user",
+ "name": "username",
+ "in": "path",
+ "required": true
+ }
+ ],
+ "responses": {
+ "204": {
+ "$ref": "#/responses/empty"
+ },
+ "404": {
+ "$ref": "#/responses/notFound"
+ }
+ }
+ }
+ },
"/packages/{owner}": {
"get": {
"produces": [
@@ -13790,6 +13900,35 @@
}
}
},
+ "/user/block/{username}": {
+ "put": {
+ "produces": [
+ "application/json"
+ ],
+ "tags": [
+ "user"
+ ],
+ "summary": "Blocks a user from the doer.",
+ "operationId": "userBlockUser",
+ "parameters": [
+ {
+ "type": "string",
+ "description": "username of the user",
+ "name": "username",
+ "in": "path",
+ "required": true
+ }
+ ],
+ "responses": {
+ "204": {
+ "$ref": "#/responses/empty"
+ },
+ "404": {
+ "$ref": "#/responses/notFound"
+ }
+ }
+ }
+ },
"/user/emails": {
"get": {
"produces": [
@@ -13966,6 +14105,9 @@
"responses": {
"204": {
"$ref": "#/responses/empty"
+ },
+ "403": {
+ "$ref": "#/responses/forbidden"
}
}
},
@@ -14436,6 +14578,37 @@
}
}
},
+ "/user/list_blocked": {
+ "get": {
+ "produces": [
+ "application/json"
+ ],
+ "tags": [
+ "user"
+ ],
+ "summary": "List the authenticated user's blocked users",
+ "operationId": "userListBlockedUsers",
+ "parameters": [
+ {
+ "type": "integer",
+ "description": "page number of results to return (1-based)",
+ "name": "page",
+ "in": "query"
+ },
+ {
+ "type": "integer",
+ "description": "page size of results",
+ "name": "limit",
+ "in": "query"
+ }
+ ],
+ "responses": {
+ "200": {
+ "$ref": "#/responses/BlockedUserList"
+ }
+ }
+ }
+ },
"/user/orgs": {
"get": {
"produces": [
@@ -14837,6 +15010,35 @@
}
}
},
+ "/user/unblock/{username}": {
+ "put": {
+ "produces": [
+ "application/json"
+ ],
+ "tags": [
+ "user"
+ ],
+ "summary": "Unblocks a user from the doer.",
+ "operationId": "userUnblockUser",
+ "parameters": [
+ {
+ "type": "string",
+ "description": "username of the user",
+ "name": "username",
+ "in": "path",
+ "required": true
+ }
+ ],
+ "responses": {
+ "204": {
+ "$ref": "#/responses/empty"
+ },
+ "404": {
+ "$ref": "#/responses/notFound"
+ }
+ }
+ }
+ },
"/users/search": {
"get": {
"produces": [
@@ -15767,6 +15969,23 @@
},
"x-go-package": "code.gitea.io/gitea/modules/structs"
},
+ "BlockedUser": {
+ "type": "object",
+ "title": "BlockedUser represents a blocked user.",
+ "properties": {
+ "block_id": {
+ "type": "integer",
+ "format": "int64",
+ "x-go-name": "BlockID"
+ },
+ "created_at": {
+ "type": "string",
+ "format": "date-time",
+ "x-go-name": "Created"
+ }
+ },
+ "x-go-package": "code.gitea.io/gitea/modules/structs"
+ },
"Branch": {
"description": "Branch represents a repository branch",
"type": "object",
@@ -21951,6 +22170,15 @@
}
}
},
+ "BlockedUserList": {
+ "description": "BlockedUserList",
+ "schema": {
+ "type": "array",
+ "items": {
+ "$ref": "#/definitions/BlockedUser"
+ }
+ }
+ },
"Branch": {
"description": "Branch",
"schema": {
diff --git a/templates/user/profile.tmpl b/templates/user/profile.tmpl
index 51d4a46a92..ddce4bbdab 100644
--- a/templates/user/profile.tmpl
+++ b/templates/user/profile.tmpl
@@ -1,6 +1,7 @@
{{template "base/head" .}}
+
+{{template "org/settings/layout_footer" .}}
diff --git a/templates/org/settings/navbar.tmpl b/templates/org/settings/navbar.tmpl
index 6bea9f5f60..20c3279b7b 100644
--- a/templates/org/settings/navbar.tmpl
+++ b/templates/org/settings/navbar.tmpl
@@ -35,6 +35,9 @@
+
+
+
+ {{range .BlockedUsers}}
+
+
+ {{avatar $.Context . 48 "gt-mr-3 gt-mb-0"}}
+
+ {{else}}
+
+ {{.Name}}
+ {{$.locale.Tr "settings.blocked_since" (DateTime "short" .CreatedUnix) | Safe}}
+
+
+
+
+
+ {{$.locale.Tr "settings.blocked_users_none"}}
+
+ {{end}}
+
+ {{template "base/alert" .}}
+
@@ -115,6 +116,21 @@
{{end}}
+
+ {{if $.IsBlocked}}
+
+ {{else}}
+
+ {{end}}
+
{{end}}
@@ -156,4 +172,19 @@
+
+
{{template "base/footer" .}}
diff --git a/templates/user/settings/blocked_users.tmpl b/templates/user/settings/blocked_users.tmpl
new file mode 100644
index 0000000000..dc90970ec2
--- /dev/null
+++ b/templates/user/settings/blocked_users.tmpl
@@ -0,0 +1,31 @@
+{{template "user/settings/layout_head" (dict "ctxData" . "pageClass" "user settings blocked_users")}}
+
+ {{svg "octicon-blocked" 16 "blocked inside"}}
+ {{$.locale.Tr "user.block_user"}}
+
+
+
+ {{template "base/modal_actions_confirm" .}}
+{{$.locale.Tr "user.block_user.detail"}}
+-
+
- {{$.locale.Tr "user.block_user.detail_1"}} +
- {{$.locale.Tr "user.block_user.detail_2"}} +
+
+{{template "user/settings/layout_footer" .}}
diff --git a/templates/user/settings/navbar.tmpl b/templates/user/settings/navbar.tmpl
index 4ef2abeaab..e03ad7e9a9 100644
--- a/templates/user/settings/navbar.tmpl
+++ b/templates/user/settings/navbar.tmpl
@@ -48,5 +48,8 @@
{{.locale.Tr "settings.repos"}}
+
+ {{.locale.Tr "settings.blocked_users"}}
+
+ {{.locale.Tr "settings.blocked_users"}} +
+
+
+
+ {{range .BlockedUsers}}
+
+
+ {{avatar $.Context . 28 "gt-mr-3"}}
+
+ {{else}}
+
+ {{.Name}}
+ {{$.locale.Tr "settings.blocked_since" (DateTime "short" .CreatedUnix) | Safe}}
+
+
+
+
+
+ {{$.locale.Tr "settings.blocked_users_none"}}
+
+ {{end}}
+