Skip to content

Commit 16e4c48

Browse files
author
vitalie
committed
Rails upgrade
1 parent a7c0a75 commit 16e4c48

11 files changed

+223
-151
lines changed

‎.dockerignore

+40-6
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,45 @@
1-
*.md
1+
# Ignore docker files
22
.dockerignore
3+
Dockerfile*
4+
docker-compose*
5+
6+
# Ignore .git
7+
/.git
8+
.gitignore
9+
10+
# Ignore bundler config.
11+
/.bundle
12+
vendor/bundle
13+
14+
# Ignore all logfiles and tempfiles.
15+
/log/*
16+
/tmp/*
17+
!/log/.keep
18+
!/tmp/.keep
19+
320
.env
421
.env.*
5-
.git
6-
.gitignore
22+
723
.travis.yml
8-
Dockerfile
24+
25+
*.md
26+
927
spec
10-
#IDEs folders
11-
.idea
28+
29+
migration.log
30+
31+
# Ignore editor specific configs
32+
/.idea
33+
/.vscode
34+
.project
35+
.classpath
36+
.c9/
37+
*.launch
38+
.settings/
39+
*.sublime-workspace
40+
.generators
41+
.rakeTasks
42+
43+
# System Files
44+
.DS_Store
45+
Thumbs.db

‎.gitignore

+32-8
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,36 @@
1-
.bundle
2-
.ruby-gemset
3-
log
4-
*.gem
5-
vendor
1+
# See https://help.github.com/articles/ignoring-files for more about ignoring files.
2+
#
3+
# If you find yourself ignoring temporary files generated by your text editor
4+
# or operating system, you probably want to add a global ignore instead:
5+
# git config --global core.excludesfile '~/.gitignore_global'
6+
7+
# Ignore bundler config.
8+
/.bundle
9+
vendor/bundle
10+
11+
# Ignore all logfiles and tempfiles.
12+
/log/*
13+
/tmp/*
14+
!/log/.keep
15+
!/tmp/.keep
16+
617
.env
718
.env.*
819

9-
#IDEs
10-
.idea
20+
migration.log
21+
22+
# Ignore editor specific configs
23+
/.idea
24+
/.vscode
25+
.project
26+
.classpath
27+
.c9/
28+
*.launch
29+
.settings/
30+
*.sublime-workspace
31+
.generators
32+
.rakeTasks
1133

12-
.history
34+
# System Files
35+
.DS_Store
36+
Thumbs.db

‎Gemfile

+4-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
source 'https://rubygems.org'
2+
git_source(:github) { |repo| "https://github.com/#{repo}.git" }
23

34
ruby '2.5.9'
45

5-
gem 'rails', '~> 5.2'
6-
gem 'pg', '~> 1.0'
6+
gem 'rails', '~> 5.2.8'
7+
gem 'pg', '>= 0.18', '< 2.0'
78
gem 'rake'
8-
gem 'rspec', '~>3.4'
9+
gem 'rspec'
910
gem 's3'

‎Gemfile.lock

+83-85
Original file line numberDiff line numberDiff line change
@@ -1,146 +1,144 @@
11
GEM
22
remote: https://rubygems.org/
33
specs:
4-
actioncable (5.2.4.3)
5-
actionpack (= 5.2.4.3)
4+
actioncable (5.2.8.1)
5+
actionpack (= 5.2.8.1)
66
nio4r (~> 2.0)
77
websocket-driver (>= 0.6.1)
8-
actionmailer (5.2.4.3)
9-
actionpack (= 5.2.4.3)
10-
actionview (= 5.2.4.3)
11-
activejob (= 5.2.4.3)
8+
actionmailer (5.2.8.1)
9+
actionpack (= 5.2.8.1)
10+
actionview (= 5.2.8.1)
11+
activejob (= 5.2.8.1)
1212
mail (~> 2.5, >= 2.5.4)
1313
rails-dom-testing (~> 2.0)
14-
actionpack (5.2.4.3)
15-
actionview (= 5.2.4.3)
16-
activesupport (= 5.2.4.3)
14+
actionpack (5.2.8.1)
15+
actionview (= 5.2.8.1)
16+
activesupport (= 5.2.8.1)
1717
rack (~> 2.0, >= 2.0.8)
1818
rack-test (>= 0.6.3)
1919
rails-dom-testing (~> 2.0)
2020
rails-html-sanitizer (~> 1.0, >= 1.0.2)
21-
actionview (5.2.4.3)
22-
activesupport (= 5.2.4.3)
21+
actionview (5.2.8.1)
22+
activesupport (= 5.2.8.1)
2323
builder (~> 3.1)
2424
erubi (~> 1.4)
2525
rails-dom-testing (~> 2.0)
2626
rails-html-sanitizer (~> 1.0, >= 1.0.3)
27-
activejob (5.2.4.3)
28-
activesupport (= 5.2.4.3)
27+
activejob (5.2.8.1)
28+
activesupport (= 5.2.8.1)
2929
globalid (>= 0.3.6)
30-
activemodel (5.2.4.3)
31-
activesupport (= 5.2.4.3)
32-
activerecord (5.2.4.3)
33-
activemodel (= 5.2.4.3)
34-
activesupport (= 5.2.4.3)
30+
activemodel (5.2.8.1)
31+
activesupport (= 5.2.8.1)
32+
activerecord (5.2.8.1)
33+
activemodel (= 5.2.8.1)
34+
activesupport (= 5.2.8.1)
3535
arel (>= 9.0)
36-
activestorage (5.2.4.3)
37-
actionpack (= 5.2.4.3)
38-
activerecord (= 5.2.4.3)
39-
marcel (~> 0.3.1)
40-
activesupport (5.2.4.3)
36+
activestorage (5.2.8.1)
37+
actionpack (= 5.2.8.1)
38+
activerecord (= 5.2.8.1)
39+
marcel (~> 1.0.0)
40+
activesupport (5.2.8.1)
4141
concurrent-ruby (~> 1.0, >= 1.0.2)
4242
i18n (>= 0.7, < 2)
4343
minitest (~> 5.1)
4444
tzinfo (~> 1.1)
45-
addressable (2.7.0)
46-
public_suffix (>= 2.0.2, < 5.0)
45+
addressable (2.8.1)
46+
public_suffix (>= 2.0.2, < 6.0)
4747
arel (9.0.0)
4848
builder (3.2.4)
49-
concurrent-ruby (1.1.6)
49+
concurrent-ruby (1.1.10)
5050
crass (1.0.6)
51-
diff-lcs (1.3)
52-
erubi (1.9.0)
53-
globalid (0.4.2)
54-
activesupport (>= 4.2.0)
55-
i18n (1.8.3)
51+
diff-lcs (1.5.0)
52+
erubi (1.11.0)
53+
globalid (1.0.0)
54+
activesupport (>= 5.0)
55+
i18n (1.12.0)
5656
concurrent-ruby (~> 1.0)
57-
loofah (2.5.0)
57+
loofah (2.19.0)
5858
crass (~> 1.0.2)
5959
nokogiri (>= 1.5.9)
6060
mail (2.7.1)
6161
mini_mime (>= 0.1.1)
62-
marcel (0.3.3)
63-
mimemagic (~> 0.3.2)
62+
marcel (1.0.2)
6463
method_source (1.0.0)
65-
mimemagic (0.3.10)
66-
nokogiri (~> 1)
67-
rake
68-
mini_mime (1.0.2)
69-
mini_portile2 (2.4.0)
70-
minitest (5.14.1)
71-
nio4r (2.5.2)
72-
nokogiri (1.10.9)
73-
mini_portile2 (~> 2.4.0)
74-
pg (1.2.3)
64+
mini_mime (1.1.2)
65+
mini_portile2 (2.6.1)
66+
minitest (5.15.0)
67+
nio4r (2.5.8)
68+
nokogiri (1.12.5)
69+
mini_portile2 (~> 2.6.1)
70+
racc (~> 1.4)
71+
pg (1.4.3)
7572
proxies (0.2.3)
76-
public_suffix (4.0.5)
77-
rack (2.2.3)
78-
rack-test (1.1.0)
79-
rack (>= 1.0, < 3)
80-
rails (5.2.4.3)
81-
actioncable (= 5.2.4.3)
82-
actionmailer (= 5.2.4.3)
83-
actionpack (= 5.2.4.3)
84-
actionview (= 5.2.4.3)
85-
activejob (= 5.2.4.3)
86-
activemodel (= 5.2.4.3)
87-
activerecord (= 5.2.4.3)
88-
activestorage (= 5.2.4.3)
89-
activesupport (= 5.2.4.3)
73+
public_suffix (4.0.7)
74+
racc (1.6.0)
75+
rack (2.2.4)
76+
rack-test (2.0.2)
77+
rack (>= 1.3)
78+
rails (5.2.8.1)
79+
actioncable (= 5.2.8.1)
80+
actionmailer (= 5.2.8.1)
81+
actionpack (= 5.2.8.1)
82+
actionview (= 5.2.8.1)
83+
activejob (= 5.2.8.1)
84+
activemodel (= 5.2.8.1)
85+
activerecord (= 5.2.8.1)
86+
activestorage (= 5.2.8.1)
87+
activesupport (= 5.2.8.1)
9088
bundler (>= 1.3.0)
91-
railties (= 5.2.4.3)
89+
railties (= 5.2.8.1)
9290
sprockets-rails (>= 2.0.0)
9391
rails-dom-testing (2.0.3)
9492
activesupport (>= 4.2.0)
9593
nokogiri (>= 1.6)
96-
rails-html-sanitizer (1.3.0)
94+
rails-html-sanitizer (1.4.3)
9795
loofah (~> 2.3)
98-
railties (5.2.4.3)
99-
actionpack (= 5.2.4.3)
100-
activesupport (= 5.2.4.3)
96+
railties (5.2.8.1)
97+
actionpack (= 5.2.8.1)
98+
activesupport (= 5.2.8.1)
10199
method_source
102100
rake (>= 0.8.7)
103101
thor (>= 0.19.0, < 2.0)
104-
rake (13.0.1)
105-
rspec (3.9.0)
106-
rspec-core (~> 3.9.0)
107-
rspec-expectations (~> 3.9.0)
108-
rspec-mocks (~> 3.9.0)
109-
rspec-core (3.9.2)
110-
rspec-support (~> 3.9.3)
111-
rspec-expectations (3.9.2)
102+
rake (13.0.6)
103+
rspec (3.11.0)
104+
rspec-core (~> 3.11.0)
105+
rspec-expectations (~> 3.11.0)
106+
rspec-mocks (~> 3.11.0)
107+
rspec-core (3.11.0)
108+
rspec-support (~> 3.11.0)
109+
rspec-expectations (3.11.1)
112110
diff-lcs (>= 1.2.0, < 2.0)
113-
rspec-support (~> 3.9.0)
114-
rspec-mocks (3.9.1)
111+
rspec-support (~> 3.11.0)
112+
rspec-mocks (3.11.1)
115113
diff-lcs (>= 1.2.0, < 2.0)
116-
rspec-support (~> 3.9.0)
117-
rspec-support (3.9.3)
114+
rspec-support (~> 3.11.0)
115+
rspec-support (3.11.1)
118116
s3 (0.3.29)
119117
addressable
120118
proxies
121-
sprockets (4.0.2)
119+
sprockets (4.1.1)
122120
concurrent-ruby (~> 1.0)
123121
rack (> 1, < 3)
124-
sprockets-rails (3.2.1)
125-
actionpack (>= 4.0)
126-
activesupport (>= 4.0)
122+
sprockets-rails (3.4.2)
123+
actionpack (>= 5.2)
124+
activesupport (>= 5.2)
127125
sprockets (>= 3.0.0)
128-
thor (1.0.1)
126+
thor (1.2.1)
129127
thread_safe (0.3.6)
130-
tzinfo (1.2.7)
128+
tzinfo (1.2.10)
131129
thread_safe (~> 0.1)
132-
websocket-driver (0.7.2)
130+
websocket-driver (0.7.5)
133131
websocket-extensions (>= 0.1.0)
134132
websocket-extensions (0.1.5)
135133

136134
PLATFORMS
137135
ruby
138136

139137
DEPENDENCIES
140-
pg (~> 1.0)
141-
rails (~> 5.2)
138+
pg (>= 0.18, < 2.0)
139+
rails (~> 5.2.8)
142140
rake
143-
rspec (~> 3.4)
141+
rspec
144142
s3
145143

146144
RUBY VERSION

‎README.md

+7-6
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ This creates a new ActiveRecord migration file in `db/main/migrate`,
2929
with the current timestamp and the name `add_column_x_to_table_y`:
3030

3131
```
32-
create db/main/migrate/20181007154333_add_column_x_to_table_y.rb
32+
create db/main/migrate/20181007154333_add_column_x_to_table_y.rb
3333
```
3434

3535
See [this guide](http://edgeguides.rubyonrails.org/active_record_migrations.html#creating-a-standalone-migration) for creating standalone migrations.
@@ -46,12 +46,13 @@ We use PostgreSQL 9.6 on production, which is often different than the database
4646
installed on many operating systems by default. In order to make it easier to
4747
run against 9.6 you can use Docker with a supplied docker-compose.yml file.
4848

49-
Run `docker-compose up` to start the container. Then you can either change
50-
settings in `config/database.yml` to use `postgres` as a user and `5431` as a
51-
port, or run with `DATABASE_URL` specified explicitly, for example:
49+
Run `docker-compose up` to start the container.
50+
Then you can either change settings in `config/database.yml`
51+
to use `postgres` as a user, `postgres` as a password and `5432` as a port,
52+
or run with `DATABASE_URL` specified explicitly, for example:
5253

5354
```bash
54-
DATABASE_URL=postgres://postgres@localhost:5431/travis_test bundle exec rake db:migrate
55+
DATABASE_URL=postgres://postgres:postgres@localhost:5432/travis_test bundle exec rake db:migrate
5556
```
5657

5758
Running migrations locally
@@ -86,7 +87,7 @@ ActiveRecord::NoEnvironmentInSchemaError:
8687
8788
Environment data not found in the schema. To resolve this issue, run:
8889
89-
bin/rails db:environment:set RAILS_ENV=test
90+
bin/rails db:environment:set RAILS_ENV=test
9091
```
9192

9293
The command that it outputs will not work, because we don't install rails

0 commit comments

Comments
 (0)