You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
Peter Smit 6c1ee384f1 Merge remote-tracking branch 'mine/access_refactor' into access_refactor
Conflicts:
	cmd/serve.go
	models/access.go
	models/migrations/migrations.go
	models/org.go
	models/repo.go
	models/user.go
	modules/middleware/org.go
	modules/middleware/repo.go
	routers/api/v1/repo.go
	routers/org/teams.go
	routers/repo/http.go
	routers/user/home.go
10 years ago
..
branch.go New UI merge in progress 10 years ago
commit.go Link to previous commited source file (diff.view_file button) instead of returning 404 for deleted files. 10 years ago
download.go routers/repo: set raw page content type to 'text/plain' #828 10 years ago
http.go Merge remote-tracking branch 'mine/access_refactor' into access_refactor 10 years ago
issue.go Merge pull request #925 from phsmit/newcollaboration 10 years ago
pull.go New UI merge in progress 10 years ago
release.go Finish new UI for release page 10 years ago
repo.go Fix #807 parse the userinfo with the golang tools 10 years ago
setting.go Introducing Collaboration Struct 10 years ago
view.go models/action.go: mirror fix on #892 10 years ago