Merge pull request #15630 from bergquist/moves_social_to_login

moves social package to /login
2025-02-25 18:55:37 -06:00 · 2019-02-25 16:16:20 +01:00
parent 26dcabc2dc 60fef31748
commit 1aeec31495
10 changed files with 3 additions and 3 deletions
--- a/pkg/api/login_oauth.go
+++ b/pkg/api/login_oauth.go
@@ -19,9 +19,9 @@ import (
 	"github.com/grafana/grafana/pkg/infra/metrics"
 	"github.com/grafana/grafana/pkg/log"
 	"github.com/grafana/grafana/pkg/login"
+	"github.com/grafana/grafana/pkg/login/social"
 	m "github.com/grafana/grafana/pkg/models"
 	"github.com/grafana/grafana/pkg/setting"
-	"github.com/grafana/grafana/pkg/social"
 )

 var (
--- a/pkg/cmd/grafana-server/server.go
+++ b/pkg/cmd/grafana-server/server.go
@@ -16,9 +16,9 @@ import (
 	"github.com/grafana/grafana/pkg/api/routing"
 	"github.com/grafana/grafana/pkg/bus"
 	"github.com/grafana/grafana/pkg/login"
+	"github.com/grafana/grafana/pkg/login/social"
 	"github.com/grafana/grafana/pkg/middleware"
 	"github.com/grafana/grafana/pkg/registry"
-	"github.com/grafana/grafana/pkg/social"

 	"golang.org/x/sync/errgroup"

--- a/pkg/infra/usagestats/service.go
+++ b/pkg/infra/usagestats/service.go
@@ -5,8 +5,8 @@ import (
 	"time"

 	"github.com/grafana/grafana/pkg/bus"
+	"github.com/grafana/grafana/pkg/login/social"
 	"github.com/grafana/grafana/pkg/services/sqlstore"
-	"github.com/grafana/grafana/pkg/social"

 	"github.com/grafana/grafana/pkg/log"
 	"github.com/grafana/grafana/pkg/registry"
--- a/pkg/login/social/common.go
+++ b/pkg/login/social/common.go
--- a/pkg/login/social/generic_oauth.go
+++ b/pkg/login/social/generic_oauth.go
--- a/pkg/login/social/github_oauth.go
+++ b/pkg/login/social/github_oauth.go
--- a/pkg/login/social/gitlab_oauth.go
+++ b/pkg/login/social/gitlab_oauth.go
--- a/pkg/login/social/google_oauth.go
+++ b/pkg/login/social/google_oauth.go
--- a/pkg/login/social/grafana_com_oauth.go
+++ b/pkg/login/social/grafana_com_oauth.go
--- a/pkg/login/social/social.go
+++ b/pkg/login/social/social.go