Download as
Browse Code »

Commit 184fd35de7149fa14bc2109a4fdaba09bb9b58a2

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

rails updated

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