Bumping 1.5

Signed-off-by: Tallys Martins <tallysmartins@gmail.com>

Bumping 1.5
Signed-off-by: Tallys Martins <tallysmartins@gmail.com>
Tallys Martins
1 parent be4f246c
Showing 57 changed files with 68 additions and 63 deletions Show diff stats
Gemfile
Gemfile.lock
Makefile
vendor/cache/RedCloth-4.2.9.gem
vendor/cache/RedCloth-4.3.0.gem
vendor/cache/actionmailer-4.2.5.1.gem
vendor/cache/actionmailer-4.2.6.gem
vendor/cache/actionpack-4.2.5.1.gem
vendor/cache/actionpack-4.2.6.gem
vendor/cache/actionview-4.2.5.1.gem
vendor/cache/actionview-4.2.6.gem
vendor/cache/activejob-4.2.5.1.gem
vendor/cache/activejob-4.2.6.gem
vendor/cache/activemodel-4.2.5.1.gem
vendor/cache/activemodel-4.2.6.gem
vendor/cache/activerecord-4.2.5.1.gem
vendor/cache/activerecord-4.2.6.gem
vendor/cache/api-pagination-4.3.0.gem
vendor/cache/concurrent-ruby-1.0.0.gem
vendor/cache/concurrent-ruby-1.0.2.gem
@@ -34,10 +34,11 @@ gem &#39;slim&#39;
  
 # API dependencies
 gem 'grape',                    '~> 0.12'
-gem 'grape-entity'
+gem 'grape-entity',             '0.4.8'
 gem 'grape_logging'
 gem 'rack-cors'
 gem 'rack-contrib'
+gem 'api-pagination',           '>= 4.1.1'
  
 # asset pipeline
 gem 'uglifier', '>= 1.0.3'
@@ -31,14 +31,14 @@ PATH
     access_control (0.0.0)
  
 PATH
-  remote: vendor/plugins/action_tracker
+  remote: vendor/plugins/action_tracker_has_comments
   specs:
-    action_tracker (0.0.1)
+    action_tracker_has_comments (0.0.0)
  
 PATH
-  remote: vendor/plugins/action_tracker_has_comments
+  remote: vendor/plugins/action_tracker
   specs:
-    action_tracker_has_comments (0.0.0)
+    action_tracker (0.0.1)
  
 PATH
   remote: vendor/plugins/acts_as_list
@@ -117,15 +117,15 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    RedCloth (4.2.9)
-    actionmailer (4.2.5.1)
-      actionpack (= 4.2.5.1)
-      actionview (= 4.2.5.1)
-      activejob (= 4.2.5.1)
+    RedCloth (4.3.0)
+    actionmailer (4.2.6)
+      actionpack (= 4.2.6)
+      actionview (= 4.2.6)
+      activejob (= 4.2.6)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 1.0, >= 1.0.5)
-    actionpack (4.2.5.1)
-      actionview (= 4.2.5.1)
+    actionpack (4.2.6)
+      actionview (= 4.2.6)
       activesupport (= 4.2.5.1)
       rack (~> 1.6)
       rack-test (~> 0.6.2)
@@ -135,20 +135,20 @@ GEM
       actionpack (>= 4.0.0, < 5.0)
     actionpack-page_caching (1.0.2)
       actionpack (>= 4.0.0, < 5)
-    actionview (4.2.5.1)
+    actionview (4.2.6)
       activesupport (= 4.2.5.1)
       builder (~> 3.1)
       erubis (~> 2.7.0)
       rails-dom-testing (~> 1.0, >= 1.0.5)
       rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    activejob (4.2.5.1)
+    activejob (4.2.6)
       activesupport (= 4.2.5.1)
       globalid (>= 0.3.0)
-    activemodel (4.2.5.1)
-      activesupport (= 4.2.5.1)
+    activemodel (4.2.6)
+      activesupport (= 4.2.6)
       builder (~> 3.1)
-    activerecord (4.2.5.1)
-      activemodel (= 4.2.5.1)
+    activerecord (4.2.6)
+      activemodel (= 4.2.6)
       activesupport (= 4.2.5.1)
       arel (~> 6.0)
     activerecord-deprecated_finders (1.0.4)
@@ -166,13 +166,14 @@ GEM
       activerecord (>= 3.2, < 5)
     addressable (2.4.0)
     ansi (1.5.0)
