From 5833867b449484ca14f5d0ce14e22599bb8fac14 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torkel=20=C3=96degaard?= <torkel.odegaard@gmail.com>
Date: Wed, 14 Jan 2015 10:19:45 +0100
Subject: [PATCH] renamed register route to signup

---
 grafana                            | 2 +-
 pkg/api/api.go                     | 6 +++---
 pkg/api/{register.go => signup.go} | 3 ++-
 3 files changed, 6 insertions(+), 5 deletions(-)
 rename pkg/api/{register.go => signup.go} (89%)

diff --git a/grafana b/grafana
index 9f4ea7301a4..6cc1502c899 160000
--- a/grafana
+++ b/grafana
@@ -1 +1 @@
-Subproject commit 9f4ea7301a41c4dc3449f854d7a61b089d33dad0
+Subproject commit 6cc1502c8998332fc4409ea15e68e42c1724144b
diff --git a/pkg/api/api.go b/pkg/api/api.go
index d7bcd33869b..ac4a0ceb78b 100644
--- a/pkg/api/api.go
+++ b/pkg/api/api.go
@@ -45,9 +45,9 @@ func Register(m *macaron.Macaron) {
 	// data source proxy
 	m.Any("/api/datasources/proxy/:id/*", auth, ProxyDataSourceRequest)
 
-	// user register
-	m.Get("/register", Index)
-	m.Post("/api/account", CreateAccount)
+	// User sign up
+	m.Get("/signup", Index)
+	m.Post("/api/account/signup", SignUp)
 
 	// dashboards
 	m.Get("/dashboard/*", auth, Index)
diff --git a/pkg/api/register.go b/pkg/api/signup.go
similarity index 89%
rename from pkg/api/register.go
rename to pkg/api/signup.go
index 410f0d304af..95852e22bda 100644
--- a/pkg/api/register.go
+++ b/pkg/api/signup.go
@@ -7,7 +7,8 @@ import (
 	"github.com/torkelo/grafana-pro/pkg/util"
 )
 
-func CreateAccount(c *middleware.Context) {
+// POST /api/account/signup
+func SignUp(c *middleware.Context) {
 	var cmd m.CreateAccountCommand
 
 	if !c.JsonBody(&cmd) {