Download as
Browse Code »

Commit 909f35cf70f7b06d534b965bc6c58aa954590df9

Authored by Rafael Manzo
1 parent ebc5a7d1
Exists in colab and in 4 other branches master, spb-master, spb-stable, stable

Updated to Rails 4.1.2.rc1

Showing 2 changed files with 28 additions and 28 deletions   Show diff stats
1 source 'https://rubygems.org' 1 source 'https://rubygems.org'
2 2
3 # Bundle edge Rails instead: gem 'rails', github: 'rails/rails' 3 # Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
4 -gem 'rails', '4.1.1' 4 +gem 'rails', '4.1.2.rc1'
5 5
6 # Use sqlite3 as the database for Active Record 6 # Use sqlite3 as the database for Active Record
7 gem 'sqlite3' 7 gem 'sqlite3'
@@ -11,27 +11,27 @@ GIT @@ -11,27 +11,27 @@ GIT
11 GEM 11 GEM
12 remote: https://rubygems.org/ 12 remote: https://rubygems.org/
13 specs: 13 specs:
14 - actionmailer (4.1.1)  
15 - actionpack (= 4.1.1)  
16 - actionview (= 4.1.1) 14 + actionmailer (4.1.2.rc1)
  15 + actionpack (= 4.1.2.rc1)
  16 + actionview (= 4.1.2.rc1)
17 mail (~> 2.5.4) 17 mail (~> 2.5.4)
18 - actionpack (4.1.1)  
19 - actionview (= 4.1.1)  
20 - activesupport (= 4.1.1) 18 + actionpack (4.1.2.rc1)
  19 + actionview (= 4.1.2.rc1)
  20 + activesupport (= 4.1.2.rc1)
21 rack (~> 1.5.2) 21 rack (~> 1.5.2)
22 rack-test (~> 0.6.2) 22 rack-test (~> 0.6.2)
23 - actionview (4.1.1)  
24 - activesupport (= 4.1.1) 23 + actionview (4.1.2.rc1)
  24 + activesupport (= 4.1.2.rc1)
25 builder (~> 3.1) 25 builder (~> 3.1)
26 erubis (~> 2.7.0) 26 erubis (~> 2.7.0)
27 - activemodel (4.1.1)  
28 - activesupport (= 4.1.1) 27 + activemodel (4.1.2.rc1)
  28 + activesupport (= 4.1.2.rc1)
29 builder (~> 3.1) 29 builder (~> 3.1)
30 - activerecord (4.1.1)  
31 - activemodel (= 4.1.1)  
32 - activesupport (= 4.1.1) 30 + activerecord (4.1.2.rc1)
  31 + activemodel (= 4.1.2.rc1)
  32 + activesupport (= 4.1.2.rc1)
33 arel (~> 5.0.0) 33 arel (~> 5.0.0)
34 - activesupport (4.1.1) 34 + activesupport (4.1.2.rc1)
35 i18n (~> 0.6, >= 0.6.9) 35 i18n (~> 0.6, >= 0.6.9)
36 json (~> 1.7, >= 1.7.7) 36 json (~> 1.7, >= 1.7.7)
37 minitest (~> 5.1) 37 minitest (~> 5.1)
@@ -168,19 +168,19 @@ GEM @@ -168,19 +168,19 @@ GEM
168 rack (1.5.2) 168 rack (1.5.2)
169 rack-test (0.6.2) 169 rack-test (0.6.2)
170 rack (>= 1.0) 170 rack (>= 1.0)
171 - rails (4.1.1)  
172 - actionmailer (= 4.1.1)  
173 - actionpack (= 4.1.1)  
174 - actionview (= 4.1.1)  
175 - activemodel (= 4.1.1)  
176 - activerecord (= 4.1.1)  
177 - activesupport (= 4.1.1) 171 + rails (4.1.2.rc1)
  172 + actionmailer (= 4.1.2.rc1)
  173 + actionpack (= 4.1.2.rc1)
  174 + actionview (= 4.1.2.rc1)
  175 + activemodel (= 4.1.2.rc1)
  176 + activerecord (= 4.1.2.rc1)
  177 + activesupport (= 4.1.2.rc1)
178 bundler (>= 1.3.0, < 2.0) 178 bundler (>= 1.3.0, < 2.0)
179 - railties (= 4.1.1) 179 + railties (= 4.1.2.rc1)
180 sprockets-rails (~> 2.0) 180 sprockets-rails (~> 2.0)
181 - railties (4.1.1)  
182 - actionpack (= 4.1.1)  
183 - activesupport (= 4.1.1) 181 + railties (4.1.2.rc1)
  182 + actionpack (= 4.1.2.rc1)
  183 + activesupport (= 4.1.2.rc1)
184 rake (>= 0.8.7) 184 rake (>= 0.8.7)
185 thor (>= 0.18.1, < 2.0) 185 thor (>= 0.18.1, < 2.0)
186 rake (10.3.2) 186 rake (10.3.2)
@@ -238,7 +238,7 @@ GEM @@ -238,7 +238,7 @@ GEM
238 libv8 (~> 3.16.14.0) 238 libv8 (~> 3.16.14.0)
239 ref 239 ref
240 thor (0.19.1) 240 thor (0.19.1)
241 - thread_safe (0.3.3) 241 + thread_safe (0.3.4)
242 tilt (1.4.1) 242 tilt (1.4.1)
243 tins (1.3.0) 243 tins (1.3.0)
244 treetop (1.4.15) 244 treetop (1.4.15)
@@ -284,7 +284,7 @@ DEPENDENCIES @@ -284,7 +284,7 @@ DEPENDENCIES
284 mocha 284 mocha
285 pg (~> 0.17.0) 285 pg (~> 0.17.0)
286 poltergeist (~> 1.5.0) 286 poltergeist (~> 1.5.0)
287 - rails (= 4.1.1) 287 + rails (= 4.1.2.rc1)
288 rspec-rails 288 rspec-rails
289 sass-rails (~> 4.0.1) 289 sass-rails (~> 4.0.1)
290 sdoc 290 sdoc