Skip to content

Commit 9a94af1

Browse files
committedOct 12, 2016
update to Rails 5.0
1 parent e35397a commit 9a94af1

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+368
-163
lines changed
 

‎Gemfile

+10-6
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,24 @@
11
source 'https://rubygems.org'
22
ruby '2.3.1'
3-
gem 'rails', '4.2.7.1'
3+
gem 'rails', '~> 5.0.0', '>= 5.0.0.1'
44
gem 'sqlite3'
5+
gem 'puma', '~> 3.0'
56
gem 'sass-rails', '~> 5.0'
67
gem 'uglifier', '>= 1.3.0'
7-
gem 'coffee-rails', '~> 4.1.0'
8+
gem 'coffee-rails', '~> 4.2'
89
gem 'jquery-rails'
9-
gem 'turbolinks'
10-
gem 'jbuilder', '~> 2.0'
10+
gem 'turbolinks', '~> 5'
11+
gem 'jbuilder', '~> 2.5'
1112
group :development, :test do
12-
gem 'byebug'
13+
gem 'byebug', platform: :mri
1314
end
1415
group :development do
15-
gem 'web-console', '~> 2.0'
16+
gem 'web-console'
17+
gem 'listen', '~> 3.0.5'
1618
gem 'spring'
19+
gem 'spring-watcher-listen', '~> 2.0.0'
1720
end
21+
gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby]
1822
gem 'bootstrap-sass'
1923
gem 'gibbon'
2024
gem 'high_voltage'

‎Gemfile.lock

