Skip to content
This repository was archived by the owner on Apr 19, 2023. It is now read-only.

Commit ac1fd19

Browse files
committed
Update to go-on-rails 4.0
1 parent 475cf3e commit ac1fd19

File tree

14 files changed

+360
-298
lines changed

14 files changed

+360
-298
lines changed

.ruby-version

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
2.6.3

Gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ gem 'jbuilder', '~> 2.5'
3333

3434
# Use Capistrano for deployment
3535
# gem 'capistrano-rails', group: :development
36-
gem 'go-on-rails', '~> 0.3.0'
36+
gem 'go-on-rails', '~> 0.4.0'
3737
gem 'devise'
3838
gem 'rails_admin', '~> 1.2'
3939
gem 'cancancan', '~> 2.0'

Gemfile.lock

Lines changed: 106 additions & 110 deletions
Original file line numberDiff line numberDiff line change
@@ -1,99 +1,97 @@
11
GEM
22
remote: https://rubygems.org/
33
specs:
4-
actioncable (5.1.6)
5-
actionpack (= 5.1.6)
4+
actioncable (5.1.7)
5+
actionpack (= 5.1.7)
66
nio4r (~> 2.0)
77
websocket-driver (~> 0.6.1)
8-
actionmailer (5.1.6)
9-
actionpack (= 5.1.6)
10-
actionview (= 5.1.6)
11-
activejob (= 5.1.6)
8+
actionmailer (5.1.7)
9+
actionpack (= 5.1.7)
10+
actionview (= 5.1.7)
11+
activejob (= 5.1.7)
1212
mail (~> 2.5, >= 2.5.4)
1313
rails-dom-testing (~> 2.0)
14-
actionpack (5.1.6)
15-
actionview (= 5.1.6)
16-
activesupport (= 5.1.6)
14+
actionpack (5.1.7)
15+
actionview (= 5.1.7)
16+
activesupport (= 5.1.7)
1717
rack (~> 2.0)
1818
rack-test (>= 0.6.3)
1919
rails-dom-testing (~> 2.0)
2020
rails-html-sanitizer (~> 1.0, >= 1.0.2)
21-
actionview (5.1.6)
22-
activesupport (= 5.1.6)
21+
actionview (5.1.7)
22+
activesupport (= 5.1.7)
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.1.6)
28-
activesupport (= 5.1.6)
27+
activejob (5.1.7)
28+
activesupport (= 5.1.7)
2929
globalid (>= 0.3.6)
30-
activemodel (5.1.6)
31-
activesupport (= 5.1.6)
32-
activerecord (5.1.6)
33-
activemodel (= 5.1.6)
34-
activesupport (= 5.1.6)
30+
activemodel (5.1.7)
31+
activesupport (= 5.1.7)
32+
activerecord (5.1.7)
33+
activemodel (= 5.1.7)
34+
activesupport (= 5.1.7)
3535
arel (~> 8.0)
36-
activesupport (5.1.6)
36+
activesupport (5.1.7)
3737
concurrent-ruby (~> 1.0, >= 1.0.2)
3838
i18n (>= 0.7, < 2)
3939
minitest (~> 5.1)
4040
tzinfo (~> 1.1)
41-
addressable (2.5.2)
42-
public_suffix (>= 2.0.2, < 4.0)
43-
annotate (2.7.3)
44-
activerecord (>= 3.2, < 6.0)
45-
rake (>= 10.4, < 13.0)
41+
addressable (2.7.0)
42+
public_suffix (>= 2.0.2, < 5.0)
43+
annotate (3.0.3)
44+
activerecord (>= 3.2, < 7.0)
45+
rake (>= 10.4, < 14.0)
4646
arel (8.0.0)
47-
bcrypt (3.1.11)
48-
bindex (0.5.0)
49-
builder (3.2.3)
50-
byebug (10.0.2)
51-
cancancan (2.2.0)
47+
bcrypt (3.1.13)
48+
bindex (0.8.1)
49+
builder (3.2.4)
50+
byebug (11.0.1)
51+
cancancan (2.3.0)
5252
capybara (2.18.0)
5353
addressable
5454
mini_mime (>= 0.1.3)
5555
nokogiri (>= 1.3.3)
5656
rack (>= 1.0.0)
5757
rack-test (>= 0.5.4)
5858
xpath (>= 2.0, < 4.0)
59-
childprocess (0.9.0)
60-
ffi (~> 1.0, >= 1.0.11)
59+
childprocess (3.0.0)
6160
coffee-rails (4.2.2)
6261
coffee-script (>= 2.2.0)
6362
railties (>= 4.0.0)
6463
coffee-script (2.4.1)
6564
coffee-script-source
6665
execjs
6766
coffee-script-source (1.12.2)
68-
concurrent-ruby (1.0.5)
69-
crass (1.0.4)
70-
devise (4.4.3)
67+
concurrent-ruby (1.1.5)
68+
crass (1.0.5)
69+
devise (4.7.1)
7170
bcrypt (~> 3.0)
7271
orm_adapter (~> 0.1)
73-
railties (>= 4.1.0, < 6.0)
72+
railties (>= 4.1.0)
7473
responders
7574
warden (~> 1.2.3)
76-
erubi (1.7.1)
75+
erubi (1.9.0)
7776
execjs (2.7.0)
78-
ffi (1.9.23)
79-
font-awesome-rails (4.7.0.4)
80-
railties (>= 3.2, < 6.0)
81-
globalid (0.4.1)
77+
ffi (1.11.3)
78+
font-awesome-rails (4.7.0.5)
79+
railties (>= 3.2, < 6.1)
80+
globalid (0.4.2)
8281
activesupport (>= 4.2.0)
83-
go-on-rails (0.3.0)
84-
haml (5.0.4)
82+
go-on-rails (0.4.0)
83+
haml (5.1.2)
8584
temple (>= 0.8.0)
8685
tilt
87-
i18n (1.0.1)
86+
i18n (1.7.0)
8887
concurrent-ruby (~> 1.0)
89-
jbuilder (2.7.0)
88+
jbuilder (2.9.1)
9089
activesupport (>= 4.2.0)
91-
multi_json (>= 1.2)
92-
jquery-rails (4.3.3)
90+
jquery-rails (4.3.5)
9391
rails-dom-testing (>= 1, < 3)
9492
railties (>= 4.2.0)
9593
thor (>= 0.14, < 2.0)
96-
jquery-ui-rails (5.0.5)
94+
jquery-ui-rails (6.0.1)
9795
railties (>= 3.2.16)
9896
kaminari (1.1.1)
9997
activesupport (>= 4.1.0)
@@ -111,79 +109,78 @@ GEM
111109
rb-fsevent (~> 0.9, >= 0.9.4)
112110
rb-inotify (~> 0.9, >= 0.9.7)
113111
ruby_dep (~> 1.2)
114-
loofah (2.2.2)
112+
loofah (2.4.0)
115113
crass (~> 1.0.2)
116114
nokogiri (>= 1.5.9)
117-
mail (2.7.0)
115+
mail (2.7.1)
118116
mini_mime (>= 0.1.1)
119-
method_source (0.9.0)
120-
mini_mime (1.0.0)
121-
mini_portile2 (2.3.0)
122-
minitest (5.11.3)
123-
multi_json (1.13.1)
117+
method_source (0.9.2)
118+
mini_mime (1.0.2)
119+
mini_portile2 (2.4.0)
120+
minitest (5.13.0)
124121
mysql2 (0.4.10)
125122
nested_form (0.3.2)
126-
nio4r (2.3.0)
127-
nokogiri (1.8.2)
128-
mini_portile2 (~> 2.3.0)
123+
nio4r (2.5.2)
124+
nokogiri (1.10.7)
125+
mini_portile2 (~> 2.4.0)
129126
orm_adapter (0.5.0)
130-
public_suffix (3.0.2)
131-
puma (3.11.4)
132-
rack (2.0.5)
133-
rack-pjax (1.0.0)
127+
public_suffix (4.0.1)
128+
puma (3.12.2)
129+
rack (2.0.8)
130+
rack-pjax (1.1.0)
134131
nokogiri (~> 1.5)
135132
rack (>= 1.1)
136-
rack-proxy (0.6.4)
133+
rack-proxy (0.6.5)
137134
rack
138-
rack-test (1.0.0)
135+
rack-test (1.1.0)
139136
rack (>= 1.0, < 3)
140-
rails (5.1.6)
141-
actioncable (= 5.1.6)
142-
actionmailer (= 5.1.6)
143-
actionpack (= 5.1.6)
144-
actionview (= 5.1.6)
145-
activejob (= 5.1.6)
146-
activemodel (= 5.1.6)
147-
activerecord (= 5.1.6)
148-
activesupport (= 5.1.6)
137+
rails (5.1.7)
138+
actioncable (= 5.1.7)
139+
actionmailer (= 5.1.7)
140+
actionpack (= 5.1.7)
141+
actionview (= 5.1.7)
142+
activejob (= 5.1.7)
143+
activemodel (= 5.1.7)
144+
activerecord (= 5.1.7)
145+
activesupport (= 5.1.7)
149146
bundler (>= 1.3.0)
150-
railties (= 5.1.6)
147+
railties (= 5.1.7)
151148
sprockets-rails (>= 2.0.0)
152149
rails-dom-testing (2.0.3)
153150
activesupport (>= 4.2.0)
154151
nokogiri (>= 1.6)
155-
rails-html-sanitizer (1.0.4)
156-
loofah (~> 2.2, >= 2.2.2)
157-
rails_admin (1.3.0)
152+
rails-html-sanitizer (1.3.0)
153+
loofah (~> 2.3)
154+
rails_admin (1.4.2)
158155
builder (~> 3.1)
159156
coffee-rails (~> 4.0)
160157
font-awesome-rails (>= 3.0, < 5)
161158
haml (>= 4.0, < 6)
162159
jquery-rails (>= 3.0, < 5)
163-
jquery-ui-rails (~> 5.0)
160+
jquery-ui-rails (>= 5.0, < 7)
164161
kaminari (>= 0.14, < 2.0)
165162
nested_form (~> 0.3)
166163
rack-pjax (>= 0.7)
167164
rails (>= 4.0, < 6)
168165
remotipart (~> 1.3)
169166
sass-rails (>= 4.0, < 6)
170-
railties (5.1.6)
171-
actionpack (= 5.1.6)
172-
activesupport (= 5.1.6)
167+
railties (5.1.7)
168+
actionpack (= 5.1.7)
169+
activesupport (= 5.1.7)
173170
method_source
174171
rake (>= 0.8.7)
175172
thor (>= 0.18.1, < 2.0)
176-
rake (12.3.1)
173+
rake (13.0.1)
177174
rb-fsevent (0.10.3)
178-
rb-inotify (0.9.10)
179-
ffi (>= 0.5.0, < 2)
180-
remotipart (1.4.2)
181-
responders (2.4.0)
182-
actionpack (>= 4.2.0, < 5.3)
183-
railties (>= 4.2.0, < 5.3)
175+
rb-inotify (0.10.0)
176+
ffi (~> 1.0)
177+
remotipart (1.4.3)
178+
responders (3.0.0)
179+
actionpack (>= 5.0)
180+
railties (>= 5.0)
184181
ruby_dep (1.5.0)
185-
rubyzip (1.2.1)
186-
sass (3.5.6)
182+
rubyzip (2.0.0)
183+
sass (3.7.4)
187184
sass-listen (~> 4.0.0)
188185
sass-listen (4.0.0)
189186
rb-fsevent (~> 0.9, >= 0.9.4)
@@ -194,47 +191,46 @@ GEM
194191
sprockets (>= 2.8, < 4.0)
195192
sprockets-rails (>= 2.0, < 4.0)
196193
tilt (>= 1.1, < 3)
197-
selenium-webdriver (3.11.0)
198-
childprocess (~> 0.5)
199-
rubyzip (~> 1.2)
200-
spring (2.0.2)
201-
activesupport (>= 4.2)
194+
selenium-webdriver (3.142.6)
195+
childprocess (>= 0.5, < 4.0)
196+
rubyzip (>= 1.2.2)
197+
spring (2.1.0)
202198
spring-watcher-listen (2.0.1)
203199
listen (>= 2.7, < 4.0)
204200
spring (>= 1.2, < 3.0)
205-
sprockets (3.7.1)
201+
sprockets (3.7.2)
206202
concurrent-ruby (~> 1.0)
207203
rack (> 1, < 3)
208204
sprockets-rails (3.2.1)
209205
actionpack (>= 4.0)
210206
activesupport (>= 4.0)
211207
sprockets (>= 3.0.0)
212-
temple (0.8.0)
213-
thor (0.20.0)
208+
temple (0.8.2)
209+
thor (1.0.1)
214210
thread_safe (0.3.6)
215-
tilt (2.0.8)
216-
turbolinks (5.1.1)
217-
turbolinks-source (~> 5.1)
218-
turbolinks-source (5.1.0)
211+
tilt (2.0.10)
212+
turbolinks (5.2.1)
213+
turbolinks-source (~> 5.2)
214+
turbolinks-source (5.2.0)
219215
tzinfo (1.2.5)
220216
thread_safe (~> 0.1)
221-
uglifier (4.1.10)
217+
uglifier (4.2.0)
222218
execjs (>= 0.3.0, < 3)
223-
warden (1.2.7)
224-
rack (>= 1.0)
225-
web-console (3.6.1)
219+
warden (1.2.8)
220+
rack (>= 2.0.6)
221+
web-console (3.7.0)
226222
actionview (>= 5.0)
227223
activemodel (>= 5.0)
228224
bindex (>= 0.4.0)
229225
railties (>= 5.0)
230-
webpacker (3.4.3)
226+
webpacker (3.6.0)
231227
activesupport (>= 4.2)
232228
rack-proxy (>= 0.6.1)
233229
railties (>= 4.2)
234230
websocket-driver (0.6.5)
235231
websocket-extensions (>= 0.1.0)
236-
websocket-extensions (0.1.3)
237-
xpath (3.0.0)
232+
websocket-extensions (0.1.4)
233+
xpath (3.2.0)
238234
nokogiri (~> 1.8)
239235

