Skip to content

Commit

Permalink
Merge pull request #849 from pooza/3_1_1
Browse files Browse the repository at this point in the history 
3.1.1
  • Loading branch information
@pooza
pooza authored Sep 17, 2022
2 parents 15b3df7 + ad9d30e commit 81a61f2
Show file tree
Hide file tree
Showing 3 changed files with 49 additions and 48 deletions.
1 change: 1 addition & 0 deletions .github/workflows/test.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ jobs:
bundle exec rake bundle:update
git diff
bundle exec rake bundle:check
- run: bundle exec rake migration:run
- name: Run lint
run: |
bundle exec rubocop
Expand Down
94 changes: 47 additions & 47 deletions Gemfile.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ GIT

GIT
remote: https://github.com/pooza/ginseng-core.git
revision: 33378090068db7a854d9deaf909be805aad1fef0
revision: d98757b64e174bb5b651016c53edabe27a2fdc71
specs:
ginseng-core (1.13.7)
ginseng-core (1.13.8)
activesupport (>= 6.1.3.2)
addressable (>= 2.8.0)
bundler (~> 2.0)
Expand Down Expand Up @@ -71,43 +71,43 @@ GIT
GEM
remote: https://rubygems.org/
specs:
actionpack (7.0.3.1)
actionview (= 7.0.3.1)
activesupport (= 7.0.3.1)
actionpack (7.0.4)
actionview (= 7.0.4)
activesupport (= 7.0.4)
rack (~> 2.0, >= 2.2.0)
rack-test (>= 0.6.3)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.2.0)
actionview (7.0.3.1)
activesupport (= 7.0.3.1)
actionview (7.0.4)
activesupport (= 7.0.4)
builder (~> 3.1)
erubi (~> 1.4)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.1, >= 1.2.0)
activesupport (7.0.3.1)
activesupport (7.0.4)
concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (>= 1.6, < 2)
minitest (>= 5.1)
tzinfo (~> 2.0)
addressable (2.8.0)
public_suffix (>= 2.0.2, < 5.0)
addressable (2.8.1)
public_suffix (>= 2.0.2, < 6.0)
ast (2.4.2)
bootsnap (1.12.0)
bootsnap (1.13.0)
msgpack (~> 1.2)
builder (3.2.4)
cgi (0.3.2)
concurrent-ruby (1.1.10)
connection_pool (2.2.5)
connection_pool (2.3.0)
crass (1.0.6)
csv (3.2.3)
csv (3.2.5)
daemon-spawn (0.4.2)
date (3.2.2)
digest (3.1.0)
domain_name (0.5.20190701)
unf (>= 0.0.5, < 1.0.0)
erb (2.2.3)
cgi
erubi (1.10.0)
erubi (1.11.0)
et-orbi (1.2.7)
tzinfo
etc (1.3.0)
Expand All @@ -116,7 +116,7 @@ GEM
ffi (1.15.5)
fileutils (1.6.0)
find (0.1.1)
fugit (1.5.3)
fugit (1.7.0)
et-orbi (~> 1, >= 1.2.7)
raabro (~> 1.4)
gli (2.21.0)
Expand All @@ -131,7 +131,7 @@ GEM
json (2.6.2)
json-schema (3.0.0)
addressable (>= 2.8)
loofah (2.18.0)
loofah (2.19.0)
crass (~> 1.0.2)
nokogiri (>= 1.5.9)
mail (2.7.1)
Expand All @@ -141,11 +141,11 @@ GEM
mime-types-data (3.2022.0105)
mini_mime (1.1.2)
mini_portile2 (2.8.0)
minitest (5.16.2)
msgpack (1.5.3)
minitest (5.16.3)
msgpack (1.5.6)
multi_json (1.15.0)
multi_xml (0.6.0)
mustermann (1.1.2)
mustermann (2.0.2)
ruby2_keywords (~> 0.0.1)
natto (1.2.0)
ffi (>= 1.9.0)
Expand All @@ -157,35 +157,35 @@ GEM
timeout
netrc (0.11.0)
nio4r (2.5.8)
nokogiri (1.13.7)
nokogiri (1.13.8)
mini_portile2 (~> 2.8.0)
racc (~> 1.4)
nokogiri (1.13.7-x86_64-linux)
nokogiri (1.13.8-x86_64-linux)
racc (~> 1.4)
optparse (0.2.0)
parallel (1.22.1)
parser (3.1.2.0)
parser (3.1.2.1)
ast (~> 2.4.1)
pg (1.4.1)
pg (1.4.3)
power_assert (2.0.1)
public_suffix (4.0.7)
puma (5.6.4)
public_suffix (5.0.0)
puma (5.6.5)
nio4r (~> 2.0)
raabro (1.4.0)
racc (1.6.0)
rack (2.2.4)
rack-protection (2.2.1)
rack-protection (2.2.2)
rack
rack-test (2.0.2)
rack (>= 1.3)
rails-dom-testing (2.0.3)
activesupport (>= 4.2.0)
nokogiri (>= 1.6)
rails-erb-lint (1.2.2)
actionpack (>= 4.0)
gli (~> 2.1)
rails-erb-lint (1.2.6)
actionpack (>= 5.0)
gli (~> 2.21.0)
json
rainbow (>= 2.2.2, < 4.0)
rainbow (>= 3.1.1, < 4.0)
rails-html-sanitizer (1.4.3)
loofah (~> 2.3)
rainbow (3.1.1)
Expand All @@ -201,21 +201,21 @@ GEM
ricecream (0.2.1)
rss (0.2.9)
rexml
rubocop (1.31.2)
rubocop (1.36.0)
json (~> 2.3)
parallel (~> 1.10)
parser (>= 3.1.0.0)
parser (>= 3.1.2.1)
rainbow (>= 2.2.2, < 4.0)
regexp_parser (>= 1.8, < 3.0)
rexml (>= 3.2.5, < 4.0)
rubocop-ast (>= 1.18.0, < 2.0)
rubocop-ast (>= 1.20.1, < 2.0)
ruby-progressbar (~> 1.7)
unicode-display_width (>= 1.4.0, < 3.0)
rubocop-ast (1.19.1)
rubocop-ast (1.21.0)
parser (>= 3.1.1.0)
rubocop-minitest (0.20.1)
rubocop-minitest (0.22.0)
rubocop (>= 0.90, < 2.0)
rubocop-performance (1.14.2)
rubocop-performance (1.15.0)
rubocop (>= 1.7.0, < 2.0)
rubocop-ast (>= 0.4.0)
rubocop-rake (0.6.0)
Expand All @@ -232,39 +232,39 @@ GEM
sassc (2.4.0)
ffi (~> 1.9)
securerandom (0.2.0)
sequel (5.58.0)
set (1.0.2)
sidekiq (6.5.1)
connection_pool (>= 2.2.2)
sequel (5.60.1)
set (1.0.3)
sidekiq (6.5.6)
connection_pool (>= 2.2.5)
rack (~> 2.0)
redis (>= 4.2.0)
redis (>= 4.5.0, < 5)
sidekiq-scheduler (4.0.2)
redis (>= 4.2.0)
rufus-scheduler (~> 3.2)
sidekiq (>= 4)
tilt (>= 1.4.0)
sinatra (2.2.1)
mustermann (~> 1.0)
sinatra (2.2.2)
mustermann (~> 2.0)
rack (~> 2.2)
rack-protection (= 2.2.1)
rack-protection (= 2.2.2)
tilt (~> 2.0)
slim (4.1.0)
temple (>= 0.7.6, < 0.9)
tilt (>= 2.0.6, < 2.1)
temple (0.8.2)
test-unit (3.5.3)
power_assert
tilt (2.0.10)
tilt (2.0.11)
time (0.2.0)
date
timecop (0.9.5)
timeout (0.3.0)
tzinfo (2.0.4)
tzinfo (2.0.5)
concurrent-ruby (~> 1.0)
unf (0.1.4)
unf_ext
unf_ext (0.0.8.2)
unicode-display_width (2.2.0)
unicode-display_width (2.3.0)
webrick (1.7.0)
websocket-driver (0.7.5)
websocket-extensions (>= 0.1.0)
Expand Down
2 changes: 1 addition & 1 deletion config/application.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ package:
- tkoishi@b-shock.co.jp
license: MIT
url: https://github.com/pooza/makoto
version: 3.1.0
version: 3.1.1
postgres:
dsn: postgres://postgres:password@localhost:5432/makoto
puma:
Expand Down

0 comments on commit 81a61f2

Please sign in to comment.