Merge pull request #858 from prometheus/release-0.7

Merge 0.7.1 back into master

CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.7.1 / 2017-06-09
+
+* [BUGFIX] Fix filtering by label on Alert list and Silence list page
+
 ## 0.7.0 / 2017-06-08
 
 * [CHANGE] Rewrite UI from scratch improving UX

VERSION

@@ -1 +1 @@
-0.7.0
+0.7.1

ui/app/src/Views/AlertList/Updates.elm

@@ -16,7 +16,7 @@ update : AlertListMsg -> Model -> Filter -> String -> String -> ( Model, Cmd Typ
 update msg ({ groupBar, filterBar } as model) filter apiUrl basePath =
     let
         alertsUrl =
-            basePath ++ "/#/alerts"
+            basePath ++ "#/alerts"
     in
         case msg of
             AlertsFetched listOfAlerts ->

ui/app/src/Views/SilenceList/Updates.elm

@@ -31,7 +31,7 @@ update msg model filter basePath apiUrl =
         MsgForFilterBar msg ->
             let
                 ( filterBar, cmd ) =
-                    FilterBar.update (basePath ++ "/#/silences") filter msg model.filterBar
+                    FilterBar.update (basePath ++ "#/silences") filter msg model.filterBar
             in
                 ( { model | filterBar = filterBar }, Cmd.map MsgForFilterBar cmd )