Merge branch 'rs-elastic-status' into 'master'

Add Elasticsearch status to Admin dashboard See merge request !241

Merge branch 'rs-elastic-status' into 'master'
Add Elasticsearch status to Admin dashboard See merge request !241
e9547bbf · Dmitriy Zaporozhets · 579370be · 85d7abc1 · e9547bbf
Commit e9547bbf authored Mar 09, 2016 by Dmitriy Zaporozhets
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 0 deletions

app/views/admin/dashboard/index.html.haml app/views/admin/dashboard/index.html.haml +4 -0

No files found.
--- a/app/views/admin/dashboard/index.html.haml
+++ b/app/views/admin/dashboard/index.html.haml
@@ -59,6 +59,10 @@
        Reply by email
        %span.light.pull-right
          = boolean_to_icon Gitlab::IncomingEmail.enabled?
+      %p
+        Elasticsearch
+        %span.light.pull-right
+          = boolean_to_icon Gitlab.config.elasticsearch.enabled
    .col-md-4
      %h4
        Components