Skip to content

Commit 60dad0b

Browse files
fxnfxn
committed
upgrades to 6.0 (WIP)
1 parent a9673c3 commit 60dad0b

17 files changed

+133
-110
lines changed

‎.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,4 @@
22
/log
33
/tmp
44
/rails.git
5+
config/master.key

‎Dockerfile

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ruby:2.5-alpine
1+
FROM ruby:2.5.3-alpine3.7
22

33
# LANG as recommended in the Encoding section of https://hub.docker.com/_/ruby/.
44
ENV LANG C.UTF-8
@@ -17,11 +17,13 @@ RUN apk --no-cache add --update \
1717
cmake \
1818
curl \
1919
git \
20+
vim \
2021
postgresql-client \
2122
postgresql-dev \
2223
tzdata \
23-
nodejs
24+
nodejs \
25+
yarn
2426

25-
RUN gem update --system && gem install bundler -N
27+
RUN gem update --system
2628

2729
WORKDIR /rails-contributors

‎Gemfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@ ruby '2.5.3'
33
source 'https://rubygems.org'
44
git_source(:github) { |repo| "https://github.com/#{repo}.git" }
55

6-
gem 'rails', '~> 5.2.1'
6+
gem 'rails', '~> 6.0.0.beta1'
77
gem 'pg'
8-
gem 'puma', '~> 3.7'
8+
gem 'puma', '~> 3.11'
99
gem 'rugged', '0.27.0'
1010
gem 'unf'
1111
gem 'turbolinks', '~> 5'

‎Gemfile.lock