+    api-pagination (4.3.0)
     arel (6.0.3)
     axiom-types (0.1.1)
       descendants_tracker (~> 0.0.4)
       ice_nine (~> 0.11.0)
       thread_safe (~> 0.3, >= 0.3.1)
     builder (3.2.2)
-    capybara (2.6.2)
+    capybara (2.7.1)
       addressable
       mime-types (>= 1.16)
       nokogiri (>= 1.3.3)
@@ -184,8 +185,8 @@ GEM
     chronic (0.10.2)
     coercible (1.0.0)
       descendants_tracker (~> 0.0.1)
-    concurrent-ruby (1.0.0)
-    cucumber (2.3.2)
+    concurrent-ruby (1.0.2)
+    cucumber (2.3.3)
       builder (>= 2.1.2)
       cucumber-core (~> 1.4.0)
       cucumber-wire (~> 0.0.1)
@@ -204,7 +205,7 @@ GEM
     cucumber-wire (0.0.1)
     daemons (1.2.3)
     dalli (2.7.6)
-    database_cleaner (1.5.1)
+    database_cleaner (1.5.3)
     delayed_job (4.1.1)
       activesupport (>= 3.0, < 5.0)
     delayed_job_active_record (4.1.0)
@@ -214,11 +215,12 @@ GEM
       thread_safe (~> 0.3, >= 0.3.1)
     diff-lcs (1.2.5)
     diffy (3.1.0)
-    domain_name (0.5.20160216)
+    domain_name (0.5.20160310)
       unf (>= 0.0.5, < 1.0.0)
     eita-jrails (0.10.1)
       actionpack (>= 3.1.0)
       activesupport (>= 3.0.0)
+    enumerable-lazy (0.0.1)
     equalizer (0.0.11)
     erubis (2.7.0)
     exception_notification (4.0.1)
@@ -227,29 +229,29 @@ GEM
     execjs (2.6.0)
     fast_gettext (0.9.2)
     ffi (1.9.10)
-    gettext (3.2.1)
+    gettext (3.2.2)
       locale (>= 2.0.5)
       text (>= 1.3.0)
     gherkin (3.2.0)
     git-version-bump (0.15.1)
     globalid (0.3.6)
       activesupport (>= 4.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.0)
+    grape-entity (0.4.8)
       activesupport
       multi_json (>= 1.3.2)
-    grape_logging (1.1.2)
+    grape_logging (1.2.1)
       grape
-    hashie (3.4.3)
+    hashie (3.4.4)
     http-cookie (1.0.2)
       domain_name (~> 0.5)
     i18n (0.7.0)
@@ -263,27 +265,29 @@ GEM
       nokogiri (>= 1.5.9)
     magic (0.2.9)
       ffi (>= 0.6.3)
-    mail (2.6.3)
-      mime-types (>= 1.16, < 3)
+    mail (2.6.4)
+      mime-types (>= 1.16, < 4)
     metaclass (0.0.4)
     mime-types (2.99.1)
     mini_portile2 (2.0.0)
     minitest (5.8.4)
-    minitest-reporters (1.1.8)
+    minitest-reporters (1.1.9)
       ansi
       builder
       minitest (>= 5.0)
       ruby-progressbar
     mocha (1.1.0)
       metaclass (~> 0.0.1)
-    multi_json (1.11.2)
+    multi_json (1.12.0)
     multi_test (0.1.2)
     multi_xml (0.5.5)
+    mustermann19 (0.4.3)
+      enumerable-lazy
     netrc (0.11.0)
     nokogiri (1.6.7.2)
       mini_portile2 (~> 2.0.0.rc2)
     pg (0.18.4)
-    pothoven-attachment_fu (3.2.16)
+    pothoven-attachment_fu (3.2.17)
     protected_attributes (1.1.3)
       activemodel (>= 4.0.1, < 5.0)
     rack (1.6.4)
@@ -293,20 +297,18 @@ GEM
       git-version-bump (~> 0.15)
       rack (~> 1.4)
     rack-cors (0.4.0)
-    rack-mount (0.8.3)
-      rack (>= 1.0.0)
     rack-test (0.6.3)
       rack (>= 1.0)
