Download as
Browse Code »

Commit 32d15cd50e6e2bbc69baadc729eef0132fef11ec

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

Rails updated

Showing 2 changed files with 22 additions and 22 deletions   Show diff stats
Gemfile
  Diff comments   View file @32d15cd
1 1 source 'https://rubygems.org'
2 2  
3 3 # Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
4   -gem 'rails', '4.0.3'
  4 +gem 'rails', '4.0.4'
5 5  
6 6 # Use sqlite3 as the database for Active Record
7 7 gem 'sqlite3'
... ...
Gemfile.lock
  Diff comments   View file @32d15cd
1 1 GEM
2 2 remote: https://rubygems.org/
3 3 specs:
4   - actionmailer (4.0.3)
5   - actionpack (= 4.0.3)
  4 + actionmailer (4.0.4)
  5 + actionpack (= 4.0.4)
6 6 mail (~> 2.5.4)
7   - actionpack (4.0.3)
8   - activesupport (= 4.0.3)
  7 + actionpack (4.0.4)
  8 + activesupport (= 4.0.4)
9 9 builder (~> 3.1.0)
10 10 erubis (~> 2.7.0)
11 11 rack (~> 1.5.2)
12 12 rack-test (~> 0.6.2)
13   - activemodel (4.0.3)
14   - activesupport (= 4.0.3)
  13 + activemodel (4.0.4)
  14 + activesupport (= 4.0.4)
15 15 builder (~> 3.1.0)
16   - activerecord (4.0.3)
17   - activemodel (= 4.0.3)
  16 + activerecord (4.0.4)
  17 + activemodel (= 4.0.4)
18 18 activerecord-deprecated_finders (~> 1.0.2)
19   - activesupport (= 4.0.3)
  19 + activesupport (= 4.0.4)
20 20 arel (~> 4.0.0)
21 21 activerecord-deprecated_finders (1.0.3)
22   - activesupport (4.0.3)
23   - i18n (~> 0.6, >= 0.6.4)
  22 + activesupport (4.0.4)
  23 + i18n (~> 0.6, >= 0.6.9)
24 24 minitest (~> 4.2)
25 25 multi_json (~> 1.3)
26 26 thread_safe (~> 0.1)
... ... @@ -160,17 +160,17 @@ GEM
160 160 rack (1.5.2)
161 161 rack-test (0.6.2)
162 162 rack (>= 1.0)
163   - rails (4.0.3)
164   - actionmailer (= 4.0.3)
165   - actionpack (= 4.0.3)
166   - activerecord (= 4.0.3)
167   - activesupport (= 4.0.3)
  163 + rails (4.0.4)
  164 + actionmailer (= 4.0.4)
  165 + actionpack (= 4.0.4)
  166 + activerecord (= 4.0.4)
  167 + activesupport (= 4.0.4)
168 168 bundler (>= 1.3.0, < 2.0)
169   - railties (= 4.0.3)
  169 + railties (= 4.0.4)
170 170 sprockets-rails (~> 2.0.0)
171   - railties (4.0.3)
172   - actionpack (= 4.0.3)
173   - activesupport (= 4.0.3)
  171 + railties (4.0.4)
  172 + actionpack (= 4.0.4)
  173 + activesupport (= 4.0.4)
174 174 rake (>= 0.8.7)
175 175 thor (>= 0.18.1, < 2.0)
176 176 rake (10.1.1)
... ... @@ -291,7 +291,7 @@ DEPENDENCIES
291 291 modernizr-rails
292 292 pg (~> 0.17.0)
293 293 poltergeist (~> 1.5.0)
294   - rails (= 4.0.3)
  294 + rails (= 4.0.4)
295 295 rspec-rails
296 296 sass-rails (~> 4.0.1)
297 297 sdoc
... ...