Skip to content

Commit 03771da

Browse files
committed
降级 Turbolinks 避免用 git 的地址;
1 parent a1cf139 commit 03771da

File tree

4 files changed

+10
-15
lines changed

4 files changed

+10
-15
lines changed

Gemfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ gem 'coffee-rails'
1111
gem 'uglifier'
1212
gem 'jquery-rails'
1313
gem 'jbuilder'
14-
gem 'turbolinks', git: 'https://github.com/turbolinks/turbolinks-classic.git'
14+
gem 'turbolinks', '~> 2.5.3'
1515
gem 'jquery-turbolinks'
1616
gem 'dropzonejs-rails'
1717

@@ -92,7 +92,7 @@ gem 'social-share-button'
9292
gem 'simple_form'
9393

9494
# API
95-
gem 'active_model_serializers', '0.10.0.rc5'
95+
gem 'active_model_serializers'
9696

9797
# Mailer Service
9898
gem 'postmark'

Gemfile.lock

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,6 @@ GIT
88
rack-protection (~> 1.5)
99
tilt (~> 2.0)
1010

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-
1811
GEM
1912
remote: https://gems.ruby-china.org/
2013
specs:
@@ -41,7 +34,7 @@ GEM
4134
erubis (~> 2.7.0)
4235
rails-dom-testing (~> 1.0, >= 1.0.5)
4336
rails-html-sanitizer (~> 1.0, >= 1.0.2)
44-
active_model_serializers (0.10.0.rc5)
37+
active_model_serializers (0.10.0)
4538
actionpack (>= 4.0)
4639
activemodel (>= 4.0)
4740
railties (>= 4.0)
@@ -413,6 +406,8 @@ GEM
413406
thread_safe (0.3.5)
414407
tilt (2.0.4)
415408
tool (0.2.3)
409+
turbolinks (2.5.3)
410+
coffee-rails
416411
tzinfo (1.2.2)
417412
thread_safe (~> 0.1)
418413
uglifier (3.0.0)
@@ -432,7 +427,7 @@ PLATFORMS
432427
ruby
433428

434429
DEPENDENCIES
435-
active_model_serializers (= 0.10.0.rc5)
430+
active_model_serializers
436431
auto-space
437432
better_errors
438433
binding_of_caller
@@ -508,7 +503,7 @@ DEPENDENCIES
508503
spring-commands-rspec
509504
sprockets
510505
status-page
511-
turbolinks!
506+
turbolinks (~> 2.5.3)
512507
uglifier
513508
will_paginate
514509

app/assets/javascripts/app.coffee

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ AppView = Backbone.View.extend
4141

4242
initialize: ->
4343
FormStorage.restore()
44-
Turbolinks.ProgressBar.enable()
44+
Turbolinks.enableProgressBar()
4545
@initForDesktopView()
4646
@initComponents()
4747
@initCable()

app/views/users/_info.html.erb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
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>
33

44
<div class="panel panel-default userinfo">
55
<div class="panel-body">

0 commit comments

Comments
 (0)