Merge branch 'develop' of github.com:senaduka/ribica into develop

back-office/Gemfile

@@ -25,8 +25,11 @@ gem 'jbuilder', '~> 2.0'
 # bundle exec rake doc:rails generates the API under doc/api.
 gem 'sdoc', '~> 0.4.0', group: :doc
 
+gem 'tzinfo-data'
+
+gem "nokogiri", ">= 1.6.6"
 # great server
-gem 'puma'
+gem 'puma', '~> 2.15.3'
 
 # for uploading images
 gem 'cloudinary'
@@ -45,6 +48,8 @@ gem 'tabulous'
 # rails 4.x support is not stable yet - so we hope for the best :)
 gem 'active_scaffold', github: 'activescaffold/active_scaffold', branch: 'master'
 
+
+
 group :development, :test do
   # Call 'byebug' anywhere in the code to stop execution and get a debugger console
   gem 'byebug'

back-office/Gemfile.lock

@@ -79,6 +79,7 @@ GEM
     execjs (2.2.2)
     faraday (0.9.1)
       multipart-post (>= 1.2, < 3)
+    ffi (1.9.10-x64-mingw32)
     font-awesome-rails (4.3.0.0)
       railties (>= 3.2, < 5.0)
     globalid (0.3.0)
@@ -111,11 +112,13 @@ GEM
     multipart-post (2.0.0)
     nested_form (0.3.2)
     netrc (0.10.2)
-    nokogiri (1.6.5)
+    nokogiri (1.6.6.2)
+      mini_portile (~> 0.6.0)
+    nokogiri (1.6.6.2-x64-mingw32)
       mini_portile (~> 0.6.0)
     pg (0.18.1)
-    puma (2.10.2)
+    pg (0.18.1-x64-mingw32)
-      rack (>= 1.1, < 2.0)
+    puma (2.15.3)
     rack (1.6.0)
     rack-pjax (0.8.0)
       nokogiri (~> 1.5)
@@ -167,6 +170,10 @@ GEM
     rest-client (1.7.2)
       mime-types (>= 1.16, < 3.0)
       netrc (~> 0.7)
+    rest-client (1.7.2-x64-mingw32)
+      ffi (~> 1.9)
+      mime-types (>= 1.16, < 3.0)
+      netrc (~> 0.7)
     safe_yaml (1.0.4)
     sass (3.4.9)
     sass-rails (5.0.1)
@@ -199,6 +206,8 @@ GEM
       coffee-rails
     tzinfo (1.2.2)
       thread_safe (~> 0.1)
+    tzinfo-data (1.2015.7)
+      tzinfo (>= 1.0.0)
     uglifier (2.7.0)
       execjs (>= 0.3.0)
       json (>= 1.8.0)
@@ -210,6 +219,7 @@ GEM
 
 PLATFORMS
   ruby
+  x64-mingw32
 
 DEPENDENCIES
   active_scaffold!
@@ -220,8 +230,9 @@ DEPENDENCIES
   jbuilder (~> 2.0)
   jquery-rails
   jquery-ui-rails
+  nokogiri (>= 1.6.6)
   pg
-  puma
+  puma (~> 2.15.3)
   rails (= 4.2.0)
   rails_admin
   sass-rails (~> 5.0)
@@ -229,8 +240,9 @@ DEPENDENCIES
   spring
   tabulous
   turbolinks
+  tzinfo-data
   uglifier (>= 1.3.0)
   web-console (~> 2.0)
 
 BUNDLED WITH
-   1.10.3
+   1.10.6

front-api/Gemfile.lock

@@ -24,6 +24,7 @@ GEM
     backports (3.6.6)
     bcrypt (3.1.10)
     bcrypt (3.1.10-java)
+    bcrypt (3.1.10-x64-mingw32)
     builder (3.2.2)
     celluloid (0.16.0)
       timers (~> 4.0.0)
@@ -39,12 +40,14 @@ GEM
       multipart-post (>= 1.2, < 3)
     ffi (1.9.10)
     ffi (1.9.10-java)
+    ffi (1.9.10-x64-mingw32)
     hitimes (1.2.3)
     hitimes (1.2.3-java)
     i18n (0.7.0)
     jdbc-postgres (9.4.1200)
     jruby-openssl (0.9.11-java)
     json (1.8.3)
+    json (1.8.3-java)
     listen (2.10.1)
       celluloid (~> 0.16.0)
       rb-fsevent (>= 0.9.3)
@@ -71,6 +74,10 @@ GEM
     rest-client (1.7.3)
       mime-types (>= 1.16, < 3.0)
       netrc (~> 0.7)
+    rest-client (1.7.3-x64-mingw32)
+      ffi (~> 1.9)
+      mime-types (>= 1.16, < 3.0)
+      netrc (~> 0.7)
     ruby-trello (1.2.1)
       activemodel (>= 3.2.0)
       addressable (~> 2.3)
@@ -96,6 +103,7 @@ GEM
       tilt (>= 1.3, < 3)
     smtpapi (0.1.0)
     thread_safe (0.3.5)
+    thread_safe (0.3.5-java)
     tilt (2.0.1)
     timers (4.0.4)
       hitimes
@@ -106,6 +114,7 @@ GEM
 PLATFORMS
   java
   ruby
+  x64-mingw32
 
 DEPENDENCIES
   activerecord
@@ -125,4 +134,4 @@ DEPENDENCIES
   xxhash (~> 0.3.0)
 
 BUNDLED WITH
-   1.10.3
+   1.10.6