Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Add Organization Wide Labels #10814

Merged
merged 53 commits into from
Apr 1, 2020
Merged

Add Organization Wide Labels #10814

Changes from 1 commit
Commits
Show all changes
53 commits
Select commit Hold shift + click to select a range
6548c80
Add organization wide labels
mrsdizzie Mar 24, 2020
b7dc22c
Add migration
mrsdizzie Mar 24, 2020
350569a
remove comments
mrsdizzie Mar 24, 2020
c562eef
fix tests
mrsdizzie Mar 24, 2020
140d87d
Update options/locale/locale_en-US.ini
mrsdizzie Mar 25, 2020
00729a2
show org labels in issue search label filter
mrsdizzie Mar 25, 2020
8af0f6c
Use more clear var name
mrsdizzie Mar 27, 2020
1ac0851
Merge branch 'master' into organization-labels
mrsdizzie Mar 27, 2020
101d4e7
rename migration after merge from master
mrsdizzie Mar 27, 2020
33ca43e
comment typo
mrsdizzie Mar 27, 2020
adf4235
Merge branch 'master' into organization-labels
lafriks Mar 27, 2020
76ae932
Merge branch 'master' into organization-labels
mrsdizzie Mar 27, 2020
13fadae
update migration again after rebase with master
mrsdizzie Mar 27, 2020
a82a29b
check for orgID <=0 per guillep2k review
mrsdizzie Mar 27, 2020
27209ee
fmt
mrsdizzie Mar 27, 2020
eae4724
Apply suggestions from code review
mrsdizzie Mar 27, 2020
a68f6f8
remove unused code
mrsdizzie Mar 27, 2020
3a0b210
Make sure RepoID is 0 when searching orgID per code review
mrsdizzie Mar 27, 2020
f4afe50
more changes/code review requests
mrsdizzie Mar 28, 2020
835ee95
More descriptive translation var per code review
mrsdizzie Mar 28, 2020
503998b
func description/delete comment when issue label deleted instead of h…
mrsdizzie Mar 28, 2020
007ff15
remove comment
mrsdizzie Mar 28, 2020
88c37d1
Merge branch 'master' into organization-labels
mrsdizzie Mar 28, 2020
e4714fe
only use issues in that repo when calculating number of open issues f…
mrsdizzie Mar 29, 2020
70529e2
Add integration test for IssuesSearch API with labels
mrsdizzie Mar 29, 2020
967335e
Merge branch 'master' into organization-labels
mrsdizzie Mar 29, 2020
2604c39
remove unused function
mrsdizzie Mar 29, 2020
72b4c5c
Update models/issue_label.go
mrsdizzie Mar 29, 2020
8c1f393
Use subquery in GetLabelIDsInReposByNames
mrsdizzie Mar 29, 2020
a8517ab
Fix tests to use correct orgID
mrsdizzie Mar 29, 2020
5688933
Merge branch 'master' into organization-labels
mrsdizzie Mar 29, 2020
e5809c4
fix more tests
mrsdizzie Mar 29, 2020
2ecf5d1
Merge branch 'master' into organization-labels
mrsdizzie Mar 29, 2020
1b94717
Merge branch 'master' into organization-labels
mrsdizzie Mar 30, 2020
a01f7a9
IssuesSearch api now uses new BuildLabelNamesIssueIDsCondition. Add a…
mrsdizzie Mar 30, 2020
47d1b8e
update comment for clarity
mrsdizzie Mar 30, 2020
d17c8c2
Revert previous code change now that we can use the new BuildLabelNam…
mrsdizzie Mar 30, 2020
59f0586
Don't sort repos by date in IssuesSearch API
mrsdizzie Mar 30, 2020
8887170
Merge branch 'master' into organization-labels
mrsdizzie Mar 30, 2020
a5bb033
linter is back!
mrsdizzie Mar 30, 2020
e4ed7ec
code review
mrsdizzie Mar 31, 2020
893650b
remove now unused option
mrsdizzie Mar 31, 2020
7e40622
Fix newline at end of files
mrsdizzie Mar 31, 2020
235d420
more unused code
mrsdizzie Mar 31, 2020
fbee66a
Merge branch 'master' into organization-labels
mrsdizzie Mar 31, 2020
731dd89
Merge branch 'master' into organization-labels
mrsdizzie Mar 31, 2020
0013cd3
update to master
mrsdizzie Mar 31, 2020
f74a1b8
check for matching ids before query
mrsdizzie Mar 31, 2020
551f3b5
Update models/issue_label.go
mrsdizzie Mar 31, 2020
d39f303
Update models/issue_label.go
mrsdizzie Mar 31, 2020
0bddcf7
update comments
mrsdizzie Mar 31, 2020
69cf00e
Update routers/org/setting.go
mrsdizzie Mar 31, 2020
aae5286
Merge branch 'master' into organization-labels
mrsdizzie Apr 1, 2020
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
Prev Previous commit
Next Next commit
Make sure RepoID is 0 when searching orgID per code review
  • Loading branch information
@mrsdizzie
mrsdizzie committed Mar 27, 2020
commit 3a0b210f31ee7eef7cc5bde9aec2b1fb5aa978c5
10 changes: 6 additions & 4 deletions models/issue_label.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -347,8 +347,9 @@ func getLabelInOrgByName(e Engine, orgID int64, labelName string) (*Label, error
}

l := &Label{
Name: labelName,
OrgID: orgID,
Name: labelName,
RepoID: 0,
mrsdizzie marked this conversation as resolved.
Show resolved Hide resolved
OrgID: orgID,
}
has, err := e.Get(l)
mrsdizzie marked this conversation as resolved.
Show resolved Hide resolved
if err != nil {
Expand All @@ -369,8 +370,9 @@ func getLabelInOrgByID(e Engine, orgID, labelID int64) (*Label, error) {
}

l := &Label{
ID: labelID,
OrgID: orgID,
ID: labelID,
RepoID: 0,
mrsdizzie marked this conversation as resolved.
Show resolved Hide resolved
OrgID: orgID,
}
has, err := e.Get(l)
mrsdizzie marked this conversation as resolved.
Show resolved Hide resolved
if err != nil {
Expand Down