+81-64
Original file line numberDiff line numberDiff line change
@@ -1,57 +1,57 @@
11
GEM
22
remote: https://rubygems.org/
33
specs:
4-
actionmailer (4.2.7.1)
5-
actionpack (= 4.2.7.1)
6-
actionview (= 4.2.7.1)
7-
activejob (= 4.2.7.1)
4+
actioncable (5.0.0.1)
5+
actionpack (= 5.0.0.1)
6+
nio4r (~> 1.2)
7+
websocket-driver (~> 0.6.1)
8+
actionmailer (5.0.0.1)
9+
actionpack (= 5.0.0.1)
10+
actionview (= 5.0.0.1)
11+
activejob (= 5.0.0.1)
812
mail (~> 2.5, >= 2.5.4)
9-
rails-dom-testing (~> 1.0, >= 1.0.5)
10-
actionpack (4.2.7.1)
11-
actionview (= 4.2.7.1)
12-
activesupport (= 4.2.7.1)
13-
rack (~> 1.6)
14-
rack-test (~> 0.6.2)
15-
rails-dom-testing (~> 1.0, >= 1.0.5)
13+
rails-dom-testing (~> 2.0)
14+
actionpack (5.0.0.1)
15+
actionview (= 5.0.0.1)
16+
activesupport (= 5.0.0.1)
17+
rack (~> 2.0)
18+
rack-test (~> 0.6.3)
19+
rails-dom-testing (~> 2.0)
1620
rails-html-sanitizer (~> 1.0, >= 1.0.2)
17-
actionview (4.2.7.1)
18-
activesupport (= 4.2.7.1)
21+
actionview (5.0.0.1)
22+
activesupport (= 5.0.0.1)
1923
builder (~> 3.1)
2024
erubis (~> 2.7.0)
21-
rails-dom-testing (~> 1.0, >= 1.0.5)
25+
rails-dom-testing (~> 2.0)
2226
rails-html-sanitizer (~> 1.0, >= 1.0.2)
23-
activejob (4.2.7.1)
24-
activesupport (= 4.2.7.1)
25-
globalid (>= 0.3.0)
26-
activemodel (4.2.7.1)
27-
activesupport (= 4.2.7.1)
28-
builder (~> 3.1)
29-
activerecord (4.2.7.1)
30-
activemodel (= 4.2.7.1)
31-
activesupport (= 4.2.7.1)
32-
arel (~> 6.0)
33-
activesupport (4.2.7.1)
27+
activejob (5.0.0.1)
28+
activesupport (= 5.0.0.1)
29+
globalid (>= 0.3.6)
30+
activemodel (5.0.0.1)
31+
activesupport (= 5.0.0.1)
32+
activerecord (5.0.0.1)
33+
activemodel (= 5.0.0.1)
34+
activesupport (= 5.0.0.1)
35+
arel (~> 7.0)
36+
activesupport (5.0.0.1)
37+
concurrent-ruby (~> 1.0, >= 1.0.2)
3438
i18n (~> 0.7)
35-
json (~> 1.7, >= 1.7.7)
3639
minitest (~> 5.1)
37-
thread_safe (~> 0.3, >= 0.3.4)
3840
tzinfo (~> 1.1)
3941
addressable (2.4.0)
40-
arel (6.0.3)
42+
arel (7.1.4)
4143
autoprefixer-rails (6.5.0.2)
4244
execjs
4345
better_errors (2.1.1)
4446
coderay (>= 1.0.0)
4547
erubis (>= 2.6.6)
4648
rack (>= 0.9.0)
47-
binding_of_caller (0.7.2)
48-
debug_inspector (>= 0.0.1)
4949
bootstrap-sass (3.3.7)
5050
autoprefixer-rails (>= 5.2.1)
5151
sass (>= 3.3.4)
5252
builder (3.2.2)
5353
byebug (9.0.6)
54-
capybara (2.9.2)
54+
capybara (2.10.1)
5555
addressable
5656
mime-types (>= 1.16)
5757
nokogiri (>= 1.3.3)
@@ -61,9 +61,9 @@ GEM
6161
childprocess (0.5.9)
6262
ffi (~> 1.0, >= 1.0.11)
6363
coderay (1.1.1)
64-
coffee-rails (4.1.1)
64+
coffee-rails (4.2.1)
6565
coffee-script (>= 2.2.0)
66-
railties (>= 4.0.0, < 5.1.x)
66+
railties (>= 4.0.0, < 5.2.x)
6767
coffee-script (2.4.1)
6868
coffee-script-source
6969
execjs
@@ -98,51 +98,58 @@ GEM
9898
rails-dom-testing (>= 1, < 3)
9999
railties (>= 4.2.0)
100100
thor (>= 0.14, < 2.0)
101-
json (1.8.3)
102101
launchy (2.4.3)
103102
addressable (~> 2.3)
103+
listen (3.0.8)
104+
rb-fsevent (~> 0.9, >= 0.9.4)
105+
rb-inotify (~> 0.9, >= 0.9.7)
104106
loofah (2.0.3)
105107
nokogiri (>= 1.5.9)
106108
mail (2.6.4)
107109
mime-types (>= 1.16, < 4)
110+
method_source (0.8.2)
108111
mime-types (3.1)
109112
mime-types-data (~> 3.2015)
110113
mime-types-data (3.2016.0521)
111114
mini_portile2 (2.1.0)
112115
minitest (5.9.1)
113116
multi_json (1.12.1)
114117
multipart-post (2.0.0)
118+
nio4r (1.2.1)
115119
nokogiri (1.6.8.1)
116120
mini_portile2 (~> 2.1.0)
117-
rack (1.6.4)
121+
puma (3.6.0)
122+
rack (2.0.1)
118123
rack-test (0.6.3)
119124
rack (>= 1.0)
120-
rails (4.2.7.1)
121-
actionmailer (= 4.2.7.1)
122-
actionpack (= 4.2.7.1)
123-
actionview (= 4.2.7.1)
124-
activejob (= 4.2.7.1)
125-
activemodel (= 4.2.7.1)
126-
activerecord (= 4.2.7.1)
127-
activesupport (= 4.2.7.1)
125+
rails (5.0.0.1)
126+
actioncable (= 5.0.0.1)
127+
actionmailer (= 5.0.0.1)
128+
actionpack (= 5.0.0.1)
129+
actionview (= 5.0.0.1)
130+
activejob (= 5.0.0.1)
131+
activemodel (= 5.0.0.1)
132+
activerecord (= 5.0.0.1)
133+
activesupport (= 5.0.0.1)
128134
bundler (>= 1.3.0, < 2.0)
129-
railties (= 4.2.7.1)
130-
sprockets-rails
131-
rails-deprecated_sanitizer (1.0.3)
132-
activesupport (>= 4.2.0.alpha)
133-
rails-dom-testing (1.0.7)
134-
activesupport (>= 4.2.0.beta, < 5.0)
135+
railties (= 5.0.0.1)
136+
sprockets-rails (>= 2.0.0)
137+
rails-dom-testing (2.0.1)
138+
activesupport (>= 4.2.0, < 6.0)
135139
nokogiri (~> 1.6.0)
136-
rails-deprecated_sanitizer (>= 1.0.1)
137140
rails-html-sanitizer (1.0.3)
138141
loofah (~> 2.0)
139142
rails_layout (1.0.31)
140-
railties (4.2.7.1)
141-
actionpack (= 4.2.7.1)
142-
activesupport (= 4.2.7.1)
143+
railties (5.0.0.1)
144+
actionpack (= 5.0.0.1)
145+
activesupport (= 5.0.0.1)
146+
method_source
143147
rake (>= 0.8.7)
144148
thor (>= 0.18.1, < 2.0)
145149
rake (11.3.0)
150+
rb-fsevent (0.9.7)
151+
rb-inotify (0.9.7)
152+
ffi (>= 0.5.0)
146153
rspec-core (3.5.4)
147154
rspec-support (~> 3.5.0)
148155
rspec-expectations (3.5.0)
@@ -179,14 +186,17 @@ GEM
179186
activesupport (>= 4.2)
180187
spring-commands-rspec (1.0.4)
181188
spring (>= 0.9.1)
189+
spring-watcher-listen (2.0.1)
190+
listen (>= 2.7, < 4.0)
191+
spring (>= 1.2, < 3.0)
182192
sprockets (3.7.0)
183193
concurrent-ruby (~> 1.0)
184194
rack (> 1, < 3)
185195
sprockets-rails (3.2.0)
186196
actionpack (>= 4.0)
187197
activesupport (>= 4.0)
188198
sprockets (>= 3.0.0)
189-
sqlite3 (1.3.11)
199+
sqlite3 (1.3.12)
190200
sucker_punch (2.0.2)
191201
concurrent-ruby (~> 1.0.0)
192202
thor (0.19.1)
@@ -199,12 +209,15 @@ GEM
199209
thread_safe (~> 0.1)
200210
uglifier (3.0.2)
201211
execjs (>= 0.3.0, < 3)
202-
web-console (2.3.0)
203-
activemodel (>= 4.0)
204-
binding_of_caller (>= 0.7.2)
205-
railties (>= 4.0)
206-
sprockets-rails (>= 2.0, < 4.0)
212+
web-console (3.3.1)
213+
actionview (>= 5.0)
214+
activemodel (>= 5.0)
215+
debug_inspector
216+
railties (>= 5.0)
207217
websocket (1.2.3)
218+
websocket-driver (0.6.4)
219+
websocket-extensions (>= 0.1.0)
220+
websocket-extensions (0.1.2)
208221
xpath (2.0.0)
209222
nokogiri (~> 1.3)
210223

@@ -216,28 +229,32 @@ DEPENDENCIES
216229
bootstrap-sass
217230
byebug
218231
capybara
219-
coffee-rails (~> 4.1.0)
232+
coffee-rails (~> 4.2)
220233
database_cleaner
221234
factory_girl_rails
222235
faker
223236
gibbon
224237
high_voltage
225-
jbuilder (~> 2.0)
238+
jbuilder (~> 2.5)
226239
jquery-rails
227240
launchy
228-
rails (= 4.2.7.1)
241+
listen (~> 3.0.5)
242+
puma (~> 3.0)
243+
rails (~> 5.0.0, >= 5.0.0.1)
229244
rails_layout
230245
rspec-rails
231246
sass-rails (~> 5.0)
232247
selenium-webdriver
233248
simple_form
234249
spring
235250
spring-commands-rspec
251+
spring-watcher-listen (~> 2.0.0)
236252
sqlite3
237253
sucker_punch
238-
turbolinks
254+
turbolinks (~> 5)
255+
tzinfo-data
239256
uglifier (>= 1.3.0)
240-
web-console (~> 2.0)
257+
web-console
241258

242259
RUBY VERSION
243260
ruby 2.3.1p112

0 commit comments

Comments
 (0)
Please sign in to comment.