Commit 8ba424543ffdec06cce208fb5c7b429b5c04fb50

Authored by Paulo Tada
1 parent be4f246c
Exists in rails4

Updating Gemfile with noosfeor core stable-1.5

Showing 57 changed files with 70 additions and 64 deletions   Show diff stats
Gemfile
... ... @@ -34,10 +34,11 @@ gem 'slim'
34 34  
35 35 # API dependencies
36 36 gem 'grape', '~> 0.12'
37   -gem 'grape-entity'
  37 +gem 'grape-entity', '0.4.8'
38 38 gem 'grape_logging'
39 39 gem 'rack-cors'
40 40 gem 'rack-contrib'
  41 +gem 'api-pagination', '>= 4.1.1'
41 42  
42 43 # asset pipeline
43 44 gem 'uglifier', '>= 1.0.3'
... ...
Gemfile.lock
... ... @@ -118,15 +118,15 @@ GEM
118 118 remote: https://rubygems.org/
119 119 specs:
120 120 RedCloth (4.2.9)
121   - actionmailer (4.2.5.1)
122   - actionpack (= 4.2.5.1)
123   - actionview (= 4.2.5.1)
124   - activejob (= 4.2.5.1)
  121 + actionmailer (4.2.6)
  122 + actionpack (= 4.2.6)
  123 + actionview (= 4.2.6)
  124 + activejob (= 4.2.6)
125 125 mail (~> 2.5, >= 2.5.4)
126 126 rails-dom-testing (~> 1.0, >= 1.0.5)
127   - actionpack (4.2.5.1)
128   - actionview (= 4.2.5.1)
129   - activesupport (= 4.2.5.1)
  127 + actionpack (4.2.6)
  128 + actionview (= 4.2.6)
  129 + activesupport (= 4.2.6)
130 130 rack (~> 1.6)
131 131 rack-test (~> 0.6.2)
132 132 rails-dom-testing (~> 1.0, >= 1.0.5)
... ... @@ -135,28 +135,28 @@ GEM
135 135 actionpack (>= 4.0.0, < 5.0)
136 136 actionpack-page_caching (1.0.2)
137 137 actionpack (>= 4.0.0, < 5)
138   - actionview (4.2.5.1)
139   - activesupport (= 4.2.5.1)
  138 + actionview (4.2.6)
  139 + activesupport (= 4.2.6)
140 140 builder (~> 3.1)
141 141 erubis (~> 2.7.0)
142 142 rails-dom-testing (~> 1.0, >= 1.0.5)
143 143 rails-html-sanitizer (~> 1.0, >= 1.0.2)
144   - activejob (4.2.5.1)
145   - activesupport (= 4.2.5.1)
  144 + activejob (4.2.6)
  145 + activesupport (= 4.2.6)
146 146 globalid (>= 0.3.0)
147   - activemodel (4.2.5.1)
148   - activesupport (= 4.2.5.1)
  147 + activemodel (4.2.6)
  148 + activesupport (= 4.2.6)
149 149 builder (~> 3.1)
150   - activerecord (4.2.5.1)
151   - activemodel (= 4.2.5.1)
152   - activesupport (= 4.2.5.1)
  150 + activerecord (4.2.6)
  151 + activemodel (= 4.2.6)
  152 + activesupport (= 4.2.6)
153 153 arel (~> 6.0)
154 154 activerecord-deprecated_finders (1.0.4)
155 155 activerecord-session_store (0.1.2)
156 156 actionpack (>= 4.0.0, < 5)
157 157 activerecord (>= 4.0.0, < 5)
158 158 railties (>= 4.0.0, < 5)
159   - activesupport (4.2.5.1)
  159 + activesupport (4.2.6)
160 160 i18n (~> 0.7)
161 161 json (~> 1.7, >= 1.7.7)
162 162 minitest (~> 5.1)
... ... @@ -166,13 +166,14 @@ GEM
166 166 activerecord (>= 3.2, < 5)
167 167 addressable (2.4.0)
168 168 ansi (1.5.0)
  169 + api-pagination (4.3.0)
