Update Gem like rails 3.2.15

Cyril Mougel
1 parent 4f5d97fb
Showing 2 changed files with 40 additions and 40 deletions Show diff stats
Gemfile
Gemfile.lock
@@ -93,7 +93,7 @@ group :development, :test do
 end
 group :development do
-  gem 'capistrano'
+  gem 'capistrano', '~> 2.0', :require => false
   # better errors
   gem 'better_errors'
@@ -8,16 +8,16 @@ GIT
 GEM
   remote: https://rubygems.org/
   specs:
-    actionmailer (3.2.14)
-      actionpack (= 3.2.14)
+    actionmailer (3.2.15)
+      actionpack (= 3.2.15)
       mail (~> 2.5.4)
     actionmailer_inline_css (1.5.3)
       actionmailer (>= 3.0.0)
       nokogiri (>= 1.4.4)
       premailer (>= 1.7.1)
-    actionpack (3.2.14)
-      activemodel (= 3.2.14)
-      activesupport (= 3.2.14)
+    actionpack (3.2.15)
+      activemodel (= 3.2.15)
+      activesupport (= 3.2.15)
       builder (~> 3.0.0)
       erubis (~> 2.7.0)
       journey (~> 1.0.4)
@@ -25,18 +25,18 @@ GEM
       rack-cache (~> 1.2)
       rack-test (~> 0.6.1)
       sprockets (~> 2.2.1)
-    activemodel (3.2.14)
-      activesupport (= 3.2.14)
+    activemodel (3.2.15)
+      activesupport (= 3.2.15)
       builder (~> 3.0.0)
-    activerecord (3.2.14)
-      activemodel (= 3.2.14)
-      activesupport (= 3.2.14)
+    activerecord (3.2.15)
+      activemodel (= 3.2.15)
+      activesupport (= 3.2.15)
       arel (~> 3.0.2)
       tzinfo (~> 0.3.29)
-    activeresource (3.2.14)
-      activemodel (= 3.2.14)
-      activesupport (= 3.2.14)
-    activesupport (3.2.14)
+    activeresource (3.2.15)
+      activemodel (= 3.2.15)
+      activesupport (= 3.2.15)
+    activesupport (3.2.15)
       i18n (~> 0.6, >= 0.6.4)
       multi_json (~> 1.0)
     addressable (2.3.5)
@@ -85,7 +85,7 @@ GEM
       safe_yaml (~> 0.9.0)
     css_parser (1.3.5)
       addressable
-    database_cleaner (1.1.1)
+    database_cleaner (1.2.0)
     debug_inspector (0.0.2)
     debugger (1.6.2)
       columnize (>= 0.3.1)
@@ -106,7 +106,7 @@ GEM
       launchy (~> 2.1)
       mail (~> 2.2)
     erubis (2.7.0)
-    execjs (2.0.1)
+    execjs (2.0.2)
     fabrication (2.8.1)
     faraday (0.8.8)
       multipart-post (~> 1.2.0)
@@ -134,8 +134,8 @@ GEM
       activesupport
       builder
     htmlentities (4.3.1)
-    httparty (0.11.0)
-      multi_json (~> 1.0)
+    httparty (0.12.0)
+      json (~> 1.8)
       multi_xml (>= 0.5.2)
     httpauth (0.2.0)
     i18n (0.6.5)
@@ -187,7 +187,7 @@ GEM
       rails (>= 3.2.0)
       railties (>= 3.2.0)
     moped (1.5.1)
-    multi_json (1.8.1)
+    multi_json (1.8.2)
     multi_xml (0.5.5)
     multipart-post (1.2.0)
     net-scp (1.1.2)
@@ -199,7 +199,7 @@ GEM
       net-ssh (>= 2.6.5)
     netrc (0.7.7)
     nokogiri (1.5.10)
-    nokogiri-happymapper (0.5.7)
+    nokogiri-happymapper (0.5.8)
       nokogiri (~> 1.5)
     oauth (0.4.7)
     oauth2 (0.8.1)
@@ -264,19 +264,19 @@ GEM
     rack-ssl-enforcer (0.2.6)
     rack-test (0.6.2)
       rack (>= 1.0)
-    rails (3.2.14)
-      actionmailer (= 3.2.14)
-      actionpack (= 3.2.14)
-      activerecord (= 3.2.14)
-      activeresource (= 3.2.14)
-      activesupport (= 3.2.14)
+    rails (3.2.15)
+      actionmailer (= 3.2.15)
+      actionpack (= 3.2.15)
+      activerecord (= 3.2.15)
+      activeresource (= 3.2.15)
+      activesupport (= 3.2.15)
       bundler (~> 1.0)
-      railties (= 3.2.14)
+      railties (= 3.2.15)
     rails_autolink (1.1.4)
       rails (> 3.1)
