Merge branch 'master' into organization-links

2017-08-26 09:53:25 +00:00 · 2017-08-26 09:53:25 +00:00 · dcaf074753
commit dcaf074753
parent 61ddbcfe04 7eea930269
174 changed files with 4210 additions and 722 deletions
--- a/app/views/layouts/_admin_sidebar_index.html.haml
+++ b/app/views/layouts/_admin_sidebar_index.html.haml
@ -31,7 +31,7 @@
      = link_to(admin_users_path) do
        %span.fa.fa-user
        Users
-  - if can? :index, PaperTrail::Version.new(item_type: 'User')
+  - if can? :index, PaperTrail::Version
    %li
      = link_to(admin_revision_history_path) do
        %span.fa.fa-history