Skip to content

Commit b7d320d

Browse files
hlcfanhlcfan
authored
Merge pull request #301 from hlcfan/switch-to-uuid
Switch to UUID
2 parents e1441cc + 6e884ad commit b7d320d

Some content is hidden

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

53 files changed

+770
-416
lines changed

‎.gitignore‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,4 +36,6 @@ active_record_log_subscriber.rb
3636
/public/webpack
3737
/public/packs-test
3838

39+
config/master.key
40+
3941
.gitattributes

‎.travis.yml‎

Lines changed: 8 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -4,35 +4,25 @@ env:
44
- USE_OFFICIAL_GEM_SOURCE=1
55
- COVERAGE=true
66
- RAILS_ENV=test
7-
- CXX=g++-4.9
8-
- PGPORT=5433
9-
10-
addons:
11-
postgresql: "10"
12-
apt:
13-
packages:
14-
- postgresql-10
15-
- postgresql-client-10
7+
- PGPORT=5432
8+
- PGUSER=travis
169

1710
services:
1811
- redis-server
1912

2013
rvm:
21-
- 2.5.1
22-
- 2.6.4
14+
- 2.6.6
15+
- 2.7.2
2316

2417
sudo: true
25-
dist: trusty
18+
dist: bionic
2619

2720
addons:
2821
postgresql: "10"
2922
apt:
30-
sources:
31-
- ubuntu-toolchain-r-test
3223
packages:
33-
- g++-4.9
34-
- postgresql-10
3524
- postgresql-client-10
25+
- postgresql-contrib-10
3626