-    rails (4.2.5.1)
-      actionmailer (= 4.2.5.1)
-      actionpack (= 4.2.5.1)
-      actionview (= 4.2.5.1)
-      activejob (= 4.2.5.1)
-      activemodel (= 4.2.5.1)
-      activerecord (= 4.2.5.1)
+    rails (4.2.6)
+      actionmailer (= 4.2.6)
+      actionpack (= 4.2.6)
+      actionview (= 4.2.6)
+      activejob (= 4.2.6)
+      activemodel (= 4.2.6)
+      activerecord (= 4.2.6)
       activesupport (= 4.2.5.1)
       bundler (>= 1.3.0, < 2.0)
-      railties (= 4.2.5.1)
+      railties (= 4.2.6)
       sprockets-rails
     rails-deprecated_sanitizer (1.0.3)
       activesupport (>= 4.2.0.alpha)
@@ -320,13 +322,13 @@ GEM
       activemodel (~> 4.0)
     rails_autolink (1.1.6)
       rails (> 3.1)
-    railties (4.2.5.1)
-      actionpack (= 4.2.5.1)
+    railties (4.2.6)
+      actionpack (= 4.2.6)
       activesupport (= 4.2.5.1)
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
-    raindrops (0.15.0)
-    rake (10.5.0)
+    raindrops (0.16.0)
+    rake (11.1.2)
     rest-client (1.8.0)
       http-cookie (>= 1.0.2, < 2.0)
       mime-types (>= 1.16, < 3.0)
@@ -336,7 +338,7 @@ GEM
       rspec-core (~> 3.4.0)
       rspec-expectations (~> 3.4.0)
       rspec-mocks (~> 3.4.0)
-    rspec-core (3.4.3)
+    rspec-core (3.4.4)
       rspec-support (~> 3.4.0)
     rspec-expectations (3.4.0)
       diff-lcs (>= 1.2.0, < 2.0)
@@ -353,27 +355,26 @@ GEM
       rspec-mocks (~> 3.4.0)
       rspec-support (~> 3.4.0)
     rspec-support (3.4.1)
-    ruby-feedparser (0.9.3)
+    ruby-feedparser (0.9.4)
       magic
-    ruby-progressbar (1.7.5)
+    ruby-progressbar (1.8.0)
     rubyzip (1.2.0)
-    sass (3.4.21)
+    sass (3.4.22)
     sass-rails (5.0.4)
       railties (>= 4.0.0, < 5.0)
       sass (~> 3.1)
       sprockets (>= 2.8, < 4.0)
       sprockets-rails (>= 2.0, < 4.0)
       tilt (>= 1.1, < 3)
-    selenium-webdriver (2.52.0)
+    selenium-webdriver (2.53.0)
       childprocess (~> 0.5)
-      multi_json (~> 1.0)
       rubyzip (~> 1.0)
       websocket (~> 1.0)
     slim (3.0.6)
       temple (~> 0.7.3)
       tilt (>= 1.3.3, < 2.1)
-    spring (1.6.3)
-    sprockets (3.5.2)
+    spring (1.7.1)
+    sprockets (3.6.0)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
     sprockets-rails (2.3.3)
@@ -387,9 +388,8 @@ GEM
     tilt (2.0.2)
     tzinfo (1.2.2)
       thread_safe (~> 0.1)
-    uglifier (2.7.2)
-      execjs (>= 0.3.0)
-      json (>= 1.8.0)
+    uglifier (3.0.0)
+      execjs (>= 0.3.0, < 3)
     unf (0.1.4)
       unf_ext
     unf_ext (0.0.7.2)
@@ -402,7 +402,7 @@ GEM
       coercible (~> 1.0)
       descendants_tracker (~> 0.0, >= 0.0.3)
       equalizer (~> 0.0, >= 0.0.9)
-    websocket (1.2.2)
+    websocket (1.2.3)
     whenever (0.9.4)
       chronic (>= 0.6.3)
     will_paginate (3.0.7)
@@ -426,6 +426,7 @@ DEPENDENCIES
   acts_as_list (= 0.0.0)!
   acts_as_tree (= 0.0.0)!
   acts_as_versioned (> 0.0.0)!
+  api-pagination (>= 4.1.1)
   bundle (= 0.0.0)!
   cache (= 0.0.0)!
   capybara (~> 2.2)
@@ -445,7 +446,7 @@ DEPENDENCIES
   gdata (> 0.0.0)!
   gettext (~> 3.1)
   grape (~> 0.12)
