Updated to noosfero-1.2~rc0

Macartur Sousa
1 parent f8396db0
Showing 44 changed files with 75 additions and 55 deletions Show diff stats
Gemfile
Gemfile.lock
Makefile
vendor/cache/actionmailer-3.2.21.gem
vendor/cache/actionmailer-3.2.22.gem
vendor/cache/actionpack-3.2.21.gem
vendor/cache/actionpack-3.2.22.gem
vendor/cache/activemodel-3.2.21.gem
vendor/cache/activemodel-3.2.22.gem
vendor/cache/activerecord-3.2.21.gem
vendor/cache/activerecord-3.2.22.gem
vendor/cache/activeresource-3.2.21.gem
vendor/cache/activeresource-3.2.22.gem
vendor/cache/activesupport-3.2.21.gem
vendor/cache/activesupport-3.2.22.gem
vendor/cache/childprocess-0.5.5.gem
vendor/cache/dalli-2.7.2.gem
vendor/cache/dalli-2.7.4.gem
vendor/cache/diff-lcs-1.1.3.gem
vendor/cache/eita-jrails-0.9.5.gem
@@ -20,13 +20,17 @@ gem &#39;locale&#39;,                   &#39;~&gt; 2.0.5&#39;
 gem 'whenever', :require => false
 gem 'eita-jrails', '>= 0.9.5', :require => 'jrails'
+# asset pipeline
+gem 'uglifier', '>= 1.0.3'
+gem 'sass-rails'
+
 group :production do
   gem 'dalli', '~> 2.7.0'
 end
 group :test do
-  gem 'rspec',                  '~> 2.10.0'
-  gem 'rspec-rails',            '~> 2.10.1'
+  gem 'rspec',                  '~> 2.14.0'
+  gem 'rspec-rails',            '~> 2.14.1'
   gem 'mocha',                  '~> 1.1.0', :require => false
 end
@@ -2,12 +2,12 @@ GEM
   remote: https://rubygems.org/
   specs:
     RedCloth (4.2.9)
-    actionmailer (3.2.21)
-      actionpack (= 3.2.21)
+    actionmailer (3.2.22)
+      actionpack (= 3.2.22)
       mail (~> 2.5.4)
-    actionpack (3.2.21)
-      activemodel (= 3.2.21)
-      activesupport (= 3.2.21)
+    actionpack (3.2.22)
+      activemodel (= 3.2.22)
+      activesupport (= 3.2.22)
       builder (~> 3.0.0)
       erubis (~> 2.7.0)
       journey (~> 1.0.4)
@@ -15,18 +15,18 @@ GEM
       rack-cache (~> 1.2)
       rack-test (~> 0.6.1)
       sprockets (~> 2.2.1)
-    activemodel (3.2.21)
-      activesupport (= 3.2.21)
+    activemodel (3.2.22)
+      activesupport (= 3.2.22)
       builder (~> 3.0.0)
-    activerecord (3.2.21)
-      activemodel (= 3.2.21)
-      activesupport (= 3.2.21)
+    activerecord (3.2.22)
+      activemodel (= 3.2.22)
+      activesupport (= 3.2.22)
       arel (~> 3.0.2)
       tzinfo (~> 0.3.29)
-    activeresource (3.2.21)
-      activemodel (= 3.2.21)
-      activesupport (= 3.2.21)
-    activesupport (3.2.21)
+    activeresource (3.2.22)
+      activemodel (= 3.2.22)
+      activesupport (= 3.2.22)
+    activesupport (3.2.22)
       i18n (~> 0.6, >= 0.6.4)
       multi_json (~> 1.0)
     acts-as-taggable-on (3.4.4)
@@ -39,7 +39,7 @@ GEM
       rack (>= 1.0.0)
       rack-test (>= 0.5.4)
       xpath (~> 2.0)
-    childprocess (0.5.5)
+    childprocess (0.5.6)
       ffi (~> 1.0, >= 1.0.11)
     chronic (0.10.2)
     cucumber (1.0.6)
