mirror of
https://github.com/grafana/grafana.git
synced 2025-02-25 18:55:37 -06:00
Oauth2 Updates (#6226)
* break out go and js build commands * support oauth providers that return errors via redirect * remove extra call to get grafana.net org membership * removed GitHub specifics from generic OAuth * readded ability to name generic source * revert to a backward-compatible state, refactor and clean up * streamline oauth user creation, make generic oauth support more generic
This commit is contained in:
committed by
Torkel Ödegaard
parent
d4fd1c82e3
commit
6b16fcea52
18
Makefile
18
Makefile
@@ -1,16 +1,28 @@
|
||||
all: deps build
|
||||
|
||||
deps:
|
||||
deps-go:
|
||||
go run build.go setup
|
||||
|
||||
deps-js:
|
||||
npm install
|
||||
|
||||
build:
|
||||
deps: deps-go deps-js
|
||||
|
||||
build-go:
|
||||
go run build.go build
|
||||
|
||||
build-js:
|
||||
npm run build
|
||||
|
||||
test:
|
||||
build: build-go build-js
|
||||
|
||||
test-go:
|
||||
go test -v ./pkg/...
|
||||
|
||||
test-js:
|
||||
npm test
|
||||
|
||||
test: test-go test-js
|
||||
|
||||
run:
|
||||
./bin/grafana-server
|
||||
|
Reference in New Issue
Block a user