-    railties (3.2.14)
-      actionpack (= 3.2.14)
-      activesupport (= 3.2.14)
+    railties (3.2.15)
+      actionpack (= 3.2.15)
+      activesupport (= 3.2.15)
       rack-ssl (~> 1.3.2)
       rake (>= 0.8.7)
       rdoc (~> 3.4)
@@ -294,10 +294,10 @@ GEM
       rspec-core (~> 2.14.0)
       rspec-expectations (~> 2.14.0)
       rspec-mocks (~> 2.14.0)
-    rspec-core (2.14.5)
+    rspec-core (2.14.6)
     rspec-expectations (2.14.3)
       diff-lcs (>= 1.1.3, < 2.0)
-    rspec-mocks (2.14.3)
+    rspec-mocks (2.14.4)
     rspec-rails (2.14.0)
       actionpack (>= 3.0)
       activesupport (>= 3.0)
@@ -348,29 +348,29 @@ GEM
       atomic
     tilt (1.4.1)
     timecop (0.6.3)
-    tins (0.11.0)
+    tins (0.12.0)
     treetop (1.4.15)
       polyglot
       polyglot (>= 0.3.1)
     turbo-sprockets-rails3 (0.3.10)
       railties (> 3.2.8, < 4.0.0)
       sprockets (>= 2.0.0)
-    tzinfo (0.3.37)
+    tzinfo (0.3.38)
     uglifier (2.2.1)
       execjs (>= 0.3.0)
       multi_json (~> 1.0, >= 1.0.2)
-    underscore-rails (1.5.1)
+    underscore-rails (1.5.2)
     unicorn (4.6.3)
       kgio (~> 2.6)
       rack
       raindrops (~> 0.7)
-    useragent (0.7.0)
+    useragent (0.8.3)
     warden (1.2.3)
       rack (>= 1.0)
-    webmock (1.13.0)
+    webmock (1.15.0)
       addressable (>= 2.2.7)
       crack (>= 0.3.2)
-    xmpp4r (0.5)
+    xmpp4r (0.5.5)
     xpath (2.0.0)
       nokogiri (~> 1.3)
     yajl-ruby (1.1.0)
@@ -387,7 +387,7 @@ DEPENDENCIES
   binding_of_caller
   bitbucket_rest_api
   campy
-  capistrano
+  capistrano (~> 2.0)
   capybara
   coveralls
   database_cleaner
	@@ -93,7 +93,7 @@ group :development, :test do		@@ -93,7 +93,7 @@ group :development, :test do
93	end	93	end
94		94
95	group :development do	95	group :development do
96	- gem 'capistrano'	96	+ gem 'capistrano', '~> 2.0', :require => false
97		97
98	# better errors	98	# better errors
99	gem 'better_errors'	99	gem 'better_errors'
	@@ -8,16 +8,16 @@ GIT		@@ -8,16 +8,16 @@ GIT
8	GEM	8	GEM
9	remote: https://rubygems.org/	9	remote: https://rubygems.org/
10	specs:	10	specs:
11	- actionmailer (3.2.14)
12	- actionpack (= 3.2.14)	11	+ actionmailer (3.2.15)
		12	+ actionpack (= 3.2.15)
13	mail (~> 2.5.4)	13	mail (~> 2.5.4)
14	actionmailer_inline_css (1.5.3)	14	actionmailer_inline_css (1.5.3)
15	actionmailer (>= 3.0.0)	15	actionmailer (>= 3.0.0)
16	nokogiri (>= 1.4.4)	16	nokogiri (>= 1.4.4)
17	premailer (>= 1.7.1)	17	premailer (>= 1.7.1)
18	- actionpack (3.2.14)
19	- activemodel (= 3.2.14)
20	- activesupport (= 3.2.14)	18	+ actionpack (3.2.15)
		19	+ activemodel (= 3.2.15)
		20	+ activesupport (= 3.2.15)
21	builder (~> 3.0.0)	21	builder (~> 3.0.0)
22	erubis (~> 2.7.0)	22	erubis (~> 2.7.0)
23	journey (~> 1.0.4)	23	journey (~> 1.0.4)
	@@ -25,18 +25,18 @@ GEM		@@ -25,18 +25,18 @@ GEM
25	rack-cache (~> 1.2)	25	rack-cache (~> 1.2)
26	rack-test (~> 0.6.1)	26	rack-test (~> 0.6.1)
27	sprockets (~> 2.2.1)	27	sprockets (~> 2.2.1)
28	- activemodel (3.2.14)
29	- activesupport (= 3.2.14)	28	+ activemodel (3.2.15)
		29	+ activesupport (= 3.2.15)
