Skip to content

Commit 36a82cc

Browse files
committed
Manually edit no-sprockets gemfile:
1 parent f7544d3 commit 36a82cc

11 files changed

+13
-10
lines changed

Appraisals

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,10 @@ appraise "rails-5" do
5959
end
6060

6161
appraise "rails-5-no_sprockets" do
62+
# Appraisal adds `turbolinks` to this gemfile because it is
63+
# present in `./Gemfile`.
64+
# But it causes this gemfile to break, so it must be removed
65+
# from `./gemfiles/rails_5_no_sprockets.gemfile` manually.
6266
gem 'rails', '~> 5.0.0'
6367
end
6468

gemfiles/rails_3.2.gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22

33
source "http://rubygems.org"
44

5-
gem "turbolinks", "~> 2.0"
65
gem "rails", "~> 3.2.21"
76
gem "rack-cache", "~> 1.6.1"
7+
gem "turbolinks", "~> 2.0"
88

99
gemspec :path => "../"

gemfiles/rails_4.0.5.gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
source "http://rubygems.org"
44

5-
gem "turbolinks"
65
gem "rails", "4.0.5"
6+
gem "turbolinks"
77

88
gemspec :path => "../"

gemfiles/rails_4.0_with_therubyracer.gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22

33
source "http://rubygems.org"
44

5-
gem "turbolinks"
65
gem "rails", "~> 4.0.13"
76
gem "therubyracer", "0.12.0", :platform => :mri
7+
gem "turbolinks"
88

99
gemspec :path => "../"

gemfiles/rails_4.1.gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
source "http://rubygems.org"
44

5-
gem "turbolinks", "~> 2.3.0"
65
gem "rails", "~> 4.1.10"
6+
gem "turbolinks", "~> 2.3.0"
77

88
gemspec :path => "../"

gemfiles/rails_4.2_sprockets_2.gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22

33
source "http://rubygems.org"
44

5-
gem "turbolinks"
65
gem "rails", "~> 4.2.1"
76
gem "sprockets", "~> 2.12"
7+
gem "turbolinks"
88

99
gemspec :path => "../"

gemfiles/rails_4.2_sprockets_3.gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22

33
source "http://rubygems.org"
44

5-
gem "turbolinks", "~> 2.5.0"
65
gem "rails", "~> 4.2.1"
76
gem "sprockets", "~> 3.5"
7+
gem "turbolinks", "~> 2.5.0"
88

99
gemspec :path => "../"

gemfiles/rails_4.2_sprockets_4.gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22

33
source "http://rubygems.org"
44

5-
gem "turbolinks", "~> 2.5.0"
65
gem "rails", "~> 4.2.1"
76
gem "sprockets", "~> 4.0.x"
7+
gem "turbolinks", "~> 2.5.0"
88
gem "webpacker", :github => "rails/webpacker"
99
gem "mini_racer"
1010

gemfiles/rails_5.gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22

33
source "http://rubygems.org"
44

5-
gem "turbolinks", "~> 5.0.0"
65
gem "rails", "~> 5.0.0"
6+
gem "turbolinks", "~> 5.0.0"
77
gem "webpacker", :github => "rails/webpacker"
88
gem "therubyracer"
99

gemfiles/rails_5_no_sprockets.gemfile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
source "http://rubygems.org"
44

5-
gem "turbolinks"
65
gem "rails", "~> 5.0.0"
76

87
gemspec :path => "../"

0 commit comments

Comments
 (0)