Merge branch 'master' of github.com:grafana/grafana

public/app/partials/login.html

@@ -59,7 +59,7 @@
           Sign in with {{oauth.generic_oauth.name}}
         </a>
       </div>
-      <div class="login-signup-box">
+      <div class="login-signup-box" ng-show="!disableUserSignUp">
         <div class="login-signup-title p-r-1">
           New to Grafana?
         </div>