Add checkbox to search for all the branches by commit message (gogs#813)

and updating the vendor directory
ethantkoenig · Feb 5, 2017 · e388db3 · e388db3
1 parent f35b20b
commit e388db3
Show file tree

Hide file tree

Showing 9 changed files with 39 additions and 18 deletions.
diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini
@@ -513,6 +513,7 @@ editor.upload_files_to_dir = Upload files to '%s'
 
 commits.commits = Commits
 commits.search = Search commits
+commits.search_all = All
 commits.find = Find
 commits.author = Author
 commits.message = Message

diff --git a/routers/repo/commit.go b/routers/repo/commit.go
@@ -111,8 +111,9 @@ func SearchCommits(ctx *context.Context) {
 		ctx.Redirect(ctx.Repo.RepoLink + "/commits/" + ctx.Repo.BranchName)
 		return
 	}
+	all := ctx.QueryBool("all")
 
-	commits, err := ctx.Repo.Commit.SearchCommits(keyword)
+	commits, err := ctx.Repo.Commit.SearchCommits(keyword, all)
 	if err != nil {
 		ctx.Handle(500, "SearchCommits", err)
 		return
@@ -122,6 +123,9 @@ func SearchCommits(ctx *context.Context) {
 	ctx.Data["Commits"] = commits
 
 	ctx.Data["Keyword"] = keyword
+	if all {
+		ctx.Data["All"] = "checked"
+	}
 	ctx.Data["Username"] = ctx.Repo.Owner.Name
 	ctx.Data["Reponame"] = ctx.Repo.Repository.Name
 	ctx.Data["CommitCount"] = commits.Len()

diff --git a/templates/repo/commits_table.tmpl b/templates/repo/commits_table.tmpl
@@ -6,6 +6,7 @@
 				<div class="ui tiny search input">
 					<input name="q" placeholder="{{.i18n.Tr "repo.commits.search"}}" value="{{.Keyword}}" autofocus>
 				</div>
+				<input type="checkbox" name="all" id="all" value="true" {{.All}}><label for="all">{{.i18n.Tr "repo.commits.search_all"}}</label>
 				<button class="ui black tiny button" data-panel="#add-deploy-key-panel">{{.i18n.Tr "repo.commits.find"}}</button>
 			</form>
 		</div>

diff --git a/vendor/code.gitea.io/git/CONTRIBUTING.md b/vendor/code.gitea.io/git/CONTRIBUTING.md
diff --git a/vendor/code.gitea.io/git/MAINTAINERS b/vendor/code.gitea.io/git/MAINTAINERS
diff --git a/vendor/code.gitea.io/git/commit.go b/vendor/code.gitea.io/git/commit.go
diff --git a/vendor/code.gitea.io/git/repo_branch.go b/vendor/code.gitea.io/git/repo_branch.go
diff --git a/vendor/code.gitea.io/git/repo_commit.go b/vendor/code.gitea.io/git/repo_commit.go
diff --git a/vendor/vendor.json b/vendor/vendor.json
@@ -3,10 +3,10 @@
 	"ignore": "test",
 	"package": [
 		{
-			"checksumSHA1": "P2wIRW07gnEgqLZAcg7bz+Jw9Oc=",
+			"checksumSHA1": "km1AOUs34DCwgXT55fh6PrkPdiU=",
 			"path": "code.gitea.io/git",
-			"revision": "7477742b3c79d36d099baaf614864b6bbdfdecca",
-			"revisionTime": "2017-01-09T15:46:57Z"
+			"revision": "dd951bf625ebf5c16ef403f681aaec6c34324bca",
+			"revisionTime": "2017-02-05T02:50:57Z"
 		},
 		{
 			"checksumSHA1": "BKj0haFTDebzdC2nACpoGzp3s8A=",