3727
before_install:
3828
- sudo sed -i -e '/local.*peer/s/postgres/all/' -e 's/peer\|md5/trust/g' /etc/postgresql/*/main/pg_hba.conf
@@ -42,8 +32,8 @@ before_install:
4232

4333
install:
4434
- bundle install
45-
- nvm install 12.10.0 && nvm alias default 12.10.0
46-
- npm install -g npm@6.10.x
35+
- nvm install 14.15.0 && nvm alias default 14.15.0
36+
- npm install -g npm@6.14.x
4737
- npm install -g yarn
4838
- node --version
4939
- npm --version

‎Gemfile‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,9 @@ gem 'uglifier', '>= 1.3.0'
1111
# Use CoffeeScript for .coffee assets and views
1212
gem 'coffee-rails', '~> 5.0.0'
1313
# See https://github.com/rails/execjs#readme for more supported runtimes
14-
gem 'mini_racer', platforms: :ruby
14+
# gem 'mini_racer', git: 'https://github.com/rubyjs/mini_racer', platforms: :ruby
15+
16+
gem 'mini_racer', github: 'rubyjs/mini_racer', branch: 'refs/pull/186/head'
1517

1618
gem 'marked-rails'
1719
gem 'font-awesome-rails', github: "bokmann/font-awesome-rails", branch: "master" #'~> 4.7.0.6'
@@ -28,7 +30,6 @@ gem 'omniauth-facebook'
2830
gem 'omniauth-github'
2931
gem 'omniauth-google-oauth2'
3032
gem 'redis'
31-
gem 'logster'
3233
gem 'http_accept_language'
3334

3435
# Use jquery as the JavaScript library
@@ -52,6 +53,7 @@ gem 'pg_search'
5253
gem 'rubyzip', '~> 1.3.0'
5354
gem 'axlsx', '3.0.0.pre'
5455
gem 'axlsx_rails'
56+
gem 'logster'
5557

5658
# Disable for error:
5759
# Rack app error handling request { POST /mini-profiler-resources/results }
@@ -65,7 +67,7 @@ gem 'axlsx_rails'
6567
# gem 'bcrypt', '~> 3.1.7'
6668

6769
group :development, :test do
68-
gem 'rspec-rails', '~> 4.0.0.beta2'
70+
gem 'rspec-rails', '~> 5.0.1'
6971
gem "pry"
7072
gem 'pry-doc'
7173
gem 'pry-nav'

‎Gemfile.lock‎

Lines changed: 91 additions & 82 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,14 @@ GIT
1313
awesome_nested_fields (0.6.5)
1414
rails (> 3.0.0)
1515

16+
GIT
17+
remote: https://github.com/rubyjs/mini_racer.git
18+
revision: b0b35eef0cdc1bd0871b4c5e5bf8163e3056d69d
19+
branch: refs/pull/186/head
20+
specs:
21+
mini_racer (0.3.1)
22+
libv8-node (~> 15.5.1.0.beta1)
23+
1624
GIT
1725
remote: https://github.com/seuros/capistrano-puma.git
1826
revision: d4ac7b9950ddc53835f661c7761ad3e904c48c65
@@ -25,60 +33,60 @@ GIT
2533
GEM
2634
remote: https://rubygems.org/
2735
specs:
28-
actioncable (6.1.0)
29-
actionpack (= 6.1.0)
30-
activesupport (= 6.1.0)
36+
actioncable (6.1.3.1)
37+
actionpack (= 6.1.3.1)
38+
activesupport (= 6.1.3.1)
3139
nio4r (~> 2.0)
3240
websocket-driver (>= 0.6.1)
33-
actionmailbox (6.1.0)
34-
actionpack (= 6.1.0)
35-
activejob (= 6.1.0)
36-
activerecord (= 6.1.0)
37-
activestorage (= 6.1.0)
38-
activesupport (= 6.1.0)
41+
actionmailbox (6.1.3.1)
42+
actionpack (= 6.1.3.1)
43+
activejob (= 6.1.3.1)
44+
activerecord (= 6.1.3.1)
45+
activestorage (= 6.1.3.1)
46+
activesupport (= 6.1.3.1)
3947
mail (>= 2.7.1)
40-
actionmailer (6.1.0)
41-
actionpack (= 6.1.0)
42-
actionview (= 6.1.0)
43-
activejob (= 6.1.0)
44-
activesupport (= 6.1.0)
48+
actionmailer (6.1.3.1)
49+
actionpack (= 6.1.3.1)
50+
actionview (= 6.1.3.1)
51+
activejob (= 6.1.3.1)
52+
activesupport (= 6.1.3.1)
4553
mail (~> 2.5, >= 2.5.4)
4654
rails-dom-testing (~> 2.0)
47-
actionpack (6.1.0)
48-
actionview (= 6.1.0)
49-
activesupport (= 6.1.0)
55+
actionpack (6.1.3.1)
56+
actionview (= 6.1.3.1)
57+
activesupport (= 6.1.3.1)
5058
rack (~> 2.0, >= 2.0.9)
5159
rack-test (>= 0.6.3)
5260
rails-dom-testing (~> 2.0)
5361
rails-html-sanitizer (~> 1.0, >= 1.2.0)
54-
actiontext (6.1.0)
55-
actionpack (= 6.1.0)
56-
activerecord (= 6.1.0)
57-
activestorage (= 6.1.0)
58-
activesupport (= 6.1.0)
62+
actiontext (6.1.3.1)
63+
actionpack (= 6.1.3.1)
64+
activerecord (= 6.1.3.1)
65+
activestorage (= 6.1.3.1)
66+
activesupport (= 6.1.3.1)
5967
nokogiri (>= 1.8.5)
60-
actionview (6.1.0)
61-
activesupport (= 6.1.0)
68+
actionview (6.1.3.1)
69+
activesupport (= 6.1.3.1)
6270
builder (~> 3.1)
6371
erubi (~> 1.4)
6472
rails-dom-testing (~> 2.0)
6573
rails-html-sanitizer (~> 1.1, >= 1.2.0)
66-
activejob (6.1.0)
67-
activesupport (= 6.1.0)
74+
activejob (6.1.3.1)
75+
activesupport (= 6.1.3.1)
6876
globalid (>= 0.3.6)
69-
activemodel (6.1.0)
70-
activesupport (= 6.1.0)
71-
activerecord (6.1.0)
72-
activemodel (= 6.1.0)
73-
activesupport (= 6.1.0)
74-
activestorage (6.1.0)
75-
actionpack (= 6.1.0)
76-
activejob (= 6.1.0)
77-
activerecord (= 6.1.0)
78-
activesupport (= 6.1.0)
79-
marcel (~> 0.3.1)
80-
mimemagic (~> 0.3.2)
81-
activesupport (6.1.0)
77+
activemodel (6.1.3.1)
78+
activesupport (= 6.1.3.1)
79+
activerecord (6.1.3.1)
80+
activemodel (= 6.1.3.1)
81+
activesupport (= 6.1.3.1)
82+
activestorage (6.1.3.1)
83+
actionpack (= 6.1.3.1)
84+
activejob (= 6.1.3.1)
85+
activerecord (= 6.1.3.1)
86+
activesupport (= 6.1.3.1)
87+
marcel (~> 1.0.0)
88+
mini_mime (~> 1.0.2)
89+
activesupport (6.1.3.1)
8290
concurrent-ruby (~> 1.0, >= 1.0.2)
8391
i18n (>= 1.6, < 2)
8492
minitest (>= 5.1)
@@ -131,7 +139,7 @@ GEM
131139
coffee-script-source
132140
execjs
133141
coffee-script-source (1.12.2)
134-
concurrent-ruby (1.1.7)
142+
concurrent-ruby (1.1.8)
135143
connection_pool (2.2.3)
136144
crass (1.0.6)
137145
devise (4.7.3)
@@ -153,7 +161,7 @@ GEM
153161
hashie (4.1.0)
154162
htmlentities (4.3.4)
155163
http_accept_language (2.1.1)
156-
i18n (1.8.5)
164+
i18n (1.8.9)
157165
concurrent-ruby (~> 1.0)
158166
jbuilder (2.10.1)
159167
activesupport (>= 5.0.0)
@@ -167,35 +175,35 @@ GEM
167175
letter_avatar (0.3.8)
168176
letter_opener (1.7.0)
169177
launchy (~> 2.2)
170-
libv8 (8.4.255.0)
171-
logster (2.9.4)
172-
loofah (2.8.0)
178+
libv8-node (15.5.1.0.beta1)
179+
logster (2.9.6)
180+
loofah (2.9.0)
173181
crass (~> 1.0.2)
174182
nokogiri (>= 1.5.9)
175183
mail (2.7.1)
176184
mini_mime (>= 0.1.1)
177-
marcel (0.3.3)
178-
mimemagic (~> 0.3.2)
185+
marcel (1.0.0)
179186
marked-rails (0.3.2.0)
180187
method_source (0.9.2)
181188
mime-types (3.3.1)
182189
mime-types-data (~> 3.2015)
183190
mime-types-data (3.2020.1104)
184-
mimemagic (0.3.5)
185-
mini_mime (1.0.2)
186-
mini_portile2 (2.4.0)
187-
mini_racer (0.3.1)
188-
libv8 (~> 8.4.255)
189-
minitest (5.14.2)
191+
mimemagic (0.3.10)
192+
nokogiri (~> 1)
193+
rake
194+
mini_mime (1.0.3)
195+
mini_portile2 (2.5.0)
196+
minitest (5.14.4)
190197
multi_json (1.15.0)
191198
multi_xml (0.6.0)
192199
multipart-post (2.1.1)
193200
net-scp (3.0.0)
194201
net-ssh (>= 2.6.5, < 7.0.0)
195202
net-ssh (6.1.0)
196-
nio4r (2.5.4)
197-
nokogiri (1.10.10)
198-
mini_portile2 (~> 2.4.0)
203+
nio4r (2.5.7)
204+
nokogiri (1.11.2)
205+
mini_portile2 (~> 2.5.0)
206+
racc (~> 1.4)
199207
oauth (0.5.4)
200208
oauth2 (1.4.4)
201209
faraday (>= 0.8, < 2.0)
@@ -252,25 +260,26 @@ GEM
252260
public_suffix (4.0.6)
253261
puma (5.1.1)
254262
nio4r (~> 2.0)
263+
racc (1.5.2)
255264
rack (2.2.3)
256265
rack-proxy (0.6.5)
257266
rack
258267
rack-test (1.1.0)
259268
rack (>= 1.0, < 3)
260-
rails (6.1.0)
261-
actioncable (= 6.1.0)
262-
actionmailbox (= 6.1.0)
263-
actionmailer (= 6.1.0)
264-
actionpack (= 6.1.0)
265-
actiontext (= 6.1.0)
266-
actionview (= 6.1.0)
267-
activejob (= 6.1.0)
268-
activemodel (= 6.1.0)
269-
activerecord (= 6.1.0)
270-
activestorage (= 6.1.0)
271-
activesupport (= 6.1.0)
269+
rails (6.1.3.1)
270+
actioncable (= 6.1.3.1)
271+
actionmailbox (= 6.1.3.1)
272+
actionmailer (= 6.1.3.1)
273+
actionpack (= 6.1.3.1)
274+
actiontext (= 6.1.3.1)
275+
actionview (= 6.1.3.1)
276+
activejob (= 6.1.3.1)
277+
activemodel (= 6.1.3.1)
278+
activerecord (= 6.1.3.1)
279+
activestorage (= 6.1.3.1)
280+
activesupport (= 6.1.3.1)
272281
bundler (>= 1.15.0)
273-
railties (= 6.1.0)
282+
railties (= 6.1.3.1)
274283
sprockets-rails (>= 2.0.0)
275284
rails-controller-testing (1.0.5)
276285
actionpack (>= 5.0.1.rc1)
@@ -281,9 +290,9 @@ GEM
281290
nokogiri (>= 1.6)
282291
rails-html-sanitizer (1.3.0)
283292
loofah (~> 2.3)
284-
railties (6.1.0)
285-
actionpack (= 6.1.0)
286-
activesupport (= 6.1.0)
293+
railties (6.1.3.1)
294+
actionpack (= 6.1.3.1)
295+
activesupport (= 6.1.3.1)
287296
method_source
288297
rake (>= 0.8.7)
289298
thor (~> 1.0)
@@ -305,23 +314,23 @@ GEM
305314
chunky_png (~> 1.0)
306315
rqrcode_core (~> 0.2)
307316
rqrcode_core (0.2.0)
308-
rspec-core (3.10.0)
317+
rspec-core (3.10.1)
309318
rspec-support (~> 3.10.0)
310-
rspec-expectations (3.10.0)
319+
rspec-expectations (3.10.1)
311320
diff-lcs (>= 1.2.0, < 2.0)
312321
rspec-support (~> 3.10.0)
313-
rspec-mocks (3.10.0)
322+
rspec-mocks (3.10.2)
314323
diff-lcs (>= 1.2.0, < 2.0)
315324
rspec-support (~> 3.10.0)
316-
rspec-rails (4.0.2)
317-
actionpack (>= 4.2)
318-
activesupport (>= 4.2)
319-
railties (>= 4.2)
325+
rspec-rails (5.0.1)
326+
actionpack (>= 5.2)
327+
activesupport (>= 5.2)
328+
railties (>= 5.2)
320329
rspec-core (~> 3.10)
321330
rspec-expectations (~> 3.10)
322331
rspec-mocks (~> 3.10)
323332
rspec-support (~> 3.10)
324-
rspec-support (3.10.0)
333+
rspec-support (3.10.2)
325334
ruby-pinyin (0.5.0)
326335
rmmseg-cpp-new (~> 0.3.1)
327336
ruby2_keywords (0.0.2)
@@ -362,7 +371,7 @@ GEM
362371
sshkit (1.21.1)
363372
net-scp (>= 1.1.2)
364373
net-ssh (>= 2.8.0)
365-
thor (1.0.1)
374+
thor (1.1.0)
366375
tilt (2.0.10)
367376
tzinfo (2.0.4)
368377
concurrent-ruby (~> 1.0)
@@ -405,7 +414,7 @@ DEPENDENCIES
405414
letter_opener
406415
logster
407416
marked-rails
408-
mini_racer
417+
mini_racer!
409418
omniauth
410419
omniauth-facebook
411420
omniauth-github
@@ -425,7 +434,7 @@ DEPENDENCIES
425434
react_on_rails (~> 10)
426435
redis
427436
rqrcode
428-
rspec-rails (~> 4.0.0.beta2)
437+
rspec-rails (~> 5.0.1)
429438
ruby-pinyin
430439
rubyzip (~> 1.3.0)
431440
sass-rails (~> 6.0.0)

0 commit comments

Comments
 (0)