@@ -9,9 +9,9 @@ end |
||
9 | 9 |
|
10 | 10 |
gem 'bundler', '>= 1.5.0' |
11 | 11 |
|
12 |
-gem 'protected_attributes', '~>1.0.7' |
|
12 |
+gem 'protected_attributes', '~>1.0.8' |
|
13 | 13 |
|
14 |
-gem 'rails', '4.1.1' |
|
14 |
+gem 'rails' , '4.1.4' |
|
15 | 15 |
|
16 | 16 |
case RUBY_PLATFORM |
17 | 17 |
when /freebsd/ |
@@ -22,13 +22,13 @@ else |
||
22 | 22 |
gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw] |
23 | 23 |
end |
24 | 24 |
|
25 |
-gem 'mysql2', '~> 0.3.15' |
|
25 |
+gem 'mysql2', '~> 0.3.16' |
|
26 | 26 |
gem 'devise', '~> 3.2.4' |
27 |
-gem 'kaminari', '~> 0.15.1' |
|
28 |
-gem 'bootstrap-kaminari-views', '~> 0.0.2' |
|
29 |
-gem 'rufus-scheduler', '~> 3.0.7', require: false |
|
27 |
+gem 'kaminari', '~> 0.16.1' |
|
28 |
+gem 'bootstrap-kaminari-views', '~> 0.0.3' |
|
29 |
+gem 'rufus-scheduler', '~> 3.0.8', require: false |
|
30 | 30 |
gem 'json', '~> 1.8.1' |
31 |
-gem 'jsonpath', '~> 0.5.3' |
|
31 |
+gem 'jsonpath', '~> 0.5.6' |
|
32 | 32 |
gem 'twilio-ruby', '~> 3.11.5' |
33 | 33 |
gem 'ruby-growl', '~> 4.1.0' |
34 | 34 |
gem 'liquid', '~> 2.6.1' |
@@ -89,12 +89,12 @@ group :development, :test do |
||
89 | 89 |
gem 'vcr' |
90 | 90 |
gem 'dotenv-rails' |
91 | 91 |
gem 'pry' |
92 |
- gem 'rspec-rails' |
|
93 |
- gem 'rspec' |
|
92 |
+ gem 'rspec-rails', '~> 2.14' |
|
93 |
+ gem 'rspec', '~> 2.14' |
|
94 | 94 |
gem 'shoulda-matchers' |
95 | 95 |
gem 'rr' |
96 | 96 |
gem 'delorean' |
97 |
- gem 'webmock', require: false |
|
97 |
+ gem 'webmock', '~> 1.17.4', require: false |
|
98 | 98 |
gem 'coveralls', require: false |
99 | 99 |
end |
100 | 100 |
|
@@ -12,27 +12,27 @@ GEM |
||
12 | 12 |
remote: https://rubygems.org/ |
13 | 13 |
specs: |
14 | 14 |
ace-rails-ap (2.0.1) |
15 |
- actionmailer (4.1.1) |
|
16 |
- actionpack (= 4.1.1) |
|
17 |
- actionview (= 4.1.1) |
|
15 |
+ actionmailer (4.1.4) |
|
16 |
+ actionpack (= 4.1.4) |
|
17 |
+ actionview (= 4.1.4) |
|
18 | 18 |
mail (~> 2.5.4) |
19 |
- actionpack (4.1.1) |
|
20 |
- actionview (= 4.1.1) |
|
21 |
- activesupport (= 4.1.1) |
|
19 |
+ actionpack (4.1.4) |
|
20 |
+ actionview (= 4.1.4) |
|
21 |
+ activesupport (= 4.1.4) |
|
22 | 22 |
rack (~> 1.5.2) |
23 | 23 |
rack-test (~> 0.6.2) |
24 |
- actionview (4.1.1) |
|
25 |
- activesupport (= 4.1.1) |
|
24 |
+ actionview (4.1.4) |
|
25 |
+ activesupport (= 4.1.4) |
|
26 | 26 |
builder (~> 3.1) |
27 | 27 |
erubis (~> 2.7.0) |
28 |
- activemodel (4.1.1) |
|
29 |
- activesupport (= 4.1.1) |
|
28 |
+ activemodel (4.1.4) |
|
29 |
+ activesupport (= 4.1.4) |
|
30 | 30 |
builder (~> 3.1) |
31 |
- activerecord (4.1.1) |
|
32 |
- activemodel (= 4.1.1) |
|
33 |
- activesupport (= 4.1.1) |
|
31 |
+ activerecord (4.1.4) |
|
32 |
+ activemodel (= 4.1.4) |
|
33 |
+ activesupport (= 4.1.4) |
|
34 | 34 |
arel (~> 5.0.0) |
35 |
- activesupport (4.1.1) |
|
35 |
+ activesupport (4.1.4) |
|
36 | 36 |
i18n (~> 0.6, >= 0.6.9) |
37 | 37 |
json (~> 1.7, >= 1.7.7) |
38 | 38 |
minitest (~> 5.1) |
@@ -75,7 +75,7 @@ GEM |
||
75 | 75 |
safe_yaml (~> 1.0.0) |
76 | 76 |
daemons (1.1.9) |
77 | 77 |
debug_inspector (0.0.2) |
78 |
- delayed_job (4.0.1) |
|
78 |
+ delayed_job (4.0.2) |
|
79 | 79 |
activesupport (>= 3.0, < 4.2) |
80 | 80 |
delayed_job_active_record (4.0.1) |
81 | 81 |
activerecord (>= 3.0, < 4.2) |
@@ -89,7 +89,7 @@ GEM |
||
89 | 89 |
thread_safe (~> 0.1) |
90 | 90 |
warden (~> 1.2.3) |
91 | 91 |
diff-lcs (1.2.5) |
92 |
- docile (1.1.3) |
|
92 |
+ docile (1.1.5) |
|
93 | 93 |
dotenv (0.11.1) |
94 | 94 |
dotenv-deployment (~> 0.0.2) |
95 | 95 |
dotenv-deployment (0.0.2) |
@@ -107,10 +107,10 @@ GEM |
||
107 | 107 |
erector (0.10.0) |
108 | 108 |
treetop (>= 1.2.3) |
109 | 109 |
erubis (2.7.0) |
110 |
- ethon (0.7.0) |
|
110 |
+ ethon (0.7.1) |
|
111 | 111 |
ffi (>= 1.3.0) |
112 | 112 |
eventmachine (1.0.3) |
113 |
- execjs (2.0.2) |
|
113 |
+ execjs (2.2.1) |
|
114 | 114 |
extlib (0.9.16) |
115 | 115 |
faraday (0.9.0) |
116 | 116 |
multipart-post (>= 1.2, < 3) |
@@ -144,22 +144,21 @@ GEM |
||
144 | 144 |
hike (1.2.3) |
145 | 145 |
hipchat (1.2.0) |
146 | 146 |
httparty |
147 |
- http (0.5.0) |
|
147 |
+ http (0.5.1) |
|
148 | 148 |
http_parser.rb |
149 | 149 |
http_parser.rb (0.6.0) |
150 | 150 |
httparty (0.13.1) |
151 | 151 |
json (~> 1.8) |
152 | 152 |
multi_xml (>= 0.5.2) |
153 | 153 |
i18n (0.6.9) |
154 |
- jquery-rails (3.1.0) |
|
154 |
+ jquery-rails (3.1.1) |
|
155 | 155 |
railties (>= 3.0, < 5.0) |
156 | 156 |
thor (>= 0.14, < 2.0) |
157 | 157 |
json (1.8.1) |
158 | 158 |
jsonpath (0.5.6) |
159 | 159 |
multi_json |
160 |
- jwt (0.1.11) |
|
161 |
- multi_json (>= 1.5) |
|
162 |
- kaminari (0.15.1) |
|
160 |
+ jwt (1.0.0) |
|
161 |
+ kaminari (0.16.1) |
|
163 | 162 |
actionpack (>= 3.0.0) |
164 | 163 |
activesupport (>= 3.0.0) |
165 | 164 |
kramdown (1.3.3) |
@@ -177,7 +176,7 @@ GEM |
||
177 | 176 |
method_source (0.8.2) |
178 | 177 |
mime-types (1.25.1) |
179 | 178 |
mini_portile (0.6.0) |
180 |
- minitest (5.3.4) |
|
179 |
+ minitest (5.3.5) |
|
181 | 180 |
mqtt (0.2.0) |
182 | 181 |
multi_json (1.10.1) |
183 | 182 |
multi_xml (0.5.5) |
@@ -186,38 +185,38 @@ GEM |
||
186 | 185 |
naught (1.0.0) |
187 | 186 |
nokogiri (1.6.2.1) |
188 | 187 |
mini_portile (= 0.6.0) |
189 |
- oauth2 (0.9.3) |
|
188 |
+ oauth2 (0.9.4) |
|
190 | 189 |
faraday (>= 0.8, < 0.10) |
191 |
- jwt (~> 0.1.8) |
|
190 |
+ jwt (~> 1.0) |
|
192 | 191 |
multi_json (~> 1.3) |
193 | 192 |
multi_xml (~> 0.5) |
194 | 193 |
rack (~> 1.2) |
195 | 194 |
orm_adapter (0.5.0) |
196 | 195 |
polyglot (0.3.5) |
197 |
- protected_attributes (1.0.7) |
|
196 |
+ protected_attributes (1.0.8) |
|
198 | 197 |
activemodel (>= 4.0.1, < 5.0) |
199 |
- pry (0.9.12.6) |
|
200 |
- coderay (~> 1.0) |
|
201 |
- method_source (~> 0.8) |
|
198 |
+ pry (0.10.0) |
|
199 |
+ coderay (~> 1.1.0) |
|
200 |
+ method_source (~> 0.8.1) |
|
202 | 201 |
slop (~> 3.4) |
203 |
- quiet_assets (1.0.2) |
|
202 |
+ quiet_assets (1.0.3) |
|
204 | 203 |
railties (>= 3.1, < 5.0) |
205 | 204 |
rack (1.5.2) |
206 | 205 |
rack-test (0.6.2) |
207 | 206 |
rack (>= 1.0) |
208 |
- rails (4.1.1) |
|
209 |
- actionmailer (= 4.1.1) |
|
210 |
- actionpack (= 4.1.1) |
|
211 |
- actionview (= 4.1.1) |
|
212 |
- activemodel (= 4.1.1) |
|
213 |
- activerecord (= 4.1.1) |
|
214 |
- activesupport (= 4.1.1) |
|
207 |
+ rails (4.1.4) |
|
208 |
+ actionmailer (= 4.1.4) |
|
209 |
+ actionpack (= 4.1.4) |
|
210 |
+ actionview (= 4.1.4) |
|
211 |
+ activemodel (= 4.1.4) |
|
212 |
+ activerecord (= 4.1.4) |
|
213 |
+ activesupport (= 4.1.4) |
|
215 | 214 |
bundler (>= 1.3.0, < 2.0) |
216 |
- railties (= 4.1.1) |
|
215 |
+ railties (= 4.1.4) |
|
217 | 216 |
sprockets-rails (~> 2.0) |
218 |
- railties (4.1.1) |
|
219 |
- actionpack (= 4.1.1) |
|
220 |
- activesupport (= 4.1.1) |
|
217 |
+ railties (4.1.4) |
|
218 |
+ actionpack (= 4.1.4) |
|
219 |
+ activesupport (= 4.1.4) |
|
221 | 220 |
rake (>= 0.8.7) |
222 | 221 |
thor (>= 0.18.1, < 2.0) |
223 | 222 |
rake (10.3.2) |
@@ -248,7 +247,7 @@ GEM |
||
248 | 247 |
rest-client |
249 | 248 |
ruby-growl (4.1) |
250 | 249 |
uuid (~> 2.3, >= 2.3.5) |
251 |
- rufus-scheduler (3.0.7) |
|
250 |
+ rufus-scheduler (3.0.8) |
|
252 | 251 |
tzinfo |
253 | 252 |
safe_yaml (1.0.3) |
254 | 253 |
sass (3.2.19) |
@@ -259,9 +258,9 @@ GEM |
||
259 | 258 |
sprockets-rails (~> 2.0) |
260 | 259 |
select2-rails (3.5.7) |
261 | 260 |
thor (~> 0.14) |
262 |
- shoulda-matchers (2.6.0) |
|
261 |
+ shoulda-matchers (2.6.1) |
|
263 | 262 |
activesupport (>= 3.0.0) |
264 |
- signet (0.5.0) |
|
263 |
+ signet (0.5.1) |
|
265 | 264 |
addressable (>= 2.2.3) |
266 | 265 |
faraday (>= 0.9.0.rc5) |
267 | 266 |
jwt (>= 0.1.5) |
@@ -292,7 +291,7 @@ GEM |
||
292 | 291 |
thor (0.19.1) |
293 | 292 |
thread_safe (0.3.4) |
294 | 293 |
tilt (1.4.1) |
295 |
- tins (1.1.0) |
|
294 |
+ tins (1.3.0) |
|
296 | 295 |
treetop (1.4.15) |
297 | 296 |
polyglot |
298 | 297 |
polyglot (>= 0.3.1) |
@@ -311,11 +310,11 @@ GEM |
||
311 | 310 |
memoizable (~> 0.4.0) |
312 | 311 |
naught (~> 1.0) |
313 | 312 |
simple_oauth (~> 0.2.0) |
314 |
- typhoeus (0.6.8) |
|
315 |
- ethon (>= 0.7.0) |
|
313 |
+ typhoeus (0.6.9) |
|
314 |
+ ethon (>= 0.7.1) |
|
316 | 315 |
tzinfo (1.2.1) |
317 | 316 |
thread_safe (~> 0.1) |
318 |
- uglifier (2.5.0) |
|
317 |
+ uglifier (2.5.1) |
|
319 | 318 |
execjs (>= 0.3.0) |
320 | 319 |
json (>= 1.8.0) |
321 | 320 |
uuid (2.3.7) |
@@ -345,7 +344,7 @@ DEPENDENCIES |
||
345 | 344 |
ace-rails-ap (~> 2.0.1) |
346 | 345 |
better_errors |
347 | 346 |
binding_of_caller |
348 |
- bootstrap-kaminari-views (~> 0.0.2) |
|
347 |
+ bootstrap-kaminari-views (~> 0.0.3) |
|
349 | 348 |
bundler (>= 1.5.0) |
350 | 349 |
cantino-twitter-stream! |
351 | 350 |
coffee-rails (~> 4.0.0) |
@@ -368,24 +367,24 @@ DEPENDENCIES |
||
368 | 367 |
hipchat (~> 1.2.0) |
369 | 368 |
jquery-rails (~> 3.1.0) |
370 | 369 |
json (~> 1.8.1) |
371 |
- jsonpath (~> 0.5.3) |
|
372 |
- kaminari (~> 0.15.1) |
|
370 |
+ jsonpath (~> 0.5.6) |
|
371 |
+ kaminari (~> 0.16.1) |
|
373 | 372 |
kramdown (~> 1.3.3) |
374 | 373 |
liquid (~> 2.6.1) |
375 | 374 |
mqtt |
376 |
- mysql2 (~> 0.3.15) |
|
375 |
+ mysql2 (~> 0.3.16) |
|
377 | 376 |
nokogiri (~> 1.6.1) |
378 |
- protected_attributes (~> 1.0.7) |
|
377 |
+ protected_attributes (~> 1.0.8) |
|
379 | 378 |
pry |
380 | 379 |
quiet_assets |
381 | 380 |
rack |
382 |
- rails (= 4.1.1) |
|
381 |
+ rails (= 4.1.4) |
|
383 | 382 |
rr |
384 |
- rspec |
|
385 |
- rspec-rails |
|
383 |
+ rspec (~> 2.14) |
|
384 |
+ rspec-rails (~> 2.14) |
|
386 | 385 |
rturk (~> 2.12.1) |
387 | 386 |
ruby-growl (~> 4.1.0) |
388 |
- rufus-scheduler (~> 3.0.7) |
|
387 |
+ rufus-scheduler (~> 3.0.8) |
|
389 | 388 |
sass-rails (~> 4.0.0) |
390 | 389 |
select2-rails (~> 3.5.4) |
391 | 390 |
shoulda-matchers |
@@ -397,7 +396,7 @@ DEPENDENCIES |
||
397 | 396 |
tzinfo-data |
398 | 397 |
uglifier (>= 1.3.0) |
399 | 398 |
vcr |
400 |
- webmock |
|
399 |
+ webmock (~> 1.17.4) |
|
401 | 400 |
weibo_2 (~> 0.1.4) |
402 | 401 |
wunderground (~> 1.2.0) |
403 | 402 |
xmpp4r (~> 0.5.6) |