30	builder (~> 3.0.0)	30	builder (~> 3.0.0)
31	- activerecord (3.2.14)
32	- activemodel (= 3.2.14)
33	- activesupport (= 3.2.14)	31	+ activerecord (3.2.15)
		32	+ activemodel (= 3.2.15)
		33	+ activesupport (= 3.2.15)
34	arel (~> 3.0.2)	34	arel (~> 3.0.2)
35	tzinfo (~> 0.3.29)	35	tzinfo (~> 0.3.29)
36	- activeresource (3.2.14)
37	- activemodel (= 3.2.14)
38	- activesupport (= 3.2.14)
39	- activesupport (3.2.14)	36	+ activeresource (3.2.15)
		37	+ activemodel (= 3.2.15)
		38	+ activesupport (= 3.2.15)
		39	+ activesupport (3.2.15)
40	i18n (~> 0.6, >= 0.6.4)	40	i18n (~> 0.6, >= 0.6.4)
41	multi_json (~> 1.0)	41	multi_json (~> 1.0)
42	addressable (2.3.5)	42	addressable (2.3.5)
	@@ -85,7 +85,7 @@ GEM		@@ -85,7 +85,7 @@ GEM
85	safe_yaml (~> 0.9.0)	85	safe_yaml (~> 0.9.0)
86	css_parser (1.3.5)	86	css_parser (1.3.5)
87	addressable	87	addressable
88	- database_cleaner (1.1.1)	88	+ database_cleaner (1.2.0)
89	debug_inspector (0.0.2)	89	debug_inspector (0.0.2)
90	debugger (1.6.2)	90	debugger (1.6.2)
91	columnize (>= 0.3.1)	91	columnize (>= 0.3.1)
	@@ -106,7 +106,7 @@ GEM		@@ -106,7 +106,7 @@ GEM
106	launchy (~> 2.1)	106	launchy (~> 2.1)
107	mail (~> 2.2)	107	mail (~> 2.2)
108	erubis (2.7.0)	108	erubis (2.7.0)
109	- execjs (2.0.1)	109	+ execjs (2.0.2)
110	fabrication (2.8.1)	110	fabrication (2.8.1)
111	faraday (0.8.8)	111	faraday (0.8.8)
112	multipart-post (~> 1.2.0)	112	multipart-post (~> 1.2.0)
	@@ -134,8 +134,8 @@ GEM		@@ -134,8 +134,8 @@ GEM
134	activesupport	134	activesupport
135	builder	135	builder
136	htmlentities (4.3.1)	136	htmlentities (4.3.1)
137	- httparty (0.11.0)
138	- multi_json (~> 1.0)	137	+ httparty (0.12.0)
		138	+ json (~> 1.8)
139	multi_xml (>= 0.5.2)	139	multi_xml (>= 0.5.2)
140	httpauth (0.2.0)	140	httpauth (0.2.0)
141	i18n (0.6.5)	141	i18n (0.6.5)
	@@ -187,7 +187,7 @@ GEM		@@ -187,7 +187,7 @@ GEM
187	rails (>= 3.2.0)	187	rails (>= 3.2.0)
188	railties (>= 3.2.0)	188	railties (>= 3.2.0)
189	moped (1.5.1)	189	moped (1.5.1)
190	- multi_json (1.8.1)	190	+ multi_json (1.8.2)
191	multi_xml (0.5.5)	191	multi_xml (0.5.5)
192	multipart-post (1.2.0)	192	multipart-post (1.2.0)
193	net-scp (1.1.2)	193	net-scp (1.1.2)
	@@ -199,7 +199,7 @@ GEM		@@ -199,7 +199,7 @@ GEM
199	net-ssh (>= 2.6.5)	199	net-ssh (>= 2.6.5)
200	netrc (0.7.7)	200	netrc (0.7.7)
201	nokogiri (1.5.10)	201	nokogiri (1.5.10)
202	- nokogiri-happymapper (0.5.7)	202	+ nokogiri-happymapper (0.5.8)
203	nokogiri (~> 1.5)	203	nokogiri (~> 1.5)
204	oauth (0.4.7)	204	oauth (0.4.7)
205	oauth2 (0.8.1)	205	oauth2 (0.8.1)
	@@ -264,19 +264,19 @@ GEM		@@ -264,19 +264,19 @@ GEM
264	rack-ssl-enforcer (0.2.6)	264	rack-ssl-enforcer (0.2.6)
265	rack-test (0.6.2)	265	rack-test (0.6.2)
266	rack (>= 1.0)	266	rack (>= 1.0)
267	- rails (3.2.14)
268	- actionmailer (= 3.2.14)
269	- actionpack (= 3.2.14)
270	- activerecord (= 3.2.14)
271	- activeresource (= 3.2.14)
272	- activesupport (= 3.2.14)	267	+ rails (3.2.15)
		268	+ actionmailer (= 3.2.15)
		269	+ actionpack (= 3.2.15)
		270	+ activerecord (= 3.2.15)
		271	+ activeresource (= 3.2.15)
		272	+ activesupport (= 3.2.15)
