bundle update. resolves the YAML warning and Mocha deprecation warnings
Albert Sun
共有 2 个文件被更改，包括 41 次插入 和 43 次删除
+ 0
- 1
Gemfile
@@ -3,7 +3,6 @@ source 'https://rubygems.org' |
||
| 3 | 3 |
gem 'rails' |
| 4 | 4 |
gem 'mysql2' |
| 5 | 5 |
gem 'devise' |
| 6 |
-gem 'safe_yaml', '0.8.6' # Required by rails_admin at the moment. |
|
| 7 | 6 |
gem 'rails_admin' |
| 8 | 7 |
gem 'kaminari' |
| 9 | 8 |
gem 'bootstrap-kaminari-views' |
+ 41
- 42
Gemfile.lock
@@ -8,12 +8,12 @@ GIT |
||
| 8 | 8 |
GEM |
| 9 | 9 |
remote: https://rubygems.org/ |
| 10 | 10 |
specs: |
| 11 |
- actionmailer (3.2.12) |
|
| 12 |
- actionpack (= 3.2.12) |
|
| 13 |
- mail (~> 2.4.4) |
|
| 14 |
- actionpack (3.2.12) |
|
| 15 |
- activemodel (= 3.2.12) |
|
| 16 |
- activesupport (= 3.2.12) |
|
| 11 |
+ actionmailer (3.2.13) |
|
| 12 |
+ actionpack (= 3.2.13) |
|
| 13 |
+ mail (~> 2.5.3) |
|
| 14 |
+ actionpack (3.2.13) |
|
| 15 |
+ activemodel (= 3.2.13) |
|
| 16 |
+ activesupport (= 3.2.13) |
|
| 17 | 17 |
builder (~> 3.0.0) |
| 18 | 18 |
erubis (~> 2.7.0) |
| 19 | 19 |
journey (~> 1.0.4) |
@@ -21,19 +21,19 @@ GEM |
||
| 21 | 21 |
rack-cache (~> 1.2) |
| 22 | 22 |
rack-test (~> 0.6.1) |
| 23 | 23 |
sprockets (~> 2.2.1) |
| 24 |
- activemodel (3.2.12) |
|
| 25 |
- activesupport (= 3.2.12) |
|
| 24 |
+ activemodel (3.2.13) |
|
| 25 |
+ activesupport (= 3.2.13) |
|
| 26 | 26 |
builder (~> 3.0.0) |
| 27 |
- activerecord (3.2.12) |
|
| 28 |
- activemodel (= 3.2.12) |
|
| 29 |
- activesupport (= 3.2.12) |
|
| 27 |
+ activerecord (3.2.13) |
|
| 28 |
+ activemodel (= 3.2.13) |
|
| 29 |
+ activesupport (= 3.2.13) |
|
| 30 | 30 |
arel (~> 3.0.2) |
| 31 | 31 |
tzinfo (~> 0.3.29) |
| 32 |
- activeresource (3.2.12) |
|
| 33 |
- activemodel (= 3.2.12) |
|
| 34 |
- activesupport (= 3.2.12) |
|
| 35 |
- activesupport (3.2.12) |
|
| 36 |
- i18n (~> 0.6) |
|
| 32 |
+ activeresource (3.2.13) |
|
| 33 |
+ activemodel (= 3.2.13) |
|
| 34 |
+ activesupport (= 3.2.13) |
|
| 35 |
+ activesupport (3.2.13) |
|
| 36 |
+ i18n (= 0.6.1) |
|
| 37 | 37 |
multi_json (~> 1.0) |
| 38 | 38 |
addressable (2.3.3) |
| 39 | 39 |
arel (3.0.2) |
@@ -41,7 +41,7 @@ GEM |
||
| 41 | 41 |
bootstrap-kaminari-views (0.0.2) |
| 42 | 42 |
kaminari (>= 0.13) |
| 43 | 43 |
rails (>= 3.1) |
| 44 |
- bootstrap-sass (2.3.0.1) |
|
| 44 |
+ bootstrap-sass (2.3.1.0) |
|
| 45 | 45 |
sass (~> 3.2) |
| 46 | 46 |
bourne (1.4.0) |
| 47 | 47 |
mocha (~> 0.13.2) |
@@ -53,7 +53,7 @@ GEM |
||
| 53 | 53 |
coffee-script (2.2.0) |
| 54 | 54 |
coffee-script-source |
| 55 | 55 |
execjs |
| 56 |
- coffee-script-source (1.6.1) |
|
| 56 |
+ coffee-script-source (1.6.2) |
|
| 57 | 57 |
cookiejar (0.3.0) |
| 58 | 58 |
crack (0.3.2) |
| 59 | 59 |
daemons (1.1.9) |
@@ -98,14 +98,14 @@ GEM |
||
| 98 | 98 |
geokit-rails3 (0.1.5) |
| 99 | 99 |
geokit (~> 1.5) |
| 100 | 100 |
rails (~> 3.0) |
| 101 |
- haml (4.0.0) |
|
| 101 |
+ haml (4.0.2) |
|
| 102 | 102 |
tilt |
| 103 | 103 |
hike (1.2.1) |
| 104 | 104 |
http_parser.rb (0.5.3) |
| 105 | 105 |
httparty (0.10.2) |
| 106 | 106 |
multi_json (~> 1.0) |
| 107 | 107 |
multi_xml (>= 0.5.2) |
| 108 |
- i18n (0.6.4) |
|
| 108 |
+ i18n (0.6.1) |
|
| 109 | 109 |
journey (1.0.4) |
| 110 | 110 |
jquery-rails (2.2.1) |
| 111 | 111 |
railties (>= 3.0, < 5.0) |
@@ -120,21 +120,21 @@ GEM |
||
| 120 | 120 |
actionpack (>= 3.0.0) |
| 121 | 121 |
activesupport (>= 3.0.0) |
| 122 | 122 |
kramdown (0.14.2) |
| 123 |
- mail (2.4.4) |
|
| 123 |
+ mail (2.5.3) |
|
| 124 | 124 |
i18n (>= 0.4.0) |
| 125 | 125 |
mime-types (~> 1.16) |
| 126 | 126 |
treetop (~> 1.4.8) |
| 127 | 127 |
metaclass (0.0.1) |
| 128 | 128 |
method_source (0.8.1) |
| 129 |
- mime-types (1.21) |
|
| 129 |
+ mime-types (1.22) |
|
| 130 | 130 |
mocha (0.13.3) |
| 131 | 131 |
metaclass (~> 0.0.1) |
| 132 |
- multi_json (1.6.1) |
|
| 132 |
+ multi_json (1.7.2) |
|
| 133 | 133 |
multi_xml (0.5.3) |
| 134 | 134 |
multipart-post (1.2.0) |
| 135 | 135 |
mysql2 (0.3.11) |
| 136 |
- nested_form (0.3.1) |
|
| 137 |
- nokogiri (1.5.6) |
|
| 136 |
+ nested_form (0.3.2) |
|
| 137 |
+ nokogiri (1.5.9) |
|
| 138 | 138 |
orm_adapter (0.4.0) |
| 139 | 139 |
polyglot (0.3.3) |
| 140 | 140 |
pry (0.9.12) |
@@ -151,15 +151,15 @@ GEM |
||
| 151 | 151 |
rack |
| 152 | 152 |
rack-test (0.6.2) |
| 153 | 153 |
rack (>= 1.0) |
| 154 |
- rails (3.2.12) |
|
| 155 |
- actionmailer (= 3.2.12) |
|
| 156 |
- actionpack (= 3.2.12) |
|
| 157 |
- activerecord (= 3.2.12) |
|
| 158 |
- activeresource (= 3.2.12) |
|
| 159 |
- activesupport (= 3.2.12) |
|
| 154 |
+ rails (3.2.13) |
|
| 155 |
+ actionmailer (= 3.2.13) |
|
| 156 |
+ actionpack (= 3.2.13) |
|
| 157 |
+ activerecord (= 3.2.13) |
|
| 158 |
+ activeresource (= 3.2.13) |
|
| 159 |
+ activesupport (= 3.2.13) |
|
| 160 | 160 |
bundler (~> 1.0) |
| 161 |
- railties (= 3.2.12) |
|
| 162 |
- rails_admin (0.4.5) |
|
| 161 |
+ railties (= 3.2.13) |
|
| 162 |
+ rails_admin (0.4.6) |
|
| 163 | 163 |
bootstrap-sass (~> 2.2) |
| 164 | 164 |
builder (~> 3.0) |
| 165 | 165 |
coffee-rails (~> 3.1) |
@@ -174,14 +174,14 @@ GEM |
||
| 174 | 174 |
remotipart (~> 1.0) |
| 175 | 175 |
safe_yaml (~> 0.6) |
| 176 | 176 |
sass-rails (~> 3.1) |
| 177 |
- railties (3.2.12) |
|
| 178 |
- actionpack (= 3.2.12) |
|
| 179 |
- activesupport (= 3.2.12) |
|
| 177 |
+ railties (3.2.13) |
|
| 178 |
+ actionpack (= 3.2.13) |
|
| 179 |
+ activesupport (= 3.2.13) |
|
| 180 | 180 |
rack-ssl (~> 1.3.2) |
| 181 | 181 |
rake (>= 0.8.7) |
| 182 | 182 |
rdoc (~> 3.4) |
| 183 | 183 |
thor (>= 0.14.6, < 2.0) |
| 184 |
- rake (10.0.3) |
|
| 184 |
+ rake (10.0.4) |
|
| 185 | 185 |
rdoc (3.12.2) |
| 186 | 186 |
json (~> 1.4) |
| 187 | 187 |
remotipart (1.0.5) |
@@ -203,7 +203,7 @@ GEM |
||
| 203 | 203 |
rspec-mocks (~> 2.13.0) |
| 204 | 204 |
rufus-scheduler (2.0.18) |
| 205 | 205 |
tzinfo (>= 0.3.23) |
| 206 |
- safe_yaml (0.8.6) |
|
| 206 |
+ safe_yaml (0.9.0) |
|
| 207 | 207 |
sass (3.2.7) |
| 208 | 208 |
sass-rails (3.2.6) |
| 209 | 209 |
railties (~> 3.2.0) |
@@ -223,8 +223,8 @@ GEM |
||
| 223 | 223 |
rack (~> 1.0) |
| 224 | 224 |
tilt (~> 1.1, != 1.3.0) |
| 225 | 225 |
system_timer (1.2.4) |
| 226 |
- thor (0.17.0) |
|
| 227 |
- tilt (1.3.5) |
|
| 226 |
+ thor (0.18.1) |
|
| 227 |
+ tilt (1.3.6) |
|
| 228 | 228 |
treetop (1.4.12) |
| 229 | 229 |
polyglot |
| 230 | 230 |
polyglot (>= 0.3.1) |
@@ -238,7 +238,7 @@ GEM |
||
| 238 | 238 |
simple_oauth (~> 0.1.4) |
| 239 | 239 |
typhoeus (0.6.2) |
| 240 | 240 |
ethon (~> 0.5.10) |
| 241 |
- tzinfo (0.3.36) |
|
| 241 |
+ tzinfo (0.3.37) |
|
| 242 | 242 |
uglifier (1.3.0) |
| 243 | 243 |
execjs (>= 0.3.0) |
| 244 | 244 |
multi_json (~> 1.0, >= 1.0.2) |
@@ -282,7 +282,6 @@ DEPENDENCIES |
||
| 282 | 282 |
rspec |
| 283 | 283 |
rspec-rails |
| 284 | 284 |
rufus-scheduler |
| 285 |
- safe_yaml (= 0.8.6) |
|
| 286 | 285 |
sass-rails (~> 3.2.3) |
| 287 | 286 |
select2-rails |
| 288 | 287 |
shoulda-matchers |