Skip to content

Commit fc22071

Browse files
authored
Merge pull request #907 from codeRIT/develop
Update gems, caching improvements
2 parents 9dc7a4b + 231d455 commit fc22071

38 files changed

Lines changed: 59 additions & 59 deletions

Gemfile.lock

Lines changed: 58 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -1,56 +1,56 @@
11
GEM
22
remote: https://rubygems.org/
33
specs:
4-
actioncable (6.0.3.1)
5-
actionpack (= 6.0.3.1)
4+
actioncable (6.0.3.2)
5+
actionpack (= 6.0.3.2)
66
nio4r (~> 2.0)
77
websocket-driver (>= 0.6.1)
8-
actionmailbox (6.0.3.1)
9-
actionpack (= 6.0.3.1)
10-
activejob (= 6.0.3.1)
11-
activerecord (= 6.0.3.1)
12-
activestorage (= 6.0.3.1)
13-
activesupport (= 6.0.3.1)
8+
actionmailbox (6.0.3.2)
9+
actionpack (= 6.0.3.2)
10+
activejob (= 6.0.3.2)
11+
activerecord (= 6.0.3.2)
12+
activestorage (= 6.0.3.2)
13+
activesupport (= 6.0.3.2)
1414
mail (>= 2.7.1)
15-
actionmailer (6.0.3.1)
16-
actionpack (= 6.0.3.1)
17-
actionview (= 6.0.3.1)
18-
activejob (= 6.0.3.1)
15+
actionmailer (6.0.3.2)
16+
actionpack (= 6.0.3.2)
17+
actionview (= 6.0.3.2)
18+
activejob (= 6.0.3.2)
1919
mail (~> 2.5, >= 2.5.4)
2020
rails-dom-testing (~> 2.0)
21-
actionpack (6.0.3.1)
22-
actionview (= 6.0.3.1)
23-
activesupport (= 6.0.3.1)
21+
actionpack (6.0.3.2)
22+
actionview (= 6.0.3.2)
23+
activesupport (= 6.0.3.2)
2424
rack (~> 2.0, >= 2.0.8)
2525
rack-test (>= 0.6.3)
2626
rails-dom-testing (~> 2.0)
2727
rails-html-sanitizer (~> 1.0, >= 1.2.0)
28-
actiontext (6.0.3.1)
29-
actionpack (= 6.0.3.1)
30-
activerecord (= 6.0.3.1)
31-
activestorage (= 6.0.3.1)
32-
activesupport (= 6.0.3.1)
28+
actiontext (6.0.3.2)
29+
actionpack (= 6.0.3.2)
30+
activerecord (= 6.0.3.2)
31+
activestorage (= 6.0.3.2)
32+
activesupport (= 6.0.3.2)
3333
nokogiri (>= 1.8.5)
34-
actionview (6.0.3.1)
35-
activesupport (= 6.0.3.1)
34+
actionview (6.0.3.2)
35+
activesupport (= 6.0.3.2)
3636
builder (~> 3.1)
3737
erubi (~> 1.4)
3838
rails-dom-testing (~> 2.0)
3939
rails-html-sanitizer (~> 1.1, >= 1.2.0)
40-
activejob (6.0.3.1)
41-
activesupport (= 6.0.3.1)
40+
activejob (6.0.3.2)
41+
activesupport (= 6.0.3.2)
4242
globalid (>= 0.3.6)
43-
activemodel (6.0.3.1)
44-
activesupport (= 6.0.3.1)
45-
activerecord (6.0.3.1)
46-
activemodel (= 6.0.3.1)
47-
activesupport (= 6.0.3.1)
48-
activestorage (6.0.3.1)
49-
actionpack (= 6.0.3.1)
50-
activejob (= 6.0.3.1)
51-
activerecord (= 6.0.3.1)
43+
activemodel (6.0.3.2)
44+
activesupport (= 6.0.3.2)
45+
activerecord (6.0.3.2)
46+
activemodel (= 6.0.3.2)
47+
activesupport (= 6.0.3.2)
48+
activestorage (6.0.3.2)
49+
actionpack (= 6.0.3.2)
50+
activejob (= 6.0.3.2)
51+
activerecord (= 6.0.3.2)
5252
marcel (~> 0.3.1)
53-
activesupport (6.0.3.1)
53+
activesupport (6.0.3.2)
5454
concurrent-ruby (~> 1.0, >= 1.0.2)
5555
i18n (>= 0.7, < 2)
5656
minitest (~> 5.1)
@@ -110,7 +110,7 @@ GEM
110110
listen (3.2.1)
111111
rb-fsevent (~> 0.10, >= 0.10.3)
112112
rb-inotify (~> 0.9, >= 0.9.10)
113-
loofah (2.5.0)
113+
loofah (2.6.0)
114114
crass (~> 1.0.2)
115115
nokogiri (>= 1.5.9)
116116
lumberjack (1.2.5)
@@ -146,23 +146,23 @@ GEM
146146
method_source (~> 1.0)
147147
puma (4.3.5)
148148
nio4r (~> 2.0)
149-
rack (2.2.2)
149+
rack (2.2.3)
150150
rack-test (1.1.0)
151151
rack (>= 1.0, < 3)
152-
rails (6.0.3.1)
153-
actioncable (= 6.0.3.1)
154-
actionmailbox (= 6.0.3.1)
155-
actionmailer (= 6.0.3.1)
156-
actionpack (= 6.0.3.1)
157-
actiontext (= 6.0.3.1)
158-
actionview (= 6.0.3.1)
159-
activejob (= 6.0.3.1)
160-
activemodel (= 6.0.3.1)
161-
activerecord (= 6.0.3.1)
162-
activestorage (= 6.0.3.1)
163-
activesupport (= 6.0.3.1)
152+
rails (6.0.3.2)
153+
actioncable (= 6.0.3.2)
154+
actionmailbox (= 6.0.3.2)
155+
actionmailer (= 6.0.3.2)
156+
actionpack (= 6.0.3.2)
157+
actiontext (= 6.0.3.2)
158+
actionview (= 6.0.3.2)
159+
activejob (= 6.0.3.2)
160+
activemodel (= 6.0.3.2)
161+
activerecord (= 6.0.3.2)
162+
activestorage (= 6.0.3.2)
163+
activesupport (= 6.0.3.2)
164164
bundler (>= 1.3.0)
165-
railties (= 6.0.3.1)
165+
railties (= 6.0.3.2)
166166
sprockets-rails (>= 2.0.0)
167167
rails-controller-testing (1.0.4)
168168
actionpack (>= 5.0.1.x)
@@ -178,9 +178,9 @@ GEM
178178
rails_stdout_logging
179179
rails_serve_static_assets (0.0.5)
180180
rails_stdout_logging (0.0.5)
181-
railties (6.0.3.1)
182-
actionpack (= 6.0.3.1)
183-
activesupport (= 6.0.3.1)
181+
railties (6.0.3.2)
182+
actionpack (= 6.0.3.2)
183+
activesupport (= 6.0.3.2)
184184
method_source
185185
rake (>= 0.8.7)
186186
thor (>= 0.20.3, < 2.0)
@@ -202,12 +202,12 @@ GEM
202202
sprockets-rails (>= 2.0, < 4.0)
203203
tilt (>= 1.1, < 3)
204204
shellany (0.0.1)
205-
shoulda (3.6.0)
206-
shoulda-context (~> 1.0, >= 1.0.1)
207-
shoulda-matchers (~> 3.0)
208-
shoulda-context (1.2.2)
209-
shoulda-matchers (3.1.3)
210-
activesupport (>= 4.0.0)
205+
shoulda (4.0.0)
206+
shoulda-context (~> 2.0)
207+
shoulda-matchers (~> 4.0)
208+
shoulda-context (2.0.0)
209+
shoulda-matchers (4.3.0)
210+
activesupport (>= 4.2.0)
211211
simplecov (0.18.5)
212212
docile (~> 1.1)
213213
simplecov-html (~> 0.11)

config/environments/production.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
# `config.assets.precompile` and `config.assets.version` have moved to config/initializers/assets.rb
3333

3434
# Enable serving of images, stylesheets, and JavaScripts from an asset server.
35-
# config.action_controller.asset_host = 'http://assets.example.com'
35+
config.action_controller.asset_host = ENV['ASSET_HOST']
3636

3737
# Specifies the header that your server uses for sending files.
3838
# config.action_dispatch.x_sendfile_header = 'X-Sendfile' # for Apache
-41.5 KB
Binary file not shown.
41.5 KB
Binary file not shown.
-20.5 KB
Binary file not shown.
20.5 KB
Binary file not shown.
-30 KB
Binary file not shown.
30 KB
Binary file not shown.
-212 KB
Binary file not shown.
212 KB
Binary file not shown.

0 commit comments

Comments
 (0)