169 170 arel (6.0.3)
170 171 axiom-types (0.1.1)
171 172 descendants_tracker (~> 0.0.4)
172 173 ice_nine (~> 0.11.0)
173 174 thread_safe (~> 0.3, >= 0.3.1)
174 175 builder (3.2.2)
175   - capybara (2.6.2)
  176 + capybara (2.7.1)
176 177 addressable
177 178 mime-types (>= 1.16)
178 179 nokogiri (>= 1.3.3)
... ... @@ -184,8 +185,8 @@ GEM
184 185 chronic (0.10.2)
185 186 coercible (1.0.0)
186 187 descendants_tracker (~> 0.0.1)
187   - concurrent-ruby (1.0.0)
188   - cucumber (2.3.2)
  188 + concurrent-ruby (1.0.2)
  189 + cucumber (2.3.3)
189 190 builder (>= 2.1.2)
190 191 cucumber-core (~> 1.4.0)
191 192 cucumber-wire (~> 0.0.1)
... ... @@ -204,7 +205,7 @@ GEM
204 205 cucumber-wire (0.0.1)
205 206 daemons (1.2.3)
206 207 dalli (2.7.6)
207   - database_cleaner (1.5.1)
  208 + database_cleaner (1.5.3)
208 209 delayed_job (4.1.1)
209 210 activesupport (>= 3.0, < 5.0)
210 211 delayed_job_active_record (4.1.0)
... ... @@ -214,11 +215,12 @@ GEM
214 215 thread_safe (~> 0.3, >= 0.3.1)
215 216 diff-lcs (1.2.5)
216 217 diffy (3.1.0)
217   - domain_name (0.5.20160216)
  218 + domain_name (0.5.20160310)
218 219 unf (>= 0.0.5, < 1.0.0)
219 220 eita-jrails (0.10.1)
220 221 actionpack (>= 3.1.0)
221 222 activesupport (>= 3.0.0)
  223 + enumerable-lazy (0.0.1)
222 224 equalizer (0.0.11)
223 225 erubis (2.7.0)
224 226 exception_notification (4.0.1)
... ... @@ -227,29 +229,29 @@ GEM
227 229 execjs (2.6.0)
228 230 fast_gettext (0.9.2)
229 231 ffi (1.9.10)
230   - gettext (3.2.1)
  232 + gettext (3.2.2)
231 233 locale (>= 2.0.5)
232 234 text (>= 1.3.0)
233 235 gherkin (3.2.0)
234 236 git-version-bump (0.15.1)
235 237 globalid (0.3.6)
236 238 activesupport (>= 4.1.0)
237   - grape (0.14.0)
  239 + grape (0.16.2)
238 240 activesupport
239 241 builder
240 242 hashie (>= 2.1.0)
241 243 multi_json (>= 1.3.2)
242 244 multi_xml (>= 0.5.2)
  245 + mustermann19 (~> 0.4.3)
243 246 rack (>= 1.3.0)
244 247 rack-accept
245   - rack-mount
246 248 virtus (>= 1.0.0)
247   - grape-entity (0.5.0)
  249 + grape-entity (0.4.8)
248 250 activesupport
249 251 multi_json (>= 1.3.2)
250   - grape_logging (1.1.2)
  252 + grape_logging (1.2.1)
251 253 grape
252   - hashie (3.4.3)
  254 + hashie (3.4.4)
253 255 http-cookie (1.0.2)
254 256 domain_name (~> 0.5)
255 257 i18n (0.7.0)
... ... @@ -263,27 +265,30 @@ GEM
263 265 nokogiri (>= 1.5.9)
264 266 magic (0.2.9)
265 267 ffi (>= 0.6.3)
266   - mail (2.6.3)
267   - mime-types (>= 1.16, < 3)
  268 + mail (2.6.4)
  269 + mime-types (>= 1.16, < 4)
268 270 metaclass (0.0.4)
269 271 mime-types (2.99.1)
270 272 mini_portile2 (2.0.0)
271 273 minitest (5.8.4)
272   - minitest-reporters (1.1.8)
  274 + minitest-reporters (1.1.9)
