Download as
Browse Code »

Commit 26ae59a4fda1b8f5f9f5d1d1c7e7369f249c5e7e

Authored by Rafael Manzo
Committed by Diego Camarinha
1 parent c6beeec4
Exists in colab and in 4 other branches master, spb-master, spb-stable, stable

kalibro_client major updated 

This breaks processing behaviour that will be fixed in the following commits
Showing 2 changed files with 7 additions and 4 deletions   Show diff stats
Gemfile
  Diff comments   View file @26ae59a
... ... @@ -31,7 +31,7 @@ gem 'jbuilder', '~> 2.0'
31 31 gem 'devise', '~> 3.5.1'
32 32  
33 33 # Kalibro integration
34   -gem 'kalibro_client', '~> 0.4.0'
  34 +gem 'kalibro_client', '~> 1.1.0'
35 35  
36 36 # PostgreSQL integration
37 37 gem "pg", "~> 0.18.1"
... ...
Gemfile.lock
  Diff comments   View file @26ae59a
... ... @@ -133,7 +133,7 @@ GEM
133 133 railties (>= 3.0.0)
134 134 faraday (0.9.1)
135 135 multipart-post (>= 1.2, < 3)
136   - faraday_middleware (0.9.1)
  136 + faraday_middleware (0.9.2)
137 137 faraday (>= 0.7.4, < 0.10)
138 138 gherkin (2.12.2)
139 139 multi_json (~> 1.3)
... ... @@ -157,7 +157,7 @@ GEM
157 157 jquery-ui-rails (5.0.5)
158 158 railties (>= 3.2.16)
159 159 json (1.8.3)
160   - kalibro_client (0.4.0)
  160 + kalibro_client (1.1.0)
161 161 activesupport (>= 2.2.1)
162 162 faraday_middleware (~> 0.9.0)
163 163 konacha (3.5.1)
... ... @@ -353,7 +353,7 @@ DEPENDENCIES
353 353 jbuilder (~> 2.0)
354 354 jquery-rails
355 355 jquery-ui-rails (~> 5.0.0)
356   - kalibro_client (~> 0.4.0)
  356 + kalibro_client (~> 1.1.0)
357 357 konacha
358 358 mocha
359 359 pg (~> 0.18.1)
... ... @@ -375,3 +375,6 @@ DEPENDENCIES
375 375 twitter-bootstrap-rails!
376 376 uglifier (>= 1.3.0)
377 377 web-console (~> 2.0.0)
  378 +
  379 +BUNDLED WITH
  380 + 1.10.5
... ...