Download as
Browse Code »

Commit 6f3d9c93b0ef3c8cdaa3c3547b44b78042b68ce5

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

rails updated

Showing 2 changed files with 31 additions and 36 deletions   Show diff stats
Gemfile
  Diff comments   View file @6f3d9c9
1 1 source 'https://rubygems.org'
2 2  
3 3 # Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
4   -gem 'rails', '4.1.5'
  4 +gem 'rails', '4.1.6'
5 5  
6 6 # Use sqlite3 as the database for Active Record
7 7 gem 'sqlite3'
... ...
Gemfile.lock
  Diff comments   View file @6f3d9c9
... ... @@ -11,27 +11,27 @@ GIT
11 11 GEM
12 12 remote: https://rubygems.org/
13 13 specs:
14   - actionmailer (4.1.5)
15   - actionpack (= 4.1.5)
16   - actionview (= 4.1.5)
17   - mail (~> 2.5.4)
18   - actionpack (4.1.5)
19   - actionview (= 4.1.5)
20   - activesupport (= 4.1.5)
  14 + actionmailer (4.1.6)
  15 + actionpack (= 4.1.6)
  16 + actionview (= 4.1.6)
  17 + mail (~> 2.5, >= 2.5.4)
  18 + actionpack (4.1.6)
  19 + actionview (= 4.1.6)
  20 + activesupport (= 4.1.6)
21 21 rack (~> 1.5.2)
22 22 rack-test (~> 0.6.2)
23   - actionview (4.1.5)
24   - activesupport (= 4.1.5)
  23 + actionview (4.1.6)
  24 + activesupport (= 4.1.6)
25 25 builder (~> 3.1)
26 26 erubis (~> 2.7.0)
27   - activemodel (4.1.5)
28   - activesupport (= 4.1.5)
  27 + activemodel (4.1.6)
  28 + activesupport (= 4.1.6)
29 29 builder (~> 3.1)
30   - activerecord (4.1.5)
31   - activemodel (= 4.1.5)
32   - activesupport (= 4.1.5)
  30 + activerecord (4.1.6)
  31 + activemodel (= 4.1.6)
  32 + activesupport (= 4.1.6)
33 33 arel (~> 5.0.0)
34   - activesupport (4.1.5)
  34 + activesupport (4.1.6)
35 35 i18n (~> 0.6, >= 0.6.9)
36 36 json (~> 1.7, >= 1.7.7)
37 37 minitest (~> 5.1)
... ... @@ -146,11 +146,10 @@ GEM
146 146 railties (>= 3.1, < 5)
147 147 sprockets
148 148 libv8 (3.16.14.7)
149   - mail (2.5.4)
150   - mime-types (~> 1.16)
151   - treetop (~> 1.4.8)
  149 + mail (2.6.1)
  150 + mime-types (>= 1.16, < 3)
152 151 metaclass (0.0.4)
153   - mime-types (1.25.1)
  152 + mime-types (2.4.1)
154 153 mini_portile (0.6.0)
155 154 minitest (5.4.2)
156 155 mocha (1.1.0)
... ... @@ -171,23 +170,22 @@ GEM
171 170 cliver (~> 0.3.1)
172 171 multi_json (~> 1.0)
173 172 websocket-driver (>= 0.2.0)
174   - polyglot (0.3.5)
175 173 rack (1.5.2)
176 174 rack-test (0.6.2)
177 175 rack (>= 1.0)
178   - rails (4.1.5)
179   - actionmailer (= 4.1.5)
180   - actionpack (= 4.1.5)
181   - actionview (= 4.1.5)
182   - activemodel (= 4.1.5)
183   - activerecord (= 4.1.5)
184   - activesupport (= 4.1.5)
  176 + rails (4.1.6)
  177 + actionmailer (= 4.1.6)
  178 + actionpack (= 4.1.6)
  179 + actionview (= 4.1.6)
  180 + activemodel (= 4.1.6)
  181 + activerecord (= 4.1.6)
  182 + activesupport (= 4.1.6)
185 183 bundler (>= 1.3.0, < 2.0)
186   - railties (= 4.1.5)
  184 + railties (= 4.1.6)
187 185 sprockets-rails (~> 2.0)
188   - railties (4.1.5)
189   - actionpack (= 4.1.5)
190   - activesupport (= 4.1.5)
  186 + railties (4.1.6)
  187 + actionpack (= 4.1.6)
  188 + activesupport (= 4.1.6)
191 189 rake (>= 0.8.7)
192 190 thor (>= 0.18.1, < 2.0)
193 191 rake (10.3.2)
... ... @@ -255,9 +253,6 @@ GEM
255 253 thread_safe (0.3.4)
256 254 tilt (1.4.1)
257 255 tins (1.3.3)
258   - treetop (1.4.15)
259   - polyglot
260   - polyglot (>= 0.3.1)
261 256 turbolinks (2.4.0)
262 257 coffee-rails
263 258 tzinfo (1.2.2)
... ... @@ -300,7 +295,7 @@ DEPENDENCIES
300 295 mocha
301 296 pg (~> 0.17.0)
302 297 poltergeist (~> 1.5.0)
303   - rails (= 4.1.5)
  298 + rails (= 4.1.6)
304 299 rspec-rails (~> 3.1.0)
305 300 sass-rails (~> 4.0.1)
306 301 sdoc
... ...