Lines changed: 79 additions & 67 deletions
Original file line numberDiff line numberDiff line change
@@ -1,52 +1,63 @@
11
GEM
22
remote: https://rubygems.org/
33
specs:
4-
actioncable (5.2.1)
5-
actionpack (= 5.2.1)
4+
actioncable (6.0.0.beta1)
5+
actionpack (= 6.0.0.beta1)
66
nio4r (~> 2.0)
77
websocket-driver (>= 0.6.1)
8-
actionmailer (5.2.1)
9-
actionpack (= 5.2.1)
10-
actionview (= 5.2.1)
11-
activejob (= 5.2.1)
8+
actionmailbox (6.0.0.beta1)
9+
actionpack (= 6.0.0.beta1)
10+
activejob (= 6.0.0.beta1)
11+
activerecord (= 6.0.0.beta1)
12+
activestorage (= 6.0.0.beta1)
13+
activesupport (= 6.0.0.beta1)
14+
mail (>= 2.7.1)
15+
actionmailer (6.0.0.beta1)
16+
actionpack (= 6.0.0.beta1)
17+
actionview (= 6.0.0.beta1)
18+
activejob (= 6.0.0.beta1)
1219
mail (~> 2.5, >= 2.5.4)
1320
rails-dom-testing (~> 2.0)
14-
actionpack (5.2.1)
15-
actionview (= 5.2.1)
16-
activesupport (= 5.2.1)
21+
actionpack (6.0.0.beta1)
22+
actionview (= 6.0.0.beta1)
23+
activesupport (= 6.0.0.beta1)
1724
rack (~> 2.0)
1825
rack-test (>= 0.6.3)
1926
rails-dom-testing (~> 2.0)
2027
rails-html-sanitizer (~> 1.0, >= 1.0.2)
2128
actionpack-page_caching (1.1.1)
2229
actionpack (>= 4.0.0, < 6)
23-
actionview (5.2.1)
24-
activesupport (= 5.2.1)
30+
actiontext (6.0.0.beta1)
31+
actionpack (= 6.0.0.beta1)
32+
activerecord (= 6.0.0.beta1)
33+
activestorage (= 6.0.0.beta1)
34+
activesupport (= 6.0.0.beta1)
35+
nokogiri (>= 1.8.5)
36+
actionview (6.0.0.beta1)
37+
activesupport (= 6.0.0.beta1)
2538
builder (~> 3.1)
2639
erubi (~> 1.4)
2740
rails-dom-testing (~> 2.0)
2841
rails-html-sanitizer (~> 1.0, >= 1.0.3)
29-
activejob (5.2.1)
30-
activesupport (= 5.2.1)
42+
activejob (6.0.0.beta1)
43+
activesupport (= 6.0.0.beta1)
3144
globalid (>= 0.3.6)
32-
activemodel (5.2.1)
33-
activesupport (= 5.2.1)
34-
activerecord (5.2.1)
35-
activemodel (= 5.2.1)
36-
activesupport (= 5.2.1)
37-
arel (>= 9.0)
38-
activestorage (5.2.1)
39-
actionpack (= 5.2.1)
40-
activerecord (= 5.2.1)
45+
activemodel (6.0.0.beta1)
46+
activesupport (= 6.0.0.beta1)
47+
activerecord (6.0.0.beta1)
48+
activemodel (= 6.0.0.beta1)
49+
activesupport (= 6.0.0.beta1)
50+
activestorage (6.0.0.beta1)
51+
actionpack (= 6.0.0.beta1)
52+
activerecord (= 6.0.0.beta1)
4153
marcel (~> 0.3.1)
42-
activesupport (5.2.1)
54+
activesupport (6.0.0.beta1)
4355
concurrent-ruby (~> 1.0, >= 1.0.2)
4456
i18n (>= 0.7, < 2)
4557
minitest (~> 5.1)
4658
tzinfo (~> 1.1)
47-
airbrussh (1.3.0)
59+
airbrussh (1.3.1)
4860
sshkit (>= 1.6.1, != 1.7.0)
49-
arel (9.0.0)
5061
bcrypt_pbkdf (1.0.0)
5162
bindex (0.5.0)
5263
builder (3.2.3)
@@ -56,9 +67,8 @@ GEM
5667
i18n
5768
rake (>= 10.0.0)
5869
sshkit (>= 1.9.0)
59-
capistrano-bundler (1.4.0)
70+
capistrano-bundler (1.5.0)
6071
capistrano (~> 3.1)
61-
sshkit (~> 1.2)
6272
capistrano-rails (1.4.0)
6373
capistrano (~> 3.1)
6474
capistrano-bundler (~> 1.1)
@@ -76,15 +86,15 @@ GEM
7686
coffee-script-source
7787
execjs
7888
coffee-script-source (1.12.2)
79-
concurrent-ruby (1.0.5)
89+
concurrent-ruby (1.1.4)
8090
crass (1.0.4)
8191
ed25519 (1.2.4)
82-
erubi (1.7.1)
92+
erubi (1.8.0)
8393
execjs (2.7.0)
84-
ffi (1.9.25)
85-
globalid (0.4.1)
94+
ffi (1.10.0)
95+
globalid (0.4.2)
8696
activesupport (>= 4.2.0)
87-
i18n (1.1.1)
97+
i18n (1.5.3)
8898
concurrent-ruby (~> 1.0)
8999
listen (3.1.5)
90100
rb-fsevent (~> 0.9, >= 0.9.4)
@@ -97,61 +107,63 @@ GEM
97107
mini_mime (>= 0.1.1)
98108
marcel (0.3.3)
99109
mimemagic (~> 0.3.2)
100-
method_source (0.9.0)
101-
mimemagic (0.3.2)
110+
method_source (0.9.2)
111+
mimemagic (0.3.3)
102112
mini_mime (1.0.1)
103-
mini_portile2 (2.3.0)
113+
mini_portile2 (2.4.0)
104114
minitest (5.11.3)
105115
net-scp (1.2.1)
106116
net-ssh (>= 2.6.5)
107-
net-ssh (5.0.2)
117+
net-ssh (5.1.0)
108118
nio4r (2.3.1)
109-
nokogiri (1.8.5)
110-
mini_portile2 (~> 2.3.0)
111-
pg (1.1.3)
119+
nokogiri (1.10.1)
120+
mini_portile2 (~> 2.4.0)
121+
pg (1.1.4)
112122
puma (3.12.0)
113123
rack (2.0.6)
114124
rack-test (1.1.0)
115125
rack (>= 1.0, < 3)
116-
rails (5.2.1)
117-
actioncable (= 5.2.1)
118-
actionmailer (= 5.2.1)
119-
actionpack (= 5.2.1)
120-
actionview (= 5.2.1)
121-
activejob (= 5.2.1)
122-
activemodel (= 5.2.1)
123-
activerecord (= 5.2.1)
124-
activestorage (= 5.2.1)
125-
activesupport (= 5.2.1)
126+
rails (6.0.0.beta1)
127+
actioncable (= 6.0.0.beta1)
128+
actionmailbox (= 6.0.0.beta1)
129+
actionmailer (= 6.0.0.beta1)
130+
actionpack (= 6.0.0.beta1)
131+
actiontext (= 6.0.0.beta1)
132+
actionview (= 6.0.0.beta1)
133+
activejob (= 6.0.0.beta1)
134+
activemodel (= 6.0.0.beta1)
135+
activerecord (= 6.0.0.beta1)
136+
activestorage (= 6.0.0.beta1)
137+
activesupport (= 6.0.0.beta1)
126138
bundler (>= 1.3.0)
127-
railties (= 5.2.1)
139+
railties (= 6.0.0.beta1)
128140
sprockets-rails (>= 2.0.0)
129-
rails-controller-testing (1.0.2)
130-
actionpack (~> 5.x, >= 5.0.1)
131-
actionview (~> 5.x, >= 5.0.1)
132-
activesupport (~> 5.x)
141+
rails-controller-testing (1.0.4)
142+
actionpack (>= 5.0.1.x)
143+
actionview (>= 5.0.1.x)
144+
activesupport (>= 5.0.1.x)
133145
rails-dom-testing (2.0.3)
134146
activesupport (>= 4.2.0)
135147
nokogiri (>= 1.6)
136148
rails-html-sanitizer (1.0.4)
137149
loofah (~> 2.2, >= 2.2.2)
138-
railties (5.2.1)
139-
actionpack (= 5.2.1)
140-
activesupport (= 5.2.1)
150+
railties (6.0.0.beta1)
151+
actionpack (= 6.0.0.beta1)
152+
activesupport (= 6.0.0.beta1)
141153
method_source
142154
rake (>= 0.8.7)
143-
thor (>= 0.19.0, < 2.0)
144-
rake (12.3.1)
155+
thor (>= 0.20.3, < 2.0)
156+
rake (12.3.2)
145157
rb-fsevent (0.10.3)
146-
rb-inotify (0.9.10)
147-
ffi (>= 0.5.0, < 2)
158+
rb-inotify (0.10.0)
159+
ffi (~> 1.0)
148160
rbnacl (4.0.2)
149161
ffi
150162
rbnacl-libsodium (1.0.16)
151163
rbnacl (>= 3.0.1)
152164
ruby_dep (1.5.0)
153165
rugged (0.27.0)
154-
sass (3.6.0)
166+
sass (3.7.3)
155167
sass-listen (~> 4.0.0)
156168
sass-listen (4.0.0)
157169
rb-fsevent (~> 0.9, >= 0.9.4)
@@ -172,15 +184,15 @@ GEM
172184
sshkit (1.18.0)
173185
net-scp (>= 1.1.2)
174186
net-ssh (>= 2.8.0)
175-
thor (0.20.0)
187+
thor (0.20.3)
176188
thread_safe (0.3.6)
177-
tilt (2.0.8)
189+
tilt (2.0.9)
178190
turbolinks (5.2.0)
179191
turbolinks-source (~> 5.2)
180192
turbolinks-source (5.2.0)
181193
tzinfo (1.2.5)
182194
thread_safe (~> 0.1)
183-
uglifier (4.1.19)
195+
uglifier (4.1.20)
184196
execjs (>= 0.3.0, < 3)
185197
unf (0.1.4)
186198
unf_ext
@@ -209,8 +221,8 @@ DEPENDENCIES
209221
ed25519
210222
listen (>= 3.0.5, < 3.2)
211223
pg
212-
puma (~> 3.7)
213-
rails (~> 5.2.1)
224+
puma (~> 3.11)
225+
rails (~> 6.0.0.beta1)
214226
rails-controller-testing
215227
rbnacl (>= 3.2, < 5.0)
216228
rbnacl-libsodium