-  grape-entity
+  grape-entity (= 0.4.8)
   grape_logging
   honeypot (= 0.0.0)!
   i18n_deprecation (= 0.0.0)!
@@ -488,3 +489,6 @@ DEPENDENCIES
   whenever
   will_paginate (~> 3.0.7)
   xss_terminate (= 0.0.0)!
+
+BUNDLED WITH
+   1.12.1
-VERSION = 1.4
+VERSION = 1.5
 TARBALL = noosfero-deps-$(VERSION).tar.gz
 PREFIX = /usr
 WGET = wget
-NOOSFERO_BRANCH = master
+NOOSFERO_BRANCH = stable-1.5
 BUNDLE_OPTS = --verbose --without='development test cucumber'
  
 all:
...	...	@@ -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'
...	...
...	...	@@ -31,14 +31,14 @@ PATH
31	31	access_control (0.0.0)
32	32
33	33	PATH
34		- remote: vendor/plugins/action_tracker
	34	+ remote: vendor/plugins/action_tracker_has_comments
35	35	specs:
36		- action_tracker (0.0.1)
	36	+ action_tracker_has_comments (0.0.0)
37	37
38	38	PATH
39		- remote: vendor/plugins/action_tracker_has_comments
	39	+ remote: vendor/plugins/action_tracker
40	40	specs:
41		- action_tracker_has_comments (0.0.0)
	41	+ action_tracker (0.0.1)
42	42
43	43	PATH
44	44	remote: vendor/plugins/acts_as_list
...	...	@@ -117,15 +117,15 @@ PATH
117	117	GEM
118	118	remote: https://rubygems.org/
119	119	specs:
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)
	120	+ RedCloth (4.3.0)
	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)
	127	+ actionpack (4.2.6)
	128	+ actionview (= 4.2.6)
129	129	activesupport (= 4.2.5.1)
130	130	rack (~> 1.6)
131	131	rack-test (~> 0.6.2)
...	...	@@ -135,20 +135,20 @@ 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)
	138	+ actionview (4.2.6)
139	139	activesupport (= 4.2.5.1)
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)
	144	+ activejob (4.2.6)
145	145	activesupport (= 4.2.5.1)
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)
	150	+ activerecord (4.2.6)
	151	+ activemodel (= 4.2.6)
152	152	activesupport (= 4.2.5.1)
153	153	arel (~> 6.0)
154	154	activerecord-deprecated_finders (1.0.4)
...	...	@@ -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,29 @@ 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.12.0)
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)
287	291	protected_attributes (1.1.3)
288	292	activemodel (>= 4.0.1, < 5.0)
289	293	rack (1.6.4)
...	...	@@ -293,20 +297,18 @@ GEM
293	297	git-version-bump (~> 0.15)
294	298	rack (~> 1.4)
295	299	rack-cors (0.4.0)
296		- rack-mount (0.8.3)
297		- rack (>= 1.0.0)
298	300	rack-test (0.6.3)
299	301	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)
	302	+ rails (4.2.6)
	303	+ actionmailer (= 4.2.6)
	304	+ actionpack (= 4.2.6)
	305	+ actionview (= 4.2.6)
	306	+ activejob (= 4.2.6)
	307	+ activemodel (= 4.2.6)
	308	+ activerecord (= 4.2.6)
307	309	activesupport (= 4.2.5.1)
308	310	bundler (>= 1.3.0, < 2.0)
309		- railties (= 4.2.5.1)
	311	+ railties (= 4.2.6)
310	312	sprockets-rails
311	313	rails-deprecated_sanitizer (1.0.3)
312	314	activesupport (>= 4.2.0.alpha)
...	...	@@ -320,13 +322,13 @@ GEM
320	322	activemodel (~> 4.0)
321	323	rails_autolink (1.1.6)
322	324	rails (> 3.1)
323		- railties (4.2.5.1)
324		- actionpack (= 4.2.5.1)
	325	+ railties (4.2.6)
	326	+ actionpack (= 4.2.6)
325	327	activesupport (= 4.2.5.1)
326	328	rake (>= 0.8.7)
327	329	thor (>= 0.18.1, < 2.0)
328		- raindrops (0.15.0)
329		- rake (10.5.0)
	330	+ raindrops (0.16.0)
	331	+ rake (11.1.2)
