File tree Expand file tree Collapse file tree 4 files changed +10
-15
lines changed Expand file tree Collapse file tree 4 files changed +10
-15
lines changed Original file line number Diff line number Diff line change @@ -11,7 +11,7 @@ gem 'coffee-rails'
11
11
gem 'uglifier'
12
12
gem 'jquery-rails'
13
13
gem 'jbuilder'
14
- gem 'turbolinks' , git : 'https://github.com/turbolinks/turbolinks-classic.git '
14
+ gem 'turbolinks' , '~> 2.5.3 '
15
15
gem 'jquery-turbolinks'
16
16
gem 'dropzonejs-rails'
17
17
@@ -92,7 +92,7 @@ gem 'social-share-button'
92
92
gem 'simple_form'
93
93
94
94
# API
95
- gem 'active_model_serializers' , '0.10.0.rc5'
95
+ gem 'active_model_serializers'
96
96
97
97
# Mailer Service
98
98
gem 'postmark'
Original file line number Diff line number Diff line change 8
8
rack-protection (~> 1.5 )
9
9
tilt (~> 2.0 )
10
10
11
- GIT
12
- remote: https://github.com/turbolinks/turbolinks-classic.git
13
- revision: 37a7c296232d20a61bd1946f600da7f2009189db
14
- specs:
15
- turbolinks (3.0.0 )
16
- coffee-rails
17
-
18
11
GEM
19
12
remote: https://gems.ruby-china.org/
20
13
specs:
41
34
erubis (~> 2.7.0 )
42
35
rails-dom-testing (~> 1.0 , >= 1.0.5 )
43
36
rails-html-sanitizer (~> 1.0 , >= 1.0.2 )
44
- active_model_serializers (0.10.0.rc5 )
37
+ active_model_serializers (0.10.0 )
45
38
actionpack (>= 4.0 )
46
39
activemodel (>= 4.0 )
47
40
railties (>= 4.0 )
413
406
thread_safe (0.3.5 )
414
407
tilt (2.0.4 )
415
408
tool (0.2.3 )
409
+ turbolinks (2.5.3 )
410
+ coffee-rails
416
411
tzinfo (1.2.2 )
417
412
thread_safe (~> 0.1 )
418
413
uglifier (3.0.0 )
@@ -432,7 +427,7 @@ PLATFORMS
432
427
ruby
433
428
434
429
DEPENDENCIES
435
- active_model_serializers ( = 0.10.0.rc5 )
430
+ active_model_serializers
436
431
auto-space
437
432
better_errors
438
433
binding_of_caller
@@ -508,7 +503,7 @@ DEPENDENCIES
508
503
spring-commands-rspec
509
504
sprockets
510
505
status-page
511
- turbolinks !
506
+ turbolinks ( ~> 2.5.3 )
512
507
uglifier
513
508
will_paginate
514
509
Original file line number Diff line number Diff line change @@ -41,7 +41,7 @@ AppView = Backbone.View.extend
41
41
42
42
initialize : ->
43
43
FormStorage .restore ()
44
- Turbolinks .ProgressBar . enable ()
44
+ Turbolinks .enableProgressBar ()
45
45
@ initForDesktopView ()
46
46
@ initComponents ()
47
47
@ initCable ()
Original file line number Diff line number Diff line change 1
- < script src ="//ruby-china-files.b0.upaiyun.com/assets/d3.min.js " data-turbolinks-track =" true " type ="text/javascript "> </ script >
2
- < script src ="//ruby-china-files.b0.upaiyun.com/assets/cal-heatmap.min.js " data-turbolinks-track =" true " type ="text/javascript "> </ script >
1
+ < script src ="//ruby-china-files.b0.upaiyun.com/assets/d3.min.js " data-turbolinks-track type ="text/javascript "> </ script >
2
+ < script src ="//ruby-china-files.b0.upaiyun.com/assets/cal-heatmap.min.js " data-turbolinks-track type ="text/javascript "> </ script >
3
3
4
4
< div class ="panel panel-default userinfo ">
5
5
< div class ="panel-body ">
You can’t perform that action at this time.
0 commit comments