Download as
Browse Code »

Commit 1a8d353789f876afda18780f1a9bdfa83e3f358f

Authored by Rafael Manzo
1 parent a70e5ca0
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 @1a8d353
1 1 source 'https://rubygems.org'
2 2  
3 3 # Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
4   -gem 'rails', '4.1.6'
  4 +gem 'rails', '4.1.8'
5 5  
6 6 # Use sqlite3 as the database for Active Record
7 7 gem 'sqlite3'
... ...
Gemfile.lock
  Diff comments   View file @1a8d353
... ... @@ -11,27 +11,27 @@ GIT
11 11 GEM
12 12 remote: https://rubygems.org/
13 13 specs:
14   - actionmailer (4.1.6)
15   - actionpack (= 4.1.6)
16   - actionview (= 4.1.6)
  14 + actionmailer (4.1.8)
  15 + actionpack (= 4.1.8)
  16 + actionview (= 4.1.8)
17 17 mail (~> 2.5, >= 2.5.4)
18   - actionpack (4.1.6)
19   - actionview (= 4.1.6)
20   - activesupport (= 4.1.6)
  18 + actionpack (4.1.8)
  19 + actionview (= 4.1.8)
  20 + activesupport (= 4.1.8)
21 21 rack (~> 1.5.2)
22 22 rack-test (~> 0.6.2)
23   - actionview (4.1.6)
24   - activesupport (= 4.1.6)
  23 + actionview (4.1.8)
  24 + activesupport (= 4.1.8)
25 25 builder (~> 3.1)
26 26 erubis (~> 2.7.0)
27   - activemodel (4.1.6)
28   - activesupport (= 4.1.6)
  27 + activemodel (4.1.8)
  28 + activesupport (= 4.1.8)
29 29 builder (~> 3.1)
30   - activerecord (4.1.6)
31   - activemodel (= 4.1.6)
32   - activesupport (= 4.1.6)
  30 + activerecord (4.1.8)
  31 + activemodel (= 4.1.8)
  32 + activesupport (= 4.1.8)
33 33 arel (~> 5.0.0)
34   - activesupport (4.1.6)
  34 + activesupport (4.1.8)
35 35 i18n (~> 0.6, >= 0.6.9)
36 36 json (~> 1.7, >= 1.7.7)
37 37 minitest (~> 5.1)
... ... @@ -175,19 +175,19 @@ GEM
175 175 rack (1.5.2)
176 176 rack-test (0.6.2)
177 177 rack (>= 1.0)
178   - rails (4.1.6)
179   - actionmailer (= 4.1.6)
180   - actionpack (= 4.1.6)
181   - actionview (= 4.1.6)
182   - activemodel (= 4.1.6)
183   - activerecord (= 4.1.6)
184   - activesupport (= 4.1.6)
  178 + rails (4.1.8)
  179 + actionmailer (= 4.1.8)
  180 + actionpack (= 4.1.8)
  181 + actionview (= 4.1.8)
  182 + activemodel (= 4.1.8)
  183 + activerecord (= 4.1.8)
  184 + activesupport (= 4.1.8)
185 185 bundler (>= 1.3.0, < 2.0)
186   - railties (= 4.1.6)
  186 + railties (= 4.1.8)
187 187 sprockets-rails (~> 2.0)
188   - railties (4.1.6)
189   - actionpack (= 4.1.6)
190   - activesupport (= 4.1.6)
  188 + railties (4.1.8)
  189 + actionpack (= 4.1.8)
  190 + activesupport (= 4.1.8)
191 191 rake (>= 0.8.7)
192 192 thor (>= 0.18.1, < 2.0)
193 193 rake (10.4.2)
... ... @@ -297,7 +297,7 @@ DEPENDENCIES
297 297 mocha
298 298 pg (~> 0.17.0)
299 299 poltergeist (~> 1.5.0)
300   - rails (= 4.1.6)
  300 + rails (= 4.1.8)
301 301 rspec-rails (~> 3.1.0)
302 302 sass-rails (~> 4.0.1)
303 303 sdoc
... ...