@@ -53,19 +53,20 @@ GEM
       cucumber (>= 1.0.6)
       nokogiri (>= 1.5.0)
     daemons (1.1.9)
-    dalli (2.7.2)
+    dalli (2.7.4)
     database_cleaner (1.2.0)
-    diff-lcs (1.1.3)
-    eita-jrails (0.9.5)
-      actionpack (~> 3.2, >= 3.1.0)
-      activesupport (~> 3.2, >= 3.0.0)
+    diff-lcs (1.2.5)
+    eita-jrails (0.9.8)
+      actionpack (>= 3.1.0)
+      activesupport (>= 3.0.0)
     erubis (2.7.0)
     eventmachine (1.0.7)
     exception_notification (4.0.1)
       actionmailer (>= 3.0.4)
       activesupport (>= 3.0.4)
+    execjs (2.5.2)
     fast_gettext (0.6.12)
-    ffi (1.9.6)
+    ffi (1.9.8)
     gettext (2.2.1)
       locale
     gherkin (2.4.21)
@@ -73,9 +74,9 @@ GEM
     hike (1.2.3)
     i18n (0.7.0)
     journey (1.0.4)
-    json (1.8.2)
+    json (1.8.3)
     locale (2.0.9)
-    magic (0.2.8)
+    magic (0.2.9)
       ffi (>= 0.6.3)
     mail (2.5.4)
       mime-types (~> 1.16)
@@ -85,30 +86,30 @@ GEM
     minitest (3.2.0)
     mocha (1.1.0)
       metaclass (~> 0.0.1)
-    multi_json (1.11.0)
+    multi_json (1.11.1)
     nokogiri (1.5.11)
     pg (0.13.2)
     polyglot (0.3.5)
-    rack (1.4.5)
+    rack (1.4.6)
     rack-cache (1.2)
       rack (>= 0.4)
     rack-ssl (1.3.4)
       rack
     rack-test (0.6.3)
       rack (>= 1.0)
-    rails (3.2.21)
-      actionmailer (= 3.2.21)
-      actionpack (= 3.2.21)
-      activerecord (= 3.2.21)
-      activeresource (= 3.2.21)
-      activesupport (= 3.2.21)
+    rails (3.2.22)
+      actionmailer (= 3.2.22)
+      actionpack (= 3.2.22)
+      activerecord (= 3.2.22)
+      activeresource (= 3.2.22)
+      activesupport (= 3.2.22)
       bundler (~> 1.0)
-      railties (= 3.2.21)
+      railties (= 3.2.22)
     rails_autolink (1.1.6)
       rails (> 3.1)
-    railties (3.2.21)
-      actionpack (= 3.2.21)
-      activesupport (= 3.2.21)
+    railties (3.2.22)
+      actionpack (= 3.2.22)
+      activesupport (= 3.2.22)
       rack-ssl (~> 1.3.2)
       rake (>= 0.8.7)
       rdoc (~> 3.4)
@@ -116,26 +117,33 @@ GEM
     rake (10.4.2)
     rdoc (3.12.2)
       json (~> 1.4)
-    rest-client (1.6.8)
+    rest-client (1.6.9)
       mime-types (~> 1.16)
-      rdoc (>= 2.4.2)
     rmagick (2.13.4)
-    rspec (2.10.0)
-      rspec-core (~> 2.10.0)
-      rspec-expectations (~> 2.10.0)
-      rspec-mocks (~> 2.10.0)
-    rspec-core (2.10.1)
-    rspec-expectations (2.10.0)
-      diff-lcs (~> 1.1.3)
-    rspec-mocks (2.10.1)
-    rspec-rails (2.10.1)
+    rspec (2.14.1)
+      rspec-core (~> 2.14.0)
+      rspec-expectations (~> 2.14.0)
+      rspec-mocks (~> 2.14.0)
+    rspec-core (2.14.8)
+    rspec-expectations (2.14.5)
+      diff-lcs (>= 1.1.3, < 2.0)
+    rspec-mocks (2.14.6)
+    rspec-rails (2.14.2)
       actionpack (>= 3.0)
