Skip to content

Commit 9cdf738

Browse files
committed
revert to using a stable rails version
I was getting errors when compiling app on heroku
1 parent 94a8017 commit 9cdf738

File tree

4 files changed

+89
-77
lines changed

4 files changed

+89
-77
lines changed

Gemfile

+2-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@ git_source(:github) { |repo| "https://github.com/#{repo}.git" }
33

44
ruby file: '.ruby-version'
55

6-
gem 'rails', github: 'rails/rails', branch: 'main'
6+
gem 'rails', '7.1.3'
7+
# gem 'rails', github: 'rails/rails', branch: 'main'
78

89
# The original asset pipeline for Rails [https://github.com/rails/sprockets-rails]
910
gem 'sprockets-rails'

Gemfile.lock

+74-74
Original file line numberDiff line numberDiff line change
@@ -1,102 +1,80 @@
1-
GIT
2-
remote: https://github.com/rails/rails.git
3-
revision: e97db3b3957781c781a61fb01265feb2b57688bb
4-
branch: main
1+
GEM
2+
remote: https://rubygems.org/
53
specs:
6-
actioncable (7.2.0.alpha)
7-
actionpack (= 7.2.0.alpha)
8-
activesupport (= 7.2.0.alpha)
4+
actioncable (7.1.3)
5+
actionpack (= 7.1.3)
6+
activesupport (= 7.1.3)
97
nio4r (~> 2.0)
108
websocket-driver (>= 0.6.1)
119
zeitwerk (~> 2.6)
12-
actionmailbox (7.2.0.alpha)
13-
actionpack (= 7.2.0.alpha)
14-
activejob (= 7.2.0.alpha)
15-
activerecord (= 7.2.0.alpha)
16-
activestorage (= 7.2.0.alpha)
17-
activesupport (= 7.2.0.alpha)
18-
mail (>= 2.8.0)
19-
actionmailer (7.2.0.alpha)
20-
actionpack (= 7.2.0.alpha)
21-
actionview (= 7.2.0.alpha)
22-
activejob (= 7.2.0.alpha)
23-
activesupport (= 7.2.0.alpha)
24-
mail (>= 2.8.0)
10+
actionmailbox (7.1.3)
11+
actionpack (= 7.1.3)
12+
activejob (= 7.1.3)
13+
activerecord (= 7.1.3)
14+
activestorage (= 7.1.3)
15+
activesupport (= 7.1.3)
16+
mail (>= 2.7.1)
17+
net-imap
18+
net-pop
19+
net-smtp
20+
actionmailer (7.1.3)
21+
actionpack (= 7.1.3)
22+
actionview (= 7.1.3)
23+
activejob (= 7.1.3)
24+
activesupport (= 7.1.3)
25+
mail (~> 2.5, >= 2.5.4)
26+
net-imap
27+
net-pop
28+
net-smtp
2529
rails-dom-testing (~> 2.2)
26-
actionpack (7.2.0.alpha)
27-
actionview (= 7.2.0.alpha)
28-
activesupport (= 7.2.0.alpha)
30+
actionpack (7.1.3)
31+
actionview (= 7.1.3)
32+
activesupport (= 7.1.3)
2933
nokogiri (>= 1.8.5)
3034
racc
3135
rack (>= 2.2.4)
3236
rack-session (>= 1.0.1)
3337
rack-test (>= 0.6.3)
3438
rails-dom-testing (~> 2.2)
3539
rails-html-sanitizer (~> 1.6)
36-
useragent (~> 0.16)
37-
actiontext (7.2.0.alpha)
38-
actionpack (= 7.2.0.alpha)
39-
activerecord (= 7.2.0.alpha)
40-
activestorage (= 7.2.0.alpha)
41-
activesupport (= 7.2.0.alpha)
40+
actiontext (7.1.3)
41+
actionpack (= 7.1.3)
42+
activerecord (= 7.1.3)
43+
activestorage (= 7.1.3)
44+
activesupport (= 7.1.3)
4245
globalid (>= 0.6.0)
4346
nokogiri (>= 1.8.5)
44-
actionview (7.2.0.alpha)
45-
activesupport (= 7.2.0.alpha)
47+
actionview (7.1.3)
48+
activesupport (= 7.1.3)
4649
builder (~> 3.1)
4750
erubi (~> 1.11)
4851
rails-dom-testing (~> 2.2)
4952
rails-html-sanitizer (~> 1.6)
50-
activejob (7.2.0.alpha)
51-
activesupport (= 7.2.0.alpha)
53+
activejob (7.1.3)
54+
activesupport (= 7.1.3)
5255
globalid (>= 0.3.6)
53-
activemodel (7.2.0.alpha)
54-
activesupport (= 7.2.0.alpha)
55-
activerecord (7.2.0.alpha)
56-
activemodel (= 7.2.0.alpha)
57-
activesupport (= 7.2.0.alpha)
56+
activemodel (7.1.3)
57+
activesupport (= 7.1.3)
58+
activerecord (7.1.3)
59+
activemodel (= 7.1.3)
60+
activesupport (= 7.1.3)
5861
timeout (>= 0.4.0)
59-
activestorage (7.2.0.alpha)
60-
actionpack (= 7.2.0.alpha)
61-
activejob (= 7.2.0.alpha)
62-
activerecord (= 7.2.0.alpha)
63-
activesupport (= 7.2.0.alpha)
62+
activestorage (7.1.3)
63+
actionpack (= 7.1.3)
64+
activejob (= 7.1.3)
65+
activerecord (= 7.1.3)
66+
activesupport (= 7.1.3)
6467
marcel (~> 1.0)
65-
activesupport (7.2.0.alpha)
68+
activesupport (7.1.3)
6669
base64
6770
bigdecimal
6871
concurrent-ruby (~> 1.0, >= 1.0.2)
6972
connection_pool (>= 2.2.5)
7073
drb
7174
i18n (>= 1.6, < 2)
72-
minitest (>= 5.1, < 5.22.0)
73-
tzinfo (~> 2.0, >= 2.0.5)
74-
rails (7.2.0.alpha)
75-
actioncable (= 7.2.0.alpha)
76-
actionmailbox (= 7.2.0.alpha)
77-
actionmailer (= 7.2.0.alpha)
78-
actionpack (= 7.2.0.alpha)
79-
actiontext (= 7.2.0.alpha)
80-
actionview (= 7.2.0.alpha)
81-
activejob (= 7.2.0.alpha)
82-
activemodel (= 7.2.0.alpha)
83-
activerecord (= 7.2.0.alpha)
84-
activestorage (= 7.2.0.alpha)
85-
activesupport (= 7.2.0.alpha)
86-
bundler (>= 1.15.0)
87-
railties (= 7.2.0.alpha)
88-
railties (7.2.0.alpha)
89-
actionpack (= 7.2.0.alpha)
90-
activesupport (= 7.2.0.alpha)
91-
irb (~> 1.13)
92-
rackup (>= 1.0.0)
93-
rake (>= 12.2)
94-
thor (~> 1.0, >= 1.2.2)
95-
zeitwerk (~> 2.6)
96-
97-
GEM
98-
remote: https://rubygems.org/
99-
specs:
75+
minitest (>= 5.1)
76+
mutex_m
77+
tzinfo (~> 2.0)
10078
addressable (2.8.6)
10179
public_suffix (>= 2.0.2, < 6.0)
10280
ast (2.4.2)
@@ -209,6 +187,7 @@ GEM
209187
mini_mime (1.1.5)
210188
minitest (5.21.2)
211189
msgpack (1.7.2)
190+
mutex_m (0.2.0)
212191
net-http (0.4.1)
213192
uri
214193
net-imap (0.4.11)
@@ -251,13 +230,35 @@ GEM
251230
rackup (2.1.0)
252231
rack (>= 3)
253232
webrick (~> 1.8)
233+
rails (7.1.3)
234+
actioncable (= 7.1.3)
235+
actionmailbox (= 7.1.3)
236+
actionmailer (= 7.1.3)
237+
actionpack (= 7.1.3)
238+
actiontext (= 7.1.3)
239+
actionview (= 7.1.3)
240+
activejob (= 7.1.3)
241+
activemodel (= 7.1.3)
242+
activerecord (= 7.1.3)
243+
activestorage (= 7.1.3)
244+
activesupport (= 7.1.3)
245+
bundler (>= 1.15.0)
246+
railties (= 7.1.3)
254247
rails-dom-testing (2.2.0)
255248
activesupport (>= 5.0.0)
256249
minitest
257250
nokogiri (>= 1.6)
258251
rails-html-sanitizer (1.6.0)
259252
loofah (~> 2.21)
260253
nokogiri (~> 1.14)
254+
railties (7.1.3)
255+
actionpack (= 7.1.3)
256+
activesupport (= 7.1.3)
257+
irb
258+
rackup (>= 1.0.0)
259+
rake (>= 12.2)
260+
thor (~> 1.0, >= 1.2.2)
261+
zeitwerk (~> 2.6)
261262
rainbow (3.1.1)
262263
rake (13.2.1)
263264
rdoc (6.6.3.1)
@@ -316,7 +317,6 @@ GEM
316317
concurrent-ruby (~> 1.0)
317318
unicode-display_width (2.5.0)
318319
uri (0.13.0)
319-
useragent (0.16.10)
320320
view_component (3.12.1)
321321
activesupport (>= 5.2.0, < 8.0)
322322
concurrent-ruby (~> 1.0)
@@ -364,7 +364,7 @@ DEPENDENCIES
364364
pg (~> 1.1)
365365
puma
366366
rack-host-redirect
367-
rails!
367+
rails (= 7.1.3)
368368
rubocop-rails
369369
selenium-webdriver
370370
sprockets-rails

app/controllers/pwa_controller.rb

+11
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
class PwaController < ActionController::Base
2+
skip_forgery_protection
3+
4+
def service_worker
5+
render template: "pwa/service-worker", layout: false
6+
end
7+
8+
def manifest
9+
render template: "pwa/manifest", layout: false
10+
end
11+
end

config/routes.rb

+2-2
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,6 @@
3030
get 'u/:user_id/p/:id', to: 'insta_posts#show', as: :insta_user_post
3131

3232
# Render dynamic PWA files from app/views/pwa/*
33-
get "service-worker" => "rails/pwa#service_worker", as: :pwa_service_worker
34-
get "manifest" => "rails/pwa#manifest", as: :pwa_manifest
33+
get "service-worker" => "pwa#service_worker", as: :pwa_service_worker
34+
get "manifest" => "pwa#manifest", as: :pwa_manifest
3535
end

0 commit comments

Comments
 (0)