240236
PLATFORMS
@@ -247,7 +243,7 @@ DEPENDENCIES
247243
capybara (~> 2.13)
248244
coffee-rails (~> 4.2)
249245
devise
250-
go-on-rails (~> 0.3.0)
246+
go-on-rails (~> 0.4.0)
251247
jbuilder (~> 2.5)
252248
listen (>= 3.0.5, < 3.2)
253249
mysql2 (>= 0.3.18, < 0.5)
@@ -265,4 +261,4 @@ DEPENDENCIES
265261
webpacker (~> 3.0)
266262

267263
BUNDLED WITH
268-
1.16.0.pre.3
264+
2.0.2

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ rails new example_with_admin --database mysql --skip-bundle
2121
Then we edit `Gemfile` to add gems we need:
2222

2323
```ruby
24-
gem 'go-on-rails', '~> 0.3.0'
24+
gem 'go-on-rails', '~> 0.4.0'
2525
gem 'devise'
2626
gem 'rails_admin', '~> 1.2'
2727
gem 'cancancan', '~> 2.0'

docker-compose.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ version: '3'
22

33
services:
44
# generated according to the config/database.yml
5-
database:
5+
db:
66
image: mysql
77
ports:
88
- '3306:3306'
@@ -15,7 +15,7 @@ services:
1515
ports:
1616
- "3000:3000"
1717
depends_on:
18-
- database
18+
- db
1919

2020
# golang app part. It depends on the rails_app to initialize the database
2121
go_app:
@@ -27,5 +27,5 @@ services:
2727
ports:
2828
- "4000:4000"
2929
depends_on:
30-
- database
30+
- db
3131
- rails_app

0 commit comments

Comments
 (0)