+      activemodel (>= 3.0)
       activesupport (>= 3.0)
       railties (>= 3.0)
-      rspec (~> 2.10.0)
+      rspec-core (~> 2.14.0)
+      rspec-expectations (~> 2.14.0)
+      rspec-mocks (~> 2.14.0)
     ruby-feedparser (0.9.3)
       magic
     rubyzip (1.1.7)
+    sass (3.4.14)
+    sass-rails (3.2.6)
+      railties (~> 3.2.0)
+      sass (>= 3.1.10)
+      tilt (~> 1.3)
     selenium-webdriver (2.39.0)
       childprocess (>= 0.2.5)
       multi_json (~> 1.0)
@@ -146,7 +154,7 @@ GEM
       multi_json (~> 1.0)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
-    term-ansicolor (1.3.0)
+    term-ansicolor (1.3.1)
       tins (~> 1.0)
     thin (1.3.1)
       daemons (>= 1.0.9)
@@ -154,11 +162,14 @@ GEM
       rack (>= 1.0.0)
     thor (0.19.1)
     tilt (1.4.1)
-    tins (1.3.5)
+    tins (1.5.2)
     treetop (1.4.15)
       polyglot
       polyglot (>= 0.3.1)
-    tzinfo (0.3.43)
+    tzinfo (0.3.44)
+    uglifier (2.7.1)
+      execjs (>= 0.3.0)
+      json (>= 1.8.0)
     websocket (1.0.7)
     whenever (0.9.4)
       chronic (>= 0.6.3)
@@ -192,10 +203,15 @@ DEPENDENCIES
   rake
   rest-client (~> 1.6.7)
   rmagick (~> 2.13.1)
-  rspec (~> 2.10.0)
-  rspec-rails (~> 2.10.1)
+  rspec (~> 2.14.0)
+  rspec-rails (~> 2.14.1)
   ruby-feedparser (~> 0.7)
+  sass-rails
   selenium-webdriver (~> 2.39.0)
   thin (~> 1.3.1)
+  uglifier (>= 1.0.3)
   whenever
   will_paginate (~> 3.0.3)
+
+BUNDLED WITH
+   1.10.4
-VERSION = 1.1
+VERSION = 1.2
 TARBALL = noosfero-deps-$(VERSION).tar.gz
 PREFIX = /usr
 WGET = wget
	@@ -2,12 +2,12 @@ GEM		@@ -2,12 +2,12 @@ GEM
2	remote: https://rubygems.org/	2	remote: https://rubygems.org/
3	specs:	3	specs:
4	RedCloth (4.2.9)	4	RedCloth (4.2.9)
5	- actionmailer (3.2.21)
6	- actionpack (= 3.2.21)	5	+ actionmailer (3.2.22)
		6	+ actionpack (= 3.2.22)
7	mail (~> 2.5.4)	7	mail (~> 2.5.4)
8	- actionpack (3.2.21)
9	- activemodel (= 3.2.21)
10	- activesupport (= 3.2.21)	8	+ actionpack (3.2.22)
		9	+ activemodel (= 3.2.22)
		10	+ activesupport (= 3.2.22)
11	builder (~> 3.0.0)	11	builder (~> 3.0.0)
12	erubis (~> 2.7.0)	12	erubis (~> 2.7.0)
13	journey (~> 1.0.4)	13	journey (~> 1.0.4)
	@@ -15,18 +15,18 @@ GEM		@@ -15,18 +15,18 @@ GEM
15	rack-cache (~> 1.2)	15	rack-cache (~> 1.2)
16	rack-test (~> 0.6.1)	16	rack-test (~> 0.6.1)
17	sprockets (~> 2.2.1)	17	sprockets (~> 2.2.1)
18	- activemodel (3.2.21)
19	- activesupport (= 3.2.21)	18	+ activemodel (3.2.22)
		19	+ activesupport (= 3.2.22)