‎Rakefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@
33

44
require_relative 'config/application'
55

6-
RailsContributors::Application.load_tasks
6+
Rails.application.load_tasks

‎app/models/commit.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,7 @@ def extract_svn_contributor_names_diffing(repo)
185185
end
186186

187187
def cache_diff(repo)
188-
update_attributes(diff: repo.diff(sha1).force_encoding('UTF-8'))
188+
update(diff: repo.diff(sha1).force_encoding('UTF-8'))
189189
end
190190

191191
# Extracts any changelog entry for this commit. This is done by diffing with

‎config/application.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,12 @@
1717
# you've limited to :test, :development, or :production.
1818
Bundler.require(*Rails.groups)
1919

20-
require './lib/bot_killer'
20+
require_relative '../lib/bot_killer'
2121

2222
module RailsContributors
2323
class Application < Rails::Application
2424
# Initialize configuration defaults for originally generated Rails version.
25-
config.load_defaults 5.2
25+
config.load_defaults 6.0
2626

2727
# Settings in config/environments/* take precedence over those specified here.
2828
# Application configuration can go into files in config/initializers

‎config/cable.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,9 @@ development:
22
adapter: async
33

44
test:
5-
adapter: async
5+
adapter: test
66

77
production:
88
adapter: redis
9-
url: redis://localhost:6379/1
9+
url: <%= ENV.fetch("REDIS_URL") { "redis://localhost:6379/1" } %>
10+
channel_prefix: sample_production

‎config/credentials.yml.enc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
LwzsHbqWiwntNYJtlmzViZhsOdMSaOkb5oEnU8QIHx2b+GSYMIBxBlDxv6SjZJTgxLuyXTlTNq9+LQ/TYX9qYGwoYW2yO5NLpDPmpCzVNLJJnNWR37wbAO98E+rKgSAH8whHWbDPgb1poRt25mYhzGYfUVLfOWBwy5bE9ShL3HeqwvirE/NpQVy9zY38c4hzIPuhqzplO7ludVWmDKd59fFpXlr9VkEcl0iq8GPxHrHB9maB7EWrrHuPyePcg3nKlgHbQa+e3m4bNOE3UD6CDiDwWYkU9K3v1BszvO6jBi4QFteFi8IsChPJHS178ZW4OH+LQkDp4ECWDgOGLc0SOCn9V0s6zp2F6EkFFjaZlAib+dB/N2gMOm43zoDaQcthCB/M+ERBCVp+4ZYl2Y4bCfsxDlCRevzdO+vQ--bsE3WapjhHaNn90c--V5fM1ulmCIrSxNuH/f0xzg==

‎config/deploy.rb

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

88
set :log_level, :info
99

10-
set :linked_files, %w{config/database.yml}
10+
set :linked_files, %w{config/database.yml config/master.key}
1111
set :linked_dirs, %w{log tmp/pids tmp/cache tmp/sockets public/system public/assets rails.git}
1212

1313
set :keep_releases, 5

0 commit comments

Comments
 (0)