273	bundler (~> 1.0)	273	bundler (~> 1.0)
274	- railties (= 3.2.14)	274	+ railties (= 3.2.15)
275	rails_autolink (1.1.4)	275	rails_autolink (1.1.4)
276	rails (> 3.1)	276	rails (> 3.1)
277	- railties (3.2.14)
278	- actionpack (= 3.2.14)
279	- activesupport (= 3.2.14)	277	+ railties (3.2.15)
		278	+ actionpack (= 3.2.15)
		279	+ activesupport (= 3.2.15)
280	rack-ssl (~> 1.3.2)	280	rack-ssl (~> 1.3.2)
281	rake (>= 0.8.7)	281	rake (>= 0.8.7)
282	rdoc (~> 3.4)	282	rdoc (~> 3.4)
	@@ -294,10 +294,10 @@ GEM		@@ -294,10 +294,10 @@ GEM
294	rspec-core (~> 2.14.0)	294	rspec-core (~> 2.14.0)
295	rspec-expectations (~> 2.14.0)	295	rspec-expectations (~> 2.14.0)
296	rspec-mocks (~> 2.14.0)	296	rspec-mocks (~> 2.14.0)
297	- rspec-core (2.14.5)	297	+ rspec-core (2.14.6)
298	rspec-expectations (2.14.3)	298	rspec-expectations (2.14.3)
299	diff-lcs (>= 1.1.3, < 2.0)	299	diff-lcs (>= 1.1.3, < 2.0)
300	- rspec-mocks (2.14.3)	300	+ rspec-mocks (2.14.4)
301	rspec-rails (2.14.0)	301	rspec-rails (2.14.0)
302	actionpack (>= 3.0)	302	actionpack (>= 3.0)
303	activesupport (>= 3.0)	303	activesupport (>= 3.0)
	@@ -348,29 +348,29 @@ GEM		@@ -348,29 +348,29 @@ GEM
348	atomic	348	atomic
349	tilt (1.4.1)	349	tilt (1.4.1)
350	timecop (0.6.3)	350	timecop (0.6.3)
351	- tins (0.11.0)	351	+ tins (0.12.0)
352	treetop (1.4.15)	352	treetop (1.4.15)
353	polyglot	353	polyglot
354	polyglot (>= 0.3.1)	354	polyglot (>= 0.3.1)
355	turbo-sprockets-rails3 (0.3.10)	355	turbo-sprockets-rails3 (0.3.10)
356	railties (> 3.2.8, < 4.0.0)	356	railties (> 3.2.8, < 4.0.0)
357	sprockets (>= 2.0.0)	357	sprockets (>= 2.0.0)
358	- tzinfo (0.3.37)	358	+ tzinfo (0.3.38)
359	uglifier (2.2.1)	359	uglifier (2.2.1)
360	execjs (>= 0.3.0)	360	execjs (>= 0.3.0)
361	multi_json (~> 1.0, >= 1.0.2)	361	multi_json (~> 1.0, >= 1.0.2)
362	- underscore-rails (1.5.1)	362	+ underscore-rails (1.5.2)
363	unicorn (4.6.3)	363	unicorn (4.6.3)
364	kgio (~> 2.6)	364	kgio (~> 2.6)
365	rack	365	rack
366	raindrops (~> 0.7)	366	raindrops (~> 0.7)
367	- useragent (0.7.0)	367	+ useragent (0.8.3)
368	warden (1.2.3)	368	warden (1.2.3)
369	rack (>= 1.0)	369	rack (>= 1.0)
370	- webmock (1.13.0)	370	+ webmock (1.15.0)
371	addressable (>= 2.2.7)	371	addressable (>= 2.2.7)
372	crack (>= 0.3.2)	372	crack (>= 0.3.2)
373	- xmpp4r (0.5)	373	+ xmpp4r (0.5.5)
374	xpath (2.0.0)	374	xpath (2.0.0)
375	nokogiri (~> 1.3)	375	nokogiri (~> 1.3)
376	yajl-ruby (1.1.0)	376	yajl-ruby (1.1.0)
	@@ -387,7 +387,7 @@ DEPENDENCIES		@@ -387,7 +387,7 @@ DEPENDENCIES
387	binding_of_caller	387	binding_of_caller
388	bitbucket_rest_api	388	bitbucket_rest_api
389	campy	389	campy
390	- capistrano	390	+ capistrano (~> 2.0)
391	capybara	391	capybara
392	coveralls	392	coveralls
393	database_cleaner	393	database_cleaner