20	builder (~> 3.0.0)	20	builder (~> 3.0.0)
21	- activerecord (3.2.21)
22	- activemodel (= 3.2.21)
23	- activesupport (= 3.2.21)	21	+ activerecord (3.2.22)
		22	+ activemodel (= 3.2.22)
		23	+ activesupport (= 3.2.22)
24	arel (~> 3.0.2)	24	arel (~> 3.0.2)
25	tzinfo (~> 0.3.29)	25	tzinfo (~> 0.3.29)
26	- activeresource (3.2.21)
27	- activemodel (= 3.2.21)
28	- activesupport (= 3.2.21)
29	- activesupport (3.2.21)	26	+ activeresource (3.2.22)
		27	+ activemodel (= 3.2.22)
		28	+ activesupport (= 3.2.22)
		29	+ activesupport (3.2.22)
30	i18n (~> 0.6, >= 0.6.4)	30	i18n (~> 0.6, >= 0.6.4)
31	multi_json (~> 1.0)	31	multi_json (~> 1.0)
32	acts-as-taggable-on (3.4.4)	32	acts-as-taggable-on (3.4.4)
	@@ -39,7 +39,7 @@ GEM		@@ -39,7 +39,7 @@ GEM
39	rack (>= 1.0.0)	39	rack (>= 1.0.0)
40	rack-test (>= 0.5.4)	40	rack-test (>= 0.5.4)
41	xpath (~> 2.0)	41	xpath (~> 2.0)
42	- childprocess (0.5.5)	42	+ childprocess (0.5.6)
43	ffi (~> 1.0, >= 1.0.11)	43	ffi (~> 1.0, >= 1.0.11)
44	chronic (0.10.2)	44	chronic (0.10.2)
45	cucumber (1.0.6)	45	cucumber (1.0.6)
	@@ -53,19 +53,20 @@ GEM		@@ -53,19 +53,20 @@ GEM
53	cucumber (>= 1.0.6)	53	cucumber (>= 1.0.6)
54	nokogiri (>= 1.5.0)	54	nokogiri (>= 1.5.0)
55	daemons (1.1.9)	55	daemons (1.1.9)
56	- dalli (2.7.2)	56	+ dalli (2.7.4)
57	database_cleaner (1.2.0)	57	database_cleaner (1.2.0)
58	- diff-lcs (1.1.3)
59	- eita-jrails (0.9.5)
60	- actionpack (~> 3.2, >= 3.1.0)
61	- activesupport (~> 3.2, >= 3.0.0)	58	+ diff-lcs (1.2.5)
		59	+ eita-jrails (0.9.8)
		60	+ actionpack (>= 3.1.0)
		61	+ activesupport (>= 3.0.0)
62	erubis (2.7.0)	62	erubis (2.7.0)
63	eventmachine (1.0.7)	63	eventmachine (1.0.7)
64	exception_notification (4.0.1)	64	exception_notification (4.0.1)
65	actionmailer (>= 3.0.4)	65	actionmailer (>= 3.0.4)
66	activesupport (>= 3.0.4)	66	activesupport (>= 3.0.4)
		67	+ execjs (2.5.2)
67	fast_gettext (0.6.12)	68	fast_gettext (0.6.12)
68	- ffi (1.9.6)	69	+ ffi (1.9.8)
69	gettext (2.2.1)	70	gettext (2.2.1)
70	locale	71	locale
71	gherkin (2.4.21)	72	gherkin (2.4.21)
	@@ -73,9 +74,9 @@ GEM		@@ -73,9 +74,9 @@ GEM
73	hike (1.2.3)	74	hike (1.2.3)
74	i18n (0.7.0)	75	i18n (0.7.0)
75	journey (1.0.4)	76	journey (1.0.4)
76	- json (1.8.2)	77	+ json (1.8.3)
77	locale (2.0.9)	78	locale (2.0.9)
78	- magic (0.2.8)	79	+ magic (0.2.9)
79	ffi (>= 0.6.3)	80	ffi (>= 0.6.3)
80	mail (2.5.4)	81	mail (2.5.4)
81	mime-types (~> 1.16)	82	mime-types (~> 1.16)
	@@ -85,30 +86,30 @@ GEM		@@ -85,30 +86,30 @@ GEM