273 275 ansi
274 276 builder
275 277 minitest (>= 5.0)
276 278 ruby-progressbar
277 279 mocha (1.1.0)
278 280 metaclass (~> 0.0.1)
279   - multi_json (1.11.2)
  281 + multi_json (1.11.3)
280 282 multi_test (0.1.2)
281 283 multi_xml (0.5.5)
  284 + mustermann19 (0.4.3)
  285 + enumerable-lazy
282 286 netrc (0.11.0)
283 287 nokogiri (1.6.7.2)
284 288 mini_portile2 (~> 2.0.0.rc2)
285 289 pg (0.18.4)
286   - pothoven-attachment_fu (3.2.16)
  290 + pothoven-attachment_fu (3.2.17)
  291 + power_assert (0.2.7)
287 292 protected_attributes (1.1.3)
288 293 activemodel (>= 4.0.1, < 5.0)
289 294 rack (1.6.4)
... ... @@ -293,20 +298,18 @@ GEM
293 298 git-version-bump (~> 0.15)
294 299 rack (~> 1.4)
295 300 rack-cors (0.4.0)
296   - rack-mount (0.8.3)
297   - rack (>= 1.0.0)
298 301 rack-test (0.6.3)
299 302 rack (>= 1.0)
300   - rails (4.2.5.1)
301   - actionmailer (= 4.2.5.1)
302   - actionpack (= 4.2.5.1)
303   - actionview (= 4.2.5.1)
304   - activejob (= 4.2.5.1)
305   - activemodel (= 4.2.5.1)
306   - activerecord (= 4.2.5.1)
307   - activesupport (= 4.2.5.1)
  303 + rails (4.2.6)
  304 + actionmailer (= 4.2.6)
  305 + actionpack (= 4.2.6)
  306 + actionview (= 4.2.6)
  307 + activejob (= 4.2.6)
  308 + activemodel (= 4.2.6)
  309 + activerecord (= 4.2.6)
  310 + activesupport (= 4.2.6)
308 311 bundler (>= 1.3.0, < 2.0)
309   - railties (= 4.2.5.1)
  312 + railties (= 4.2.6)
310 313 sprockets-rails
311 314 rails-deprecated_sanitizer (1.0.3)
312 315 activesupport (>= 4.2.0.alpha)
... ... @@ -320,13 +323,13 @@ GEM
320 323 activemodel (~> 4.0)
321 324 rails_autolink (1.1.6)
322 325 rails (> 3.1)
323   - railties (4.2.5.1)
324   - actionpack (= 4.2.5.1)
325   - activesupport (= 4.2.5.1)
  326 + railties (4.2.6)
  327 + actionpack (= 4.2.6)
  328 + activesupport (= 4.2.6)
326 329 rake (>= 0.8.7)
327 330 thor (>= 0.18.1, < 2.0)
328   - raindrops (0.15.0)
329   - rake (10.5.0)
  331 + raindrops (0.16.0)
  332 + rake (11.1.2)
330 333 rest-client (1.8.0)
331 334 http-cookie (>= 1.0.2, < 2.0)
332 335 mime-types (>= 1.16, < 3.0)
... ... @@ -336,7 +339,7 @@ GEM
336 339 rspec-core (~> 3.4.0)
337 340 rspec-expectations (~> 3.4.0)
338 341 rspec-mocks (~> 3.4.0)
339   - rspec-core (3.4.3)
  342 + rspec-core (3.4.4)
340 343 rspec-support (~> 3.4.0)
341 344 rspec-expectations (3.4.0)
342 345 diff-lcs (>= 1.2.0, < 2.0)
... ... @@ -353,27 +356,26 @@ GEM
353 356 rspec-mocks (~> 3.4.0)
354 357 rspec-support (~> 3.4.0)
355 358 rspec-support (3.4.1)
356   - ruby-feedparser (0.9.3)
  359 + ruby-feedparser (0.9.4)
357 360 magic
358   - ruby-progressbar (1.7.5)
  361 + ruby-progressbar (1.8.0)
359 362 rubyzip (1.2.0)
360   - sass (3.4.21)
  363 + sass (3.4.22)
