Merge branch 'develop'

Author: toastercup

Gemfile

@@ -14,18 +14,17 @@ gem 'rails', '~> 4.2.6'
 gem 'cortex-exceptions', '~> 0.0.4'
 
 # API
-gem 'grape', '~> 0.14'
+gem 'grape', '~> 0.16'
 gem 'grape-entity', '~> 0.5.1'
-gem 'grape-swagger', '~> 0.20.1'
-gem 'redis-rails', '~> 4.0'
+gem 'grape-swagger', '~> 0.20.3'
 
 # Authorization
 gem 'six', '~> 0.2.0'
 gem 'devise', '~> 3.5.6'
 gem 'rack-oauth2', '~> 1.3.0'
 gem 'doorkeeper', '~> 3.1'
 
-# ActiveRecord
+# Data
 gem 'rails-observers', '~> 0.1.2'
 gem 'awesome_nested_set', '~> 3.0'
 gem 'paperclip', '~> 5.0.0.beta2'
@@ -38,6 +37,7 @@ gem 'elasticsearch-rails', '~> 0.1'
 gem 'paranoia', '~> 2.1'
 gem 'pg', '~> 0.18.4'
 gem 'hashie-forbidden_attributes', '~> 0.1.1'
+gem 'redis-rails', '~> 4.0'
 
 # Middleware
 gem 'rack-cors', '~> 0.4.0', require: 'rack/cors'

Gemfile.lock

@@ -146,6 +146,7 @@ GEM
       htmlentities (~> 4.3.3)
       launchy (~> 2.1)
       mail (~> 2.6.3)
+    enumerable-lazy (0.0.1)
     equalizer (0.0.11)
     erubis (2.7.0)
     excon (0.48.0)
@@ -281,22 +282,22 @@ GEM
       json
       multi_json
       request_store (>= 1.0)
-    grape (0.14.0)
+    grape (0.16.2)
       activesupport
       builder
       hashie (>= 2.1.0)
       multi_json (>= 1.3.2)
       multi_xml (>= 0.5.2)
+      mustermann19 (~> 0.4.3)
       rack (>= 1.3.0)
       rack-accept
-      rack-mount
       virtus (>= 1.0.0)
     grape-entity (0.5.1)
       activesupport
       multi_json (>= 1.3.2)
-    grape-swagger (0.20.1)
+    grape-swagger (0.20.3)
       awesome_print
-      grape (>= 0.12.0, <= 0.14.0)
+      grape (>= 0.12.0)
       grape-entity
     guard (2.13.0)
       formatador (>= 0.2.4)
@@ -322,7 +323,7 @@ GEM
       rspec (>= 2.99.0, < 4.0)
     haml (4.0.7)
       tilt
-    hashie (3.4.3)
+    hashie (3.4.4)
     hashie-forbidden_attributes (0.1.1)
       hashie (>= 3.0)
     hashr (2.0.0)
@@ -384,9 +385,11 @@ GEM
     minitest (5.8.4)
     mocha (1.1.0)
       metaclass (~> 0.0.1)
-    multi_json (1.11.2)
+    multi_json (1.12.0)
     multi_xml (0.5.5)
     multipart-post (2.0.0)
+    mustermann19 (0.4.3)
+      enumerable-lazy
     nenv (0.3.0)
     newrelic_rpm (3.15.1.316)
     ng-rails-csrf (0.1.0)
@@ -425,8 +428,6 @@ GEM
     rack-accept (0.4.5)
       rack (>= 0.4)
     rack-cors (0.4.0)
-    rack-mount (0.8.3)
-      rack (>= 1.0.0)
     rack-oauth2 (1.3.0)
       activesupport (>= 2.3)
       attr_required (>= 0.0.5)
@@ -615,10 +616,10 @@ DEPENDENCIES
   fog (~> 1.37.0)
   font-awesome-sass (~> 4.5.0)
   gon (~> 6.0.1)
-  grape (~> 0.14)
+  grape (~> 0.16)
   grape-entity (~> 0.5.1)
   grape-kaminari!
-  grape-swagger (~> 0.20.1)
+  grape-swagger (~> 0.20.3)
   guard-jasmine (~> 2.0.6)
   guard-rspec (~> 4.6.4)
   haml (~> 4.0.7)