End of day commit

Gemfile.lock

@@ -78,6 +78,9 @@ GEM
       erubis (~> 2.7.0)
       rails-dom-testing (~> 1.0, >= 1.0.5)
       rails-html-sanitizer (~> 1.0, >= 1.0.1)
+    active_attr (0.8.5)
+      activemodel (>= 3.0.2, < 5.0)
+      activesupport (>= 3.0.2, < 5.0)
     active_decorator (0.4.0)
     active_model_serializers (0.9.0)
       activemodel (>= 3.2)
@@ -113,6 +116,7 @@ GEM
       sass (~> 3.4)
       thor
     builder (3.2.2)
+    cancancan (1.10.1)
     capistrano (3.3.5)
       capistrano-stats (~> 1.1.0)
       i18n
@@ -270,6 +274,7 @@ GEM
     multi_json (1.10.1)
     multi_xml (0.5.5)
     multipart-post (2.0.0)
+    naught (1.0.0)
     net-scp (1.2.1)
       net-ssh (>= 2.6.5)
     net-ssh (2.9.2)
@@ -449,9 +454,11 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
+  active_attr
   active_decorator
   active_model_serializers (= 0.9.0)
   bourbon
+  cancancan
   capistrano (~> 3.0)
   capistrano-local-precompile
   capistrano-rails (~> 1.1)
@@ -480,6 +487,7 @@ DEPENDENCIES
   launchy
   letter_opener
   mini_magick
+  naught
   omniauth-facebook
   omniauth-instagram
   paperclip