361 364 sass-rails (5.0.4)
362 365 railties (>= 4.0.0, < 5.0)
363 366 sass (~> 3.1)
364 367 sprockets (>= 2.8, < 4.0)
365 368 sprockets-rails (>= 2.0, < 4.0)
366 369 tilt (>= 1.1, < 3)
367   - selenium-webdriver (2.52.0)
  370 + selenium-webdriver (2.53.0)
368 371 childprocess (~> 0.5)
369   - multi_json (~> 1.0)
370 372 rubyzip (~> 1.0)
371 373 websocket (~> 1.0)
372 374 slim (3.0.6)
373 375 temple (~> 0.7.3)
374 376 tilt (>= 1.3.3, < 2.1)
375   - spring (1.6.3)
376   - sprockets (3.5.2)
  377 + spring (1.7.1)
  378 + sprockets (3.6.0)
377 379 concurrent-ruby (~> 1.0)
378 380 rack (> 1, < 3)
379 381 sprockets-rails (2.3.3)
... ... @@ -381,15 +383,16 @@ GEM
381 383 activesupport (>= 3.0)
382 384 sprockets (>= 2.8, < 4.0)
383 385 temple (0.7.6)
  386 + test-unit (3.1.8)
  387 + power_assert
384 388 text (1.3.1)
385 389 thor (0.19.1)
386 390 thread_safe (0.3.5)
387 391 tilt (2.0.2)
388 392 tzinfo (1.2.2)
389 393 thread_safe (~> 0.1)
390   - uglifier (2.7.2)
391   - execjs (>= 0.3.0)
392   - json (>= 1.8.0)
  394 + uglifier (3.0.0)
  395 + execjs (>= 0.3.0, < 3)
393 396 unf (0.1.4)
394 397 unf_ext
395 398 unf_ext (0.0.7.2)
... ... @@ -402,7 +405,7 @@ GEM
402 405 coercible (~> 1.0)
403 406 descendants_tracker (~> 0.0, >= 0.0.3)
404 407 equalizer (~> 0.0, >= 0.0.9)
405   - websocket (1.2.2)
  408 + websocket (1.2.3)
406 409 whenever (0.9.4)
407 410 chronic (>= 0.6.3)
408 411 will_paginate (3.0.7)
... ... @@ -426,6 +429,7 @@ DEPENDENCIES
426 429 acts_as_list (= 0.0.0)!
427 430 acts_as_tree (= 0.0.0)!
428 431 acts_as_versioned (> 0.0.0)!
  432 + api-pagination (>= 4.1.1)
429 433 bundle (= 0.0.0)!
430 434 cache (= 0.0.0)!
431 435 capybara (~> 2.2)
... ... @@ -445,7 +449,7 @@ DEPENDENCIES
445 449 gdata (> 0.0.0)!
446 450 gettext (~> 3.1)
447 451 grape (~> 0.12)
448   - grape-entity
  452 + grape-entity (= 0.4.8)
449 453 grape_logging
450 454 honeypot (= 0.0.0)!
451 455 i18n_deprecation (= 0.0.0)!
... ... @@ -481,6 +485,7 @@ DEPENDENCIES
481 485 slim
482 486 spring
483 487 sprockets-rails (~> 2.1)
  488 + test-unit
484 489 uglifier (>= 1.0.3)
485 490 unicorn (~> 4.8)
486 491 validates_as_cnpj (= 0.0.0)!
... ...
Makefile
... ... @@ -2,7 +2,7 @@ VERSION = 1.4
2 2 TARBALL = noosfero-deps-$(VERSION).tar.gz
3 3 PREFIX = /usr
4 4 WGET = wget
5   -NOOSFERO_BRANCH = master
  5 +NOOSFERO_BRANCH = stable-1.5
