Commit 9f00449e35e9d12ddfe816bec6ee884c4a91f5dd

Authored by Rafael Manzo
1 parent 8eb02d6b

Updated to latest version of kalibro_entities (0.0.1.rc3)

Free of incompabilities from nokogiri version
Showing 2 changed files with 14 additions and 12 deletions   Show diff stats
Gemfile
... ... @@ -37,7 +37,7 @@ gem 'jbuilder', '~> 1.2'
37 37 gem 'devise', '~> 3.1.0'
38 38  
39 39 # Kalibro integration
40   -gem 'kalibro_entities', "~> 0.0.1.rc2"
  40 +gem 'kalibro_entities', "~> 0.0.1.rc3"
41 41  
42 42 # PostgreSQL integration
43 43 gem "pg", "~> 0.17.0"
... ...
Gemfile.lock
... ... @@ -101,9 +101,9 @@ GEM
101 101 railties (>= 3.0, < 5.0)
102 102 thor (>= 0.14, < 2.0)
103 103 json (1.8.1)
104   - kalibro_entities (0.0.1.rc2)
  104 + kalibro_entities (0.0.1.rc3)
105 105 activesupport (~> 4.0.0)
106   - savon (~> 2.3.0)
  106 + savon-ng-1.6 (~> 2.4.1)
107 107 konacha (3.0.0)
108 108 actionpack (>= 3.1, < 5)
109 109 capybara
... ... @@ -116,6 +116,7 @@ GEM
116 116 treetop (~> 1.4.8)
117 117 metaclass (0.0.1)
118 118 mime-types (1.25)
  119 + mini_portile (0.5.1)
119 120 minitest (4.7.5)
120 121 mocha (0.14.0)
121 122 metaclass (~> 0.0.1)
... ... @@ -128,8 +129,9 @@ GEM
128 129 net-ssh (2.7.0)
129 130 net-ssh-gateway (1.2.0)
130 131 net-ssh (>= 2.6.5)
131   - nokogiri (1.5.10)
132   - nori (2.3.0)
  132 + nokogiri (1.6.0)
  133 + mini_portile (~> 0.5.0)
  134 + nori-ng-1.6 (2.3.0)
133 135 orm_adapter (0.4.0)
134 136 pg (0.17.0)
135 137 poltergeist (1.4.1)
... ... @@ -179,14 +181,14 @@ GEM
179 181 railties (>= 4.0.0, < 5.0)
180 182 sass (>= 3.1.10)
181 183 sprockets-rails (~> 2.0.0)
182   - savon (2.3.0)
  184 + savon-ng-1.6 (2.4.1)
183 185 akami (~> 1.2.0)
184 186 builder (>= 2.1.2)
185 187 gyoku (~> 1.1.0)
186 188 httpi (~> 2.1.0)
187   - nokogiri (>= 1.4.0, < 1.6)
188   - nori (~> 2.3.0)
189   - wasabi (~> 3.2.0)
  189 + nokogiri (>= 1.4.0)
  190 + nori-ng-1.6 (~> 2.3.0)
  191 + wasabi-ng-1.6 (~> 3.3.0)
190 192 sdoc (0.3.20)
191 193 json (>= 1.1.3)
192 194 rdoc (~> 3.10)
... ... @@ -232,9 +234,9 @@ GEM
232 234 multi_json (~> 1.0, >= 1.0.2)
233 235 warden (1.2.3)
234 236 rack (>= 1.0)
235   - wasabi (3.2.0)
  237 + wasabi-ng-1.6 (3.3.0)
236 238 httpi (~> 2.0)
237   - nokogiri (>= 1.4.0, < 1.6)
  239 + nokogiri (>= 1.4.0)
238 240 websocket-driver (0.3.0)
239 241 xpath (2.0.0)
240 242 nokogiri (~> 1.3)
... ... @@ -253,7 +255,7 @@ DEPENDENCIES
253 255 factory_girl_rails
254 256 jbuilder (~> 1.2)
255 257 jquery-rails
256   - kalibro_entities (~> 0.0.1.rc2)
  258 + kalibro_entities (~> 0.0.1.rc3)
257 259 konacha (~> 3.0.0)
258 260 mocha
259 261 modernizr-rails
... ...