Skip to content

Allow cross-repository dependencies on issues #7901

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 43 commits into from
Oct 31, 2019
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
43 commits
Select commit Hold shift + click to select a range
86442ad
in progress changes for #7405, added ability to add cross-repo depend…
bhalbright Aug 17, 2019
ce3312a
Merge branch 'master' of https://github.com/go-gitea/gitea
bhalbright Aug 17, 2019
f33a34b
removed unused repolink var
bhalbright Aug 17, 2019
6647aa8
fixed query that was breaking ci tests; fixed check in issue dependen…
bhalbright Aug 18, 2019
f1bae29
reverted removal of string in local files becasue these are done via …
bhalbright Aug 19, 2019
935eae4
removed 'Select("issue.*")' from getBlockedByDependencies and getBloc…
bhalbright Aug 20, 2019
0473eca
changed getBlockedByDependencies and getBlockingDependencies to use a…
bhalbright Aug 21, 2019
52f0e19
simplified the getBlockingDependencies and getBlockedByDependencies m…
bhalbright Aug 24, 2019
0b9e67b
made some changes to the issue view in the dependencies (issue name o…
bhalbright Aug 25, 2019
b426606
replace call to FindUserAccessibleRepoIDs with SearchRepositoryByName…
bhalbright Sep 2, 2019
2f257d0
some more tweaks to the layout of the issues when showing dependencie…
bhalbright Sep 3, 2019
3c78743
Merge branch 'master' of https://github.com/go-gitea/gitea
bhalbright Sep 3, 2019
662cf44
added Name to the RepositoryMeta struct
bhalbright Sep 8, 2019
4e90f86
Merge branch 'master' of https://github.com/go-gitea/gitea
bhalbright Sep 8, 2019
6d741b7
updated swagger doc
bhalbright Sep 8, 2019
cf015b6
fixed total count for link header on SearchIssues
bhalbright Sep 8, 2019
e630aa7
fixed indentation
bhalbright Sep 8, 2019
2af7328
Merge branch 'master' of https://github.com/go-gitea/gitea
bhalbright Sep 11, 2019
1b08937
Merge branch 'master' of https://github.com/go-gitea/gitea
bhalbright Sep 12, 2019
3a5f40b
Merge branch 'master' of https://github.com/go-gitea/gitea
bhalbright Sep 25, 2019
deb2ff3
fixed aligment of remove icon on dependencies in issue sidebar
bhalbright Sep 26, 2019
b7cd0f5
removed unnecessary nil check (unnecessary because issue.loadRepo is …
bhalbright Sep 28, 2019
a707ea7
reverting .css change, somehow missed or forgot that less is used
bhalbright Sep 28, 2019
25c40a4
updated less file and generated css; updated sidebar template with st…
bhalbright Sep 28, 2019
3a9028f
added ordering to the blocked by/depends on queries
bhalbright Sep 28, 2019
9dd2fc0
fixed sorting in issue dependency search and the depends on/blocks vi…
bhalbright Oct 6, 2019
e629f7e
Merge branch 'master' of https://github.com/go-gitea/gitea
bhalbright Oct 6, 2019
0327365
re-applied my swagger changes after merge
bhalbright Oct 6, 2019
17b7888
fixed split string condition in issue search
bhalbright Oct 6, 2019
2ab1058
Merge branch 'master' of https://github.com/go-gitea/gitea
bhalbright Oct 8, 2019
690442c
changed ALLOW_CROSS_REPOSITORY_DEPENDENCIES description to sound more…
bhalbright Oct 8, 2019
cf36916
Merge branch 'master' of https://github.com/go-gitea/gitea
bhalbright Oct 8, 2019
ea04606
Merge branch 'master' of https://github.com/go-gitea/gitea
bhalbright Oct 12, 2019
49b7d2a
Merge branch 'master' of https://github.com/go-gitea/gitea
bhalbright Oct 19, 2019
2ec084d
Merge branch 'master' of https://github.com/go-gitea/gitea
bhalbright Oct 26, 2019
c77a950
when adding a dependency to an issue, added a check to make sure the …
bhalbright Oct 26, 2019
c19468c
Merge branch 'master' of https://github.com/go-gitea/gitea
bhalbright Oct 29, 2019
171465c
Merge branch 'master' into master
lunny Oct 30, 2019
50680e4
Merge branch 'master' into master
techknowlogick Oct 30, 2019
074edcf
Merge branch 'master' into master
zeripath Oct 30, 2019
ddd3488
Merge branch 'master' of https://github.com/go-gitea/gitea
bhalbright Oct 31, 2019
1d8bd09
updated sortIssuesSession call in PullRequests, another commit moved …
bhalbright Oct 31, 2019
22c5dd2
fixed incorrect setting of user id parameter in search repos call
bhalbright Oct 31, 2019
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions models/issue.go
Original file line number Diff line number Diff line change
Expand Up @@ -1834,7 +1834,7 @@ type DependencyInfo struct {
// Get Blocked By Dependencies, aka all issues this issue is blocked by.
func (issue *Issue) getBlockedByDependencies(e Engine) (issueDeps []*DependencyInfo, err error) {
err = e.Table("issue_dependency").
Select("issue.id, issue.repo_id, issue.index, issue.is_closed, issue.name").
Select("issue.*").
Join("INNER", "issue", "issue.id = issue_dependency.dependency_id").
Where("issue_id = ?", issue.ID).
Find(&issueDeps)
Expand All @@ -1857,7 +1857,7 @@ func (issue *Issue) getBlockedByDependencies(e Engine) (issueDeps []*DependencyI
// Get Blocking Dependencies, aka all issues this issue blocks.
func (issue *Issue) getBlockingDependencies(e Engine) (issueDeps []*DependencyInfo, err error) {
err = e.Table("issue_dependency").
Select("issue.id, issue.repo_id, issue.index, issue.is_closed, issue.name").
Select("issue.*").
Join("INNER", "issue", "issue.id = issue_dependency.issue_id").
Where("dependency_id = ?", issue.ID).
Find(&issueDeps)
Expand Down
2 changes: 1 addition & 1 deletion routers/repo/issue_dependency.go
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ func AddDependency(ctx *context.Context) {
}

// Check if issue and dependency is the same
if dep.Index == issueIndex {
if dep.ID == issue.ID {
ctx.Flash.Error(ctx.Tr("repo.issues.dependency.add_error_same_issue"))
return
}
Expand Down