Merge branch 'master' into add-api-issues-subscriptions

templates/repo/issue/view_content/sidebar.tmpl

@@ -274,14 +274,15 @@
 					</span>
 					<div class="ui relaxed divided list">
 						{{range .BlockingDependencies}}
-							<div class="item{{if .IsClosed}} is-closed{{end}}">
-								<div class="ui black label">#{{.Index}}</div>
-								<a class="title has-emoji" href="{{$.RepoLink}}/issues/{{.Index}}">{{.Title}}</a>
-								<div class="ui transparent label right floated">
+							<div class="item{{if .Issue.IsClosed}} is-closed{{end}}">
+								<span class="text grey right floated">#{{.Issue.Index}}</span>
+								<a class="title has-emoji" href="{{.Repository.Link}}/issues/{{.Issue.Index}}">{{.Issue.Title}}</a>
+								<div class="text small">{{.Repository.OwnerName}}/{{.Repository.Name}}</div>
+								<div class="ui transparent label right floated nopadding">
 									{{if and $.CanCreateIssueDependencies (not $.Repository.IsArchived)}}
-										<a class="delete-dependency-button" onclick="deleteDependencyModal({{.ID}}, 'blocking');"
-										   data-tooltip="{{$.i18n.Tr "repo.issues.dependency.remove_info"}}" data-inverted="">
-											<i class="delete icon text red"></i>
+										<a class="delete-dependency-button" onclick="deleteDependencyModal({{.Issue.ID}}, 'blocking');"
+											data-tooltip="{{$.i18n.Tr "repo.issues.dependency.remove_info"}}" data-inverted="">
+											<i class="delete icon text red nopadding nomargin"></i>
 										</a>
 									{{end}}
 								</div>
@@ -300,14 +301,15 @@
 					</span>
 					<div class="ui relaxed divided list">
 						{{range .BlockedByDependencies}}
-							<div class="item{{if .IsClosed}} is-closed{{end}}">
-								<div class="ui black label">#{{.Index}}</div>
-								<a class="title has-emoji" href="{{$.RepoLink}}/issues/{{.Index}}">{{.Title}}</a>
-								<div class="ui transparent label right floated">
-									{{if and $.CanCreateIssueDependencies (not $.IsArchived)}}
-										<a class="delete-dependency-button" onclick="deleteDependencyModal({{.ID}}, 'blockedBy');"
-										   data-tooltip="{{$.i18n.Tr "repo.issues.dependency.remove_info"}}" data-inverted="">
-											<i class="delete icon text red"></i>
+							<div class="item{{if .Issue.IsClosed}} is-closed{{end}}">
+								<span class="text grey right floated">#{{.Issue.Index}}</span>
+								<a class="title has-emoji" href="{{.Repository.Link}}/issues/{{.Issue.Index}}">{{.Issue.Title}}</a>
+								<div class="text small">{{.Repository.OwnerName}}/{{.Repository.Name}}</div>
+								<div class="ui transparent label right floated nopadding">
+									{{if and $.CanCreateIssueDependencies (not $.Repository.IsArchived)}}
+										<a class="delete-dependency-button" onclick="deleteDependencyModal({{.Issue.ID}}, 'blockedBy');"
+											data-tooltip="{{$.i18n.Tr "repo.issues.dependency.remove_info"}}" data-inverted="">
+											<i class="delete icon text red nopadding nomargin"></i>
 										</a>
 									{{end}}
 								</div>
@@ -424,6 +426,8 @@
 </div>
 {{if and .CanCreateIssueDependencies (not .Repository.IsArchived)}}
 	<input type="hidden" id="repolink" value="{{$.RepoRelPath}}">
+	<input type="hidden" id="repoId" value="{{.Repository.ID}}">
+	<input type="hidden" id="crossRepoSearch" value="{{.AllowCrossRepositoryDependencies}}">
 	<!-- I know, there is probably a better way to do this -->
 	<input type="hidden" id="issueIndex" value="{{.Issue.Index}}"/>
 

templates/swagger/v1_json.tmpl

@@ -1111,6 +1111,56 @@
         }
       }
     },
+    "/repos/issues/search": {
+      "get": {
+        "produces": [
+          "application/json"
+        ],
+        "tags": [
+          "issue"
+        ],
+        "summary": "Search for issues across the repositories that the user has access to",
+        "operationId": "issueSearchIssues",
+        "parameters": [
+          {
+            "type": "string",
+            "description": "whether issue is open or closed",
+            "name": "state",
+            "in": "query"
+          },
+          {
+            "type": "string",
+            "description": "comma separated list of labels. Fetch only issues that have any of this labels. Non existent labels are discarded",
+            "name": "labels",
+            "in": "query"
+          },
+          {
+            "type": "integer",
+            "description": "page number of requested issues",
+            "name": "page",
+            "in": "query"
+          },
+          {
+            "type": "string",
+            "description": "search string",
+            "name": "q",
+            "in": "query"
+          },
+          {
+            "type": "integer",
+            "format": "int64",
+            "description": "repository to prioritize in the results",
+            "name": "priority_repo_id",
+            "in": "query"
+          }
+        ],
+        "responses": {
+          "200": {
+            "$ref": "#/responses/IssueList"
+          }
+        }
+      }
+    },
     "/repos/migrate": {
       "post": {
         "consumes": [
@@ -9358,6 +9408,9 @@
         "pull_request": {
           "$ref": "#/definitions/PullRequestMeta"
         },
+        "repository": {
+          "$ref": "#/definitions/RepositoryMeta"
+        },
         "state": {
           "$ref": "#/definitions/StateType"
         },
@@ -10254,6 +10307,26 @@
       },
       "x-go-package": "code.gitea.io/gitea/modules/structs"
     },
+    "RepositoryMeta": {
+      "description": "RepositoryMeta basic repository information",
+      "type": "object",
+      "properties": {
+        "full_name": {
+          "type": "string",
+          "x-go-name": "FullName"
+        },
+        "id": {
+          "type": "integer",
+          "format": "int64",
+          "x-go-name": "ID"
+        },
+        "name": {
+          "type": "string",
+          "x-go-name": "Name"
+        }
+      },
+      "x-go-package": "code.gitea.io/gitea/modules/structs"
+    },
     "SearchResults": {
       "description": "SearchResults results of a successful search",
       "type": "object",