Marcus Efraimsson cde347bd3d Merge branch 'master' into WPH95-feature/add_es_alerting

2018-05-08 17:13:08 +02:00

..

api

http_server: All files in public/build have now a huge max-age (#11536)

2018-05-08 13:54:00 +02:00

bus

Outdent code after if block that ends with return (golint)

2018-04-27 23:10:43 +02:00

cmd

Merge branch 'master' into WPH95-feature/add_es_alerting

2018-05-08 17:13:08 +02:00

components

merge: fixed conflicts in discord PR

2018-05-07 15:40:43 +02:00

events

feat(signup): progress on new sign up and email verification flow, #2353

2015-08-28 15:14:24 +02:00

extensions

Enable Grafana extensions at build time. (#11752)

2018-04-27 13:41:58 +02:00

log

pkg/log: fix ineffassign issues

2018-04-23 19:31:23 +02:00

login

fix: ldap unit test

2018-05-08 12:50:39 +02:00

metrics

Metrics package now follows new service interface & registration (#11787)

2018-05-02 19:54:07 +02:00

middleware

support additional fields in authproxy (#11661)

2018-05-07 10:39:16 +02:00

models

merge: fixed conflicts in discord PR

2018-05-07 15:40:43 +02:00

plugins

Initial Baby Step to refactoring settings from global vars to instance (#11777)

2018-04-30 16:21:04 +02:00

registry

Enable Grafana extensions at build time. (#11752)

2018-04-27 13:41:58 +02:00

services

Merge pull request #11867 from grafana/11862_migration

2018-05-08 13:10:22 +02:00

setting

Merge pull request #11801 from grafana/provision-service-refactor

2018-05-07 16:32:26 +02:00

social

Initial Baby Step to refactoring settings from global vars to instance (#11777)

2018-04-30 16:21:04 +02:00

tracing

Initial Baby Step to refactoring settings from global vars to instance (#11777)

2018-04-30 16:21:04 +02:00

tsdb

Merge branch 'master' of git://github.com/grafana/grafana into WPH95-feature/add_es_alerting

2018-05-03 12:03:04 +02:00

util

Outdent code after if block that ends with return (golint)

2018-04-27 23:10:43 +02:00