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
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.5' 4 +gem 'rails', '4.1.6'
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.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 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.5)  
24 - activesupport (= 4.1.5) 23 + actionview (4.1.6)
  24 + activesupport (= 4.1.6)
25 builder (~> 3.1) 25 builder (~> 3.1)
26 erubis (~> 2.7.0) 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 builder (~> 3.1) 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 arel (~> 5.0.0) 33 arel (~> 5.0.0)
34 - activesupport (4.1.5) 34 + activesupport (4.1.6)
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)
@@ -146,11 +146,10 @@ GEM @@ -146,11 +146,10 @@ GEM
146 railties (>= 3.1, < 5) 146 railties (>= 3.1, < 5)
147 sprockets 147 sprockets
148 libv8 (3.16.14.7) 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 metaclass (0.0.4) 151 metaclass (0.0.4)
153 - mime-types (1.25.1) 152 + mime-types (2.4.1)
154 mini_portile (0.6.0) 153 mini_portile (0.6.0)
155 minitest (5.4.2) 154 minitest (5.4.2)
156 mocha (1.1.0) 155 mocha (1.1.0)
@@ -171,23 +170,22 @@ GEM @@ -171,23 +170,22 @@ GEM
171 cliver (~> 0.3.1) 170 cliver (~> 0.3.1)
172 multi_json (~> 1.0) 171 multi_json (~> 1.0)
173 websocket-driver (>= 0.2.0) 172 websocket-driver (>= 0.2.0)
174 - polyglot (0.3.5)  
175 rack (1.5.2) 173 rack (1.5.2)
176 rack-test (0.6.2) 174 rack-test (0.6.2)
177 rack (>= 1.0) 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 bundler (>= 1.3.0, < 2.0) 183 bundler (>= 1.3.0, < 2.0)
186 - railties (= 4.1.5) 184 + railties (= 4.1.6)
187 sprockets-rails (~> 2.0) 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 rake (>= 0.8.7) 189 rake (>= 0.8.7)
192 thor (>= 0.18.1, < 2.0) 190 thor (>= 0.18.1, < 2.0)
193 rake (10.3.2) 191 rake (10.3.2)
@@ -255,9 +253,6 @@ GEM @@ -255,9 +253,6 @@ GEM
255 thread_safe (0.3.4) 253 thread_safe (0.3.4)
256 tilt (1.4.1) 254 tilt (1.4.1)
257 tins (1.3.3) 255 tins (1.3.3)
258 - treetop (1.4.15)  
259 - polyglot  
260 - polyglot (>= 0.3.1)  
261 turbolinks (2.4.0) 256 turbolinks (2.4.0)
262 coffee-rails 257 coffee-rails
263 tzinfo (1.2.2) 258 tzinfo (1.2.2)
@@ -300,7 +295,7 @@ DEPENDENCIES @@ -300,7 +295,7 @@ DEPENDENCIES
300 mocha 295 mocha
301 pg (~> 0.17.0) 296 pg (~> 0.17.0)
302 poltergeist (~> 1.5.0) 297 poltergeist (~> 1.5.0)
303 - rails (= 4.1.5) 298 + rails (= 4.1.6)
304 rspec-rails (~> 3.1.0) 299 rspec-rails (~> 3.1.0)
305 sass-rails (~> 4.0.1) 300 sass-rails (~> 4.0.1)
306 sdoc 301 sdoc