85	minitest (3.2.0)	86	minitest (3.2.0)
86	mocha (1.1.0)	87	mocha (1.1.0)
87	metaclass (~> 0.0.1)	88	metaclass (~> 0.0.1)
88	- multi_json (1.11.0)	89	+ multi_json (1.11.1)
89	nokogiri (1.5.11)	90	nokogiri (1.5.11)
90	pg (0.13.2)	91	pg (0.13.2)
91	polyglot (0.3.5)	92	polyglot (0.3.5)
92	- rack (1.4.5)	93	+ rack (1.4.6)
93	rack-cache (1.2)	94	rack-cache (1.2)
94	rack (>= 0.4)	95	rack (>= 0.4)
95	rack-ssl (1.3.4)	96	rack-ssl (1.3.4)
96	rack	97	rack
97	rack-test (0.6.3)	98	rack-test (0.6.3)
98	rack (>= 1.0)	99	rack (>= 1.0)
99	- rails (3.2.21)
100	- actionmailer (= 3.2.21)
101	- actionpack (= 3.2.21)
102	- activerecord (= 3.2.21)
103	- activeresource (= 3.2.21)
104	- activesupport (= 3.2.21)	100	+ rails (3.2.22)
		101	+ actionmailer (= 3.2.22)
		102	+ actionpack (= 3.2.22)
		103	+ activerecord (= 3.2.22)
		104	+ activeresource (= 3.2.22)
		105	+ activesupport (= 3.2.22)
105	bundler (~> 1.0)	106	bundler (~> 1.0)
106	- railties (= 3.2.21)	107	+ railties (= 3.2.22)
107	rails_autolink (1.1.6)	108	rails_autolink (1.1.6)
108	rails (> 3.1)	109	rails (> 3.1)
109	- railties (3.2.21)
110	- actionpack (= 3.2.21)
111	- activesupport (= 3.2.21)	110	+ railties (3.2.22)
		111	+ actionpack (= 3.2.22)
		112	+ activesupport (= 3.2.22)
112	rack-ssl (~> 1.3.2)	113	rack-ssl (~> 1.3.2)
113	rake (>= 0.8.7)	114	rake (>= 0.8.7)
114	rdoc (~> 3.4)	115	rdoc (~> 3.4)
	@@ -116,26 +117,33 @@ GEM		@@ -116,26 +117,33 @@ GEM
116	rake (10.4.2)	117	rake (10.4.2)
117	rdoc (3.12.2)	118	rdoc (3.12.2)
118	json (~> 1.4)	119	json (~> 1.4)
119	- rest-client (1.6.8)	120	+ rest-client (1.6.9)
120	mime-types (~> 1.16)	121	mime-types (~> 1.16)
121	- rdoc (>= 2.4.2)
122	rmagick (2.13.4)	122	rmagick (2.13.4)
123	- rspec (2.10.0)
124	- rspec-core (~> 2.10.0)
125	- rspec-expectations (~> 2.10.0)
126	- rspec-mocks (~> 2.10.0)
127	- rspec-core (2.10.1)
128	- rspec-expectations (2.10.0)
129	- diff-lcs (~> 1.1.3)
130	- rspec-mocks (2.10.1)
131	- rspec-rails (2.10.1)	123	+ rspec (2.14.1)
		124	+ rspec-core (~> 2.14.0)
		125	+ rspec-expectations (~> 2.14.0)
		126	+ rspec-mocks (~> 2.14.0)
		127	+ rspec-core (2.14.8)
		128	+ rspec-expectations (2.14.5)
		129	+ diff-lcs (>= 1.1.3, < 2.0)
		130	+ rspec-mocks (2.14.6)
		131	+ rspec-rails (2.14.2)
132	actionpack (>= 3.0)	132	actionpack (>= 3.0)
		133	+ activemodel (>= 3.0)