6 6 BUNDLE_OPTS = --verbose --without='development test cucumber'
7 7  
8 8 all:
... ...
vendor/cache/actionmailer-4.2.5.1.gem
No preview for this file type
vendor/cache/actionmailer-4.2.6.gem 0 → 100644
No preview for this file type
vendor/cache/actionpack-4.2.5.1.gem
No preview for this file type
vendor/cache/actionpack-4.2.6.gem 0 → 100644
No preview for this file type
vendor/cache/actionview-4.2.5.1.gem
No preview for this file type
vendor/cache/actionview-4.2.6.gem 0 → 100644
No preview for this file type
vendor/cache/activejob-4.2.5.1.gem
No preview for this file type
vendor/cache/activejob-4.2.6.gem 0 → 100644
No preview for this file type
vendor/cache/activemodel-4.2.5.1.gem
No preview for this file type
vendor/cache/activemodel-4.2.6.gem 0 → 100644
No preview for this file type
vendor/cache/activerecord-4.2.5.1.gem
No preview for this file type
vendor/cache/activerecord-4.2.6.gem 0 → 100644
No preview for this file type
vendor/cache/activesupport-4.2.5.1.gem
No preview for this file type
vendor/cache/activesupport-4.2.6.gem 0 → 100644
No preview for this file type
vendor/cache/api-pagination-4.3.0.gem 0 → 100644
No preview for this file type
vendor/cache/concurrent-ruby-1.0.0.gem
No preview for this file type
vendor/cache/concurrent-ruby-1.0.2.gem 0 → 100644
No preview for this file type
vendor/cache/domain_name-0.5.20160216.gem
No preview for this file type
vendor/cache/domain_name-0.5.20160310.gem 0 → 100644
No preview for this file type
vendor/cache/enumerable-lazy-0.0.1.gem 0 → 100644
No preview for this file type
vendor/cache/gettext-3.2.1.gem
No preview for this file type
vendor/cache/gettext-3.2.2.gem 0 → 100644
No preview for this file type
vendor/cache/grape-0.14.0.gem
No preview for this file type
vendor/cache/grape-0.16.2.gem 0 → 100644
No preview for this file type
vendor/cache/grape-entity-0.4.8.gem 0 → 100644
No preview for this file type
vendor/cache/grape-entity-0.5.0.gem
No preview for this file type
vendor/cache/grape_logging-1.1.2.gem
No preview for this file type
vendor/cache/grape_logging-1.2.1.gem 0 → 100644
No preview for this file type
vendor/cache/hashie-3.4.3.gem
No preview for this file type
vendor/cache/hashie-3.4.4.gem 0 → 100644
No preview for this file type
vendor/cache/mail-2.6.3.gem
No preview for this file type
vendor/cache/mail-2.6.4.gem 0 → 100644
No preview for this file type
vendor/cache/multi_json-1.11.2.gem
No preview for this file type
vendor/cache/multi_json-1.11.3.gem 0 → 100644
No preview for this file type
vendor/cache/mustermann19-0.4.3.gem 0 → 100644
No preview for this file type
vendor/cache/pothoven-attachment_fu-3.2.16.gem
No preview for this file type
vendor/cache/pothoven-attachment_fu-3.2.17.gem 0 → 100644
No preview for this file type
vendor/cache/rack-mount-0.8.3.gem
No preview for this file type
vendor/cache/rails-4.2.5.1.gem
No preview for this file type
vendor/cache/rails-4.2.6.gem 0 → 100644
No preview for this file type
vendor/cache/railties-4.2.5.1.gem
No preview for this file type
vendor/cache/railties-4.2.6.gem 0 → 100644
No preview for this file type
vendor/cache/raindrops-0.15.0.gem
No preview for this file type
vendor/cache/raindrops-0.16.0.gem 0 → 100644
No preview for this file type
vendor/cache/rake-10.5.0.gem
No preview for this file type
vendor/cache/rake-11.1.2.gem 0 → 100644
No preview for this file type
vendor/cache/ruby-feedparser-0.9.3.gem
No preview for this file type
vendor/cache/ruby-feedparser-0.9.4.gem 0 → 100644
No preview for this file type
vendor/cache/sass-3.4.21.gem
No preview for this file type
vendor/cache/sass-3.4.22.gem 0 → 100644
No preview for this file type
vendor/cache/sprockets-3.5.2.gem
No preview for this file type
vendor/cache/sprockets-3.6.0.gem 0 → 100644
No preview for this file type
vendor/cache/uglifier-2.7.2.gem
No preview for this file type
vendor/cache/uglifier-3.0.0.gem 0 → 100644
No preview for this file type