330	332	rest-client (1.8.0)
331	333	http-cookie (>= 1.0.2, < 2.0)
332	334	mime-types (>= 1.16, < 3.0)
...	...	@@ -336,7 +338,7 @@ GEM
336	338	rspec-core (~> 3.4.0)
337	339	rspec-expectations (~> 3.4.0)
338	340	rspec-mocks (~> 3.4.0)
339		- rspec-core (3.4.3)
	341	+ rspec-core (3.4.4)
340	342	rspec-support (~> 3.4.0)
341	343	rspec-expectations (3.4.0)
342	344	diff-lcs (>= 1.2.0, < 2.0)
...	...	@@ -353,27 +355,26 @@ GEM
353	355	rspec-mocks (~> 3.4.0)
354	356	rspec-support (~> 3.4.0)
355	357	rspec-support (3.4.1)
356		- ruby-feedparser (0.9.3)
	358	+ ruby-feedparser (0.9.4)
357	359	magic
358		- ruby-progressbar (1.7.5)
	360	+ ruby-progressbar (1.8.0)
359	361	rubyzip (1.2.0)
360		- sass (3.4.21)
	362	+ sass (3.4.22)
361	363	sass-rails (5.0.4)
362	364	railties (>= 4.0.0, < 5.0)
363	365	sass (~> 3.1)
364	366	sprockets (>= 2.8, < 4.0)
365	367	sprockets-rails (>= 2.0, < 4.0)
366	368	tilt (>= 1.1, < 3)
367		- selenium-webdriver (2.52.0)
	369	+ selenium-webdriver (2.53.0)
368	370	childprocess (~> 0.5)
369		- multi_json (~> 1.0)
370	371	rubyzip (~> 1.0)
371	372	websocket (~> 1.0)
372	373	slim (3.0.6)
373	374	temple (~> 0.7.3)
374	375	tilt (>= 1.3.3, < 2.1)
375		- spring (1.6.3)
376		- sprockets (3.5.2)
	376	+ spring (1.7.1)
	377	+ sprockets (3.6.0)
377	378	concurrent-ruby (~> 1.0)
378	379	rack (> 1, < 3)
379	380	sprockets-rails (2.3.3)
...	...	@@ -387,9 +388,8 @@ GEM
387	388	tilt (2.0.2)
388	389	tzinfo (1.2.2)
389	390	thread_safe (~> 0.1)
390		- uglifier (2.7.2)
391		- execjs (>= 0.3.0)
392		- json (>= 1.8.0)
	391	+ uglifier (3.0.0)
	392	+ execjs (>= 0.3.0, < 3)
393	393	unf (0.1.4)
394	394	unf_ext
395	395	unf_ext (0.0.7.2)
...	...	@@ -402,7 +402,7 @@ GEM
402	402	coercible (~> 1.0)
403	403	descendants_tracker (~> 0.0, >= 0.0.3)
404	404	equalizer (~> 0.0, >= 0.0.9)
405		- websocket (1.2.2)
	405	+ websocket (1.2.3)
406	406	whenever (0.9.4)
407	407	chronic (>= 0.6.3)
408	408	will_paginate (3.0.7)
...	...	@@ -426,6 +426,7 @@ DEPENDENCIES
426	426	acts_as_list (= 0.0.0)!
427	427	acts_as_tree (= 0.0.0)!
428	428	acts_as_versioned (> 0.0.0)!
	429	+ api-pagination (>= 4.1.1)
429	430	bundle (= 0.0.0)!
430	431	cache (= 0.0.0)!
431	432	capybara (~> 2.2)
...	...	@@ -445,7 +446,7 @@ DEPENDENCIES
445	446	gdata (> 0.0.0)!
446	447	gettext (~> 3.1)
447	448	grape (~> 0.12)
448		- grape-entity
	449	+ grape-entity (= 0.4.8)
449	450	grape_logging
450	451	honeypot (= 0.0.0)!
451	452	i18n_deprecation (= 0.0.0)!
...	...	@@ -488,3 +489,6 @@ DEPENDENCIES
488	489	whenever
489	490	will_paginate (~> 3.0.7)
490	491	xss_terminate (= 0.0.0)!
	492	+
	493	+BUNDLED WITH
	494	+ 1.12.1
...	...
1		-VERSION = 1.4
	1	+VERSION = 1.5
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:
...	...