Merge 7b6be3a1eb into ac7149fbe5

app/views/admin/users/index.html.haml

@@ -5,18 +5,17 @@
         Users
         - if @users
           = "(#{@users.length})"
-.row
+.table-responsive
-  .col-md-12
+  %table.table.table-striped.table-bordered.table-hover.datatable
-    %table.table.table-striped.table-bordered.table-hover.datatable
+    %thead
-      %thead
+      %th ID
-        %th ID
+      %th State
-        %th State
+      %th Email
-        %th Email
+      %th Name
-        %th Name
+      %th Attended Conferences
-        %th Attended Conferences
+      %th Roles
-        %th Roles
+      %th View
-        %th View
+      %th Edit
-        %th Edit
       %tbody
         - @users.each do |user|
           %tr

config/initializers/devise.rb

@@ -4,6 +4,7 @@
 Devise.setup do |config|
   # ==> Secret key, generate one with `rake secret`
   config.secret_key = Rails.application.secrets.devise_secret_key
+  config.secret_key = '0014809cd45aa9fc57a29118bbbc374437095fed0b39549b69aef61b9ad994f0e71a0bf54e66a5acec3d67d293495c1b6f4235e8b6415e4fe2bafb8f517121ea'
 
   # ==> openIDs configuration
   # Define the available openID providers that can be used to log in