Updated gems, fixed issue with flash messages
In rails4 the flash hash keys differentiate between "notice" and :notice, thus we need to typecast the key before comparing it
Dominik Sander
3 changed files with 22 additions and 22 deletions
+ 8
- 8
Gemfile
@@ -3,9 +3,9 @@ source 'https://rubygems.org' |
||
| 3 | 3 |
gem 'protected_attributes', '~>1.0.7' |
| 4 | 4 |
|
| 5 | 5 |
gem 'rails', '4.1.0' |
| 6 |
-gem 'mysql2', '~> 0.3.13' |
|
| 6 |
+gem 'mysql2', '~> 0.3.15' |
|
| 7 | 7 |
gem 'devise', '~> 3.2.4' |
| 8 |
-gem 'kaminari', '~> 0.14.1' |
|
| 8 |
+gem 'kaminari', '~> 0.15.1' |
|
| 9 | 9 |
gem 'bootstrap-kaminari-views', '~> 0.0.2' |
| 10 | 10 |
gem 'rufus-scheduler', '~> 3.0.7', require: false |
| 11 | 11 |
gem 'json', '~> 1.8.1' |
@@ -26,19 +26,19 @@ gem 'sass-rails', '~> 4.0.0' |
||
| 26 | 26 |
gem 'coffee-rails', '~> 4.0.0' |
| 27 | 27 |
gem 'uglifier', '>= 1.3.0' |
| 28 | 28 |
gem 'select2-rails', '~> 3.5.4' |
| 29 |
-gem 'jquery-rails', '~> 3.0.4' |
|
| 29 |
+gem 'jquery-rails', '~> 3.1.0' |
|
| 30 | 30 |
gem 'ace-rails-ap', '~> 2.0.1' |
| 31 | 31 |
|
| 32 | 32 |
# geokit-rails doesn't work with geokit 1.8.X but it specifies ~> 1.5 |
| 33 | 33 |
# in its own Gemfile. |
| 34 |
-gem 'geokit', '~> 1.6.7' |
|
| 35 |
-gem 'geokit-rails', '~> 2.0.0' |
|
| 34 |
+gem 'geokit', '~> 1.8.4' |
|
| 35 |
+gem 'geokit-rails', '~> 2.0.1' |
|
| 36 | 36 |
|
| 37 |
-gem 'kramdown', '~> 1.1.0' |
|
| 37 |
+gem 'kramdown', '~> 1.3.3' |
|
| 38 | 38 |
gem 'typhoeus', '~> 0.6.3' |
| 39 |
-gem 'nokogiri', '~> 1.6.0' |
|
| 39 |
+gem 'nokogiri', '~> 1.6.1' |
|
| 40 | 40 |
|
| 41 |
-gem 'wunderground', '~> 1.1.0' |
|
| 41 |
+gem 'wunderground', '~> 1.2.0' |
|
| 42 | 42 |
gem 'forecast_io', '~> 2.0.0' |
| 43 | 43 |
gem 'rturk', '~> 2.11.0' |
| 44 | 44 |
|
+ 13
- 13
Gemfile.lock
@@ -115,7 +115,7 @@ GEM |
||
| 115 | 115 |
foreman (0.63.0) |
| 116 | 116 |
dotenv (>= 0.7) |
| 117 | 117 |
thor (>= 0.13.6) |
| 118 |
- geokit (1.6.7) |
|
| 118 |
+ geokit (1.8.4) |
|
| 119 | 119 |
multi_json (>= 1.3.2) |
| 120 | 120 |
geokit-rails (2.0.1) |
| 121 | 121 |
geokit (~> 1.5) |
@@ -131,7 +131,7 @@ GEM |
||
| 131 | 131 |
json (~> 1.8) |
| 132 | 132 |
multi_xml (>= 0.5.2) |
| 133 | 133 |
i18n (0.6.9) |
| 134 |
- jquery-rails (3.0.4) |
|
| 134 |
+ jquery-rails (3.1.0) |
|
| 135 | 135 |
railties (>= 3.0, < 5.0) |
| 136 | 136 |
thor (>= 0.14, < 2.0) |
| 137 | 137 |
json (1.8.1) |
@@ -139,10 +139,10 @@ GEM |
||
| 139 | 139 |
multi_json |
| 140 | 140 |
jwt (0.1.11) |
| 141 | 141 |
multi_json (>= 1.5) |
| 142 |
- kaminari (0.14.1) |
|
| 142 |
+ kaminari (0.15.1) |
|
| 143 | 143 |
actionpack (>= 3.0.0) |
| 144 | 144 |
activesupport (>= 3.0.0) |
| 145 |
- kramdown (1.1.0) |
|
| 145 |
+ kramdown (1.3.3) |
|
| 146 | 146 |
libv8 (3.16.14.3) |
| 147 | 147 |
macaddr (1.7.1) |
| 148 | 148 |
systemu (~> 2.6.2) |
@@ -297,7 +297,7 @@ GEM |
||
| 297 | 297 |
multi_json (~> 1) |
| 298 | 298 |
oauth2 (~> 0.9.1) |
| 299 | 299 |
rest-client (~> 1.6.7) |
| 300 |
- wunderground (1.1.0) |
|
| 300 |
+ wunderground (1.2.0) |
|
| 301 | 301 |
addressable |
| 302 | 302 |
httparty (> 0.6.0) |
| 303 | 303 |
json (> 1.4.0) |
@@ -321,16 +321,16 @@ DEPENDENCIES |
||
| 321 | 321 |
em-http-request (~> 1.1.2) |
| 322 | 322 |
forecast_io (~> 2.0.0) |
| 323 | 323 |
foreman (~> 0.63.0) |
| 324 |
- geokit (~> 1.6.7) |
|
| 325 |
- geokit-rails (~> 2.0.0) |
|
| 324 |
+ geokit (~> 1.8.4) |
|
| 325 |
+ geokit-rails (~> 2.0.1) |
|
| 326 | 326 |
hipchat (~> 1.1.0) |
| 327 |
- jquery-rails (~> 3.0.4) |
|
| 327 |
+ jquery-rails (~> 3.1.0) |
|
| 328 | 328 |
json (~> 1.8.1) |
| 329 | 329 |
jsonpath (~> 0.5.3) |
| 330 |
- kaminari (~> 0.14.1) |
|
| 331 |
- kramdown (~> 1.1.0) |
|
| 332 |
- mysql2 (~> 0.3.13) |
|
| 333 |
- nokogiri (~> 1.6.0) |
|
| 330 |
+ kaminari (~> 0.15.1) |
|
| 331 |
+ kramdown (~> 1.3.3) |
|
| 332 |
+ mysql2 (~> 0.3.15) |
|
| 333 |
+ nokogiri (~> 1.6.1) |
|
| 334 | 334 |
protected_attributes (~> 1.0.7) |
| 335 | 335 |
pry |
| 336 | 336 |
rails (= 4.1.0) |
@@ -351,4 +351,4 @@ DEPENDENCIES |
||
| 351 | 351 |
uglifier (>= 1.3.0) |
| 352 | 352 |
webmock |
| 353 | 353 |
weibo_2 (~> 0.1.4) |
| 354 |
- wunderground (~> 1.1.0) |
|
| 354 |
+ wunderground (~> 1.2.0) |
+ 1
- 1
app/views/layouts/_messages.html.erb
@@ -1,7 +1,7 @@ |
||
| 1 | 1 |
<% if flash.keys.length > 0 %> |
| 2 | 2 |
<div class="flash"> |
| 3 | 3 |
<% flash.each do |name, msg| %> |
| 4 |
- <div class="alert alert-<%= name == :notice ? "success" : "error" %>"> |
|
| 4 |
+ <div class="alert alert-<%= name.to_sym == :notice ? "success" : "error" %>"> |
|
| 5 | 5 |
<a class="close" data-dismiss="alert">×</a> |
| 6 | 6 |
<%= content_tag :div, msg, :id => "flash_#{name}" if msg.is_a?(String) %>
|
| 7 | 7 |
</div> |