133	activesupport (>= 3.0)	134	activesupport (>= 3.0)
134	railties (>= 3.0)	135	railties (>= 3.0)
135	- rspec (~> 2.10.0)	136	+ rspec-core (~> 2.14.0)
		137	+ rspec-expectations (~> 2.14.0)
		138	+ rspec-mocks (~> 2.14.0)
136	ruby-feedparser (0.9.3)	139	ruby-feedparser (0.9.3)
137	magic	140	magic
138	rubyzip (1.1.7)	141	rubyzip (1.1.7)
		142	+ sass (3.4.14)
		143	+ sass-rails (3.2.6)
		144	+ railties (~> 3.2.0)
		145	+ sass (>= 3.1.10)
		146	+ tilt (~> 1.3)
139	selenium-webdriver (2.39.0)	147	selenium-webdriver (2.39.0)
140	childprocess (>= 0.2.5)	148	childprocess (>= 0.2.5)
141	multi_json (~> 1.0)	149	multi_json (~> 1.0)
	@@ -146,7 +154,7 @@ GEM		@@ -146,7 +154,7 @@ GEM
146	multi_json (~> 1.0)	154	multi_json (~> 1.0)
147	rack (~> 1.0)	155	rack (~> 1.0)
148	tilt (~> 1.1, != 1.3.0)	156	tilt (~> 1.1, != 1.3.0)
149	- term-ansicolor (1.3.0)	157	+ term-ansicolor (1.3.1)
150	tins (~> 1.0)	158	tins (~> 1.0)
151	thin (1.3.1)	159	thin (1.3.1)
152	daemons (>= 1.0.9)	160	daemons (>= 1.0.9)
	@@ -154,11 +162,14 @@ GEM		@@ -154,11 +162,14 @@ GEM
154	rack (>= 1.0.0)	162	rack (>= 1.0.0)
155	thor (0.19.1)	163	thor (0.19.1)
156	tilt (1.4.1)	164	tilt (1.4.1)
157	- tins (1.3.5)	165	+ tins (1.5.2)
158	treetop (1.4.15)	166	treetop (1.4.15)
159	polyglot	167	polyglot
160	polyglot (>= 0.3.1)	168	polyglot (>= 0.3.1)
161	- tzinfo (0.3.43)	169	+ tzinfo (0.3.44)
		170	+ uglifier (2.7.1)
		171	+ execjs (>= 0.3.0)
		172	+ json (>= 1.8.0)
162	websocket (1.0.7)	173	websocket (1.0.7)
163	whenever (0.9.4)	174	whenever (0.9.4)
164	chronic (>= 0.6.3)	175	chronic (>= 0.6.3)
	@@ -192,10 +203,15 @@ DEPENDENCIES		@@ -192,10 +203,15 @@ DEPENDENCIES
192	rake	203	rake
193	rest-client (~> 1.6.7)	204	rest-client (~> 1.6.7)
194	rmagick (~> 2.13.1)	205	rmagick (~> 2.13.1)
195	- rspec (~> 2.10.0)
196	- rspec-rails (~> 2.10.1)	206	+ rspec (~> 2.14.0)
		207	+ rspec-rails (~> 2.14.1)
197	ruby-feedparser (~> 0.7)	208	ruby-feedparser (~> 0.7)
		209	+ sass-rails
198	selenium-webdriver (~> 2.39.0)	210	selenium-webdriver (~> 2.39.0)
199	thin (~> 1.3.1)	211	thin (~> 1.3.1)
		212	+ uglifier (>= 1.0.3)
200	whenever	213	whenever
201	will_paginate (~> 3.0.3)	214	will_paginate (~> 3.0.3)
		215	+
		216	+BUNDLED WITH
		217	+ 1.10.4
1	-VERSION = 1.1	1	+VERSION = 1.2
2	TARBALL = noosfero-deps-$(VERSION).tar.gz	2	TARBALL = noosfero-deps-$(VERSION).tar.gz
3	PREFIX = /usr	3	PREFIX = /usr
4	WGET = wget	4	WGET = wget