Skip to content

Commit

Permalink
Merge pull request #1413 from lifeiscontent/chore/upgrades
Browse files Browse the repository at this point in the history
  • Loading branch information
@lifeiscontent
lifeiscontent authored Oct 2, 2022
2 parents e986422 + 3863cc6 commit cc58207
Show file tree
Hide file tree
Showing 47 changed files with 169 additions and 170 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/api.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
run: sudo apt-get install libpq-dev
- uses: ruby/setup-ruby@v1
with:
ruby-version: 3.1.2
ruby-version: 3.1.1
working-directory: ./api
bundler-cache: true
- name: Setup Database
Expand Down
2 changes: 1 addition & 1 deletion api/.ruby-version
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
ruby-3.1.2
ruby-3.1.1
2 changes: 1 addition & 1 deletion api/.tool-versions
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
ruby 3.1.2
ruby 3.1.1
postgres 12.9
2 changes: 1 addition & 1 deletion api/Gemfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,5 +27,5 @@ gem 'spring', group: :development
gem 'spring-watcher-listen', group: :development
gem 'tzinfo-data', platforms: %i[mingw mswin x64_mingw jruby]
git_source(:github) { |repo| "https://github.com/#{repo}.git" }
ruby '3.1.2'
ruby '3.1.1'
source 'https://rubygems.org'
196 changes: 95 additions & 101 deletions api/Gemfile.lock
View file
Original file line number Diff line number Diff line change
@@ -1,75 +1,75 @@
GEM
remote: https://rubygems.org/
specs:
action_policy (0.6.1)
action_policy (0.6.3)
ruby-next-core (>= 0.14.0)
action_policy-graphql (0.5.3)
action_policy (>= 0.5.0)
graphql (>= 1.9.3)
ruby-next-core (>= 0.10.0)
actioncable (7.0.3)
actionpack (= 7.0.3)
activesupport (= 7.0.3)
actioncable (7.0.4)
actionpack (= 7.0.4)
activesupport (= 7.0.4)
nio4r (~> 2.0)
websocket-driver (>= 0.6.1)
actionmailbox (7.0.3)
actionpack (= 7.0.3)
activejob (= 7.0.3)
activerecord (= 7.0.3)
activestorage (= 7.0.3)
activesupport (= 7.0.3)
actionmailbox (7.0.4)
actionpack (= 7.0.4)
activejob (= 7.0.4)
activerecord (= 7.0.4)
activestorage (= 7.0.4)
activesupport (= 7.0.4)
mail (>= 2.7.1)
net-imap
net-pop
net-smtp
actionmailer (7.0.3)
actionpack (= 7.0.3)
actionview (= 7.0.3)
activejob (= 7.0.3)
activesupport (= 7.0.3)
actionmailer (7.0.4)
actionpack (= 7.0.4)
actionview (= 7.0.4)
activejob (= 7.0.4)
activesupport (= 7.0.4)
mail (~> 2.5, >= 2.5.4)
net-imap
net-pop
net-smtp
rails-dom-testing (~> 2.0)
actionpack (7.0.3)
actionview (= 7.0.3)
activesupport (= 7.0.3)
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)
actiontext (7.0.3)
actionpack (= 7.0.3)
activerecord (= 7.0.3)
activestorage (= 7.0.3)
activesupport (= 7.0.3)
actiontext (7.0.4)
actionpack (= 7.0.4)
activerecord (= 7.0.4)
activestorage (= 7.0.4)
activesupport (= 7.0.4)
globalid (>= 0.6.0)
nokogiri (>= 1.8.5)
actionview (7.0.3)
activesupport (= 7.0.3)
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)
active_record_doctor (1.9.0)
active_record_doctor (1.10.0)
activerecord (>= 4.2.0)
activejob (7.0.3)
activesupport (= 7.0.3)
activejob (7.0.4)
activesupport (= 7.0.4)
globalid (>= 0.3.6)
activemodel (7.0.3)
activesupport (= 7.0.3)
activerecord (7.0.3)
activemodel (= 7.0.3)
activesupport (= 7.0.3)
activestorage (7.0.3)
actionpack (= 7.0.3)
activejob (= 7.0.3)
activerecord (= 7.0.3)
activesupport (= 7.0.3)
activemodel (7.0.4)
activesupport (= 7.0.4)
activerecord (7.0.4)
activemodel (= 7.0.4)
activesupport (= 7.0.4)
activestorage (7.0.4)
actionpack (= 7.0.4)
activejob (= 7.0.4)
activerecord (= 7.0.4)
activesupport (= 7.0.4)
marcel (~> 1.0)
mini_mime (>= 1.1.0)
activesupport (7.0.3)
activesupport (7.0.4)
concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (>= 1.6, < 2)
minitest (>= 5.1)
Expand All @@ -78,7 +78,7 @@ GEM
backport (1.2.0)
bcrypt (3.1.18)
benchmark (0.2.0)
bootsnap (1.12.0)
bootsnap (1.13.0)
msgpack (~> 1.2)
builder (3.2.4)
byebug (11.1.3)
Expand All @@ -96,34 +96,34 @@ GEM
responders
warden (~> 1.2.3)
diff-lcs (1.5.0)
digest (3.1.0)
e2mmap (0.1.0)
erubi (1.10.0)
erubi (1.11.0)
factory_bot (6.2.1)
activesupport (>= 5.0.0)
factory_bot_rails (6.2.0)
factory_bot (~> 6.2.0)
railties (>= 5.0.0)
faker (2.21.0)
faker (2.23.0)
i18n (>= 1.8.11, < 2)
ffi (1.15.5)
friendly_id (5.4.2)
activerecord (>= 4.0.0)
globalid (1.0.0)
activesupport (>= 5.0)
graphql (2.0.11)
i18n (1.10.0)
graphql (2.0.14)
i18n (1.12.0)
concurrent-ruby (~> 1.0)
jaro_winkler (1.5.4)
jwt (2.4.1)
json (2.6.2)
jwt (2.5.0)
kramdown (2.4.0)
rexml
kramdown-parser-gfm (1.1.0)
kramdown (~> 2.0)
listen (3.7.1)
rb-fsevent (~> 0.10, >= 0.10.3)
rb-inotify (~> 0.9, >= 0.9.10)
loofah (2.18.0)
loofah (2.19.0)
crass (~> 1.0.2)
nokogiri (>= 1.5.9)
mail (2.7.1)
Expand All @@ -132,76 +132,70 @@ GEM
method_source (1.0.0)
mini_mime (1.1.2)
mini_portile2 (2.8.0)
minitest (5.16.1)
msgpack (1.5.2)
net-imap (0.2.3)
digest
minitest (5.16.3)
msgpack (1.6.0)
net-imap (0.3.1)
net-protocol
strscan
net-pop (0.1.1)
digest
net-pop (0.1.2)
net-protocol
timeout
net-protocol (0.1.3)
timeout
net-smtp (0.3.1)
digest
net-smtp (0.3.2)
net-protocol
timeout
nio4r (2.5.8)
nokogiri (1.13.6)
nokogiri (1.13.8)
mini_portile2 (~> 2.8.0)
racc (~> 1.4)
orm_adapter (0.5.0)
parallel (1.22.1)
parser (3.1.2.0)
parser (3.1.2.1)
ast (~> 2.4.1)
pg (1.4.1)
puma (5.6.4)
pg (1.4.3)
puma (5.6.5)
nio4r (~> 2.0)
racc (1.6.0)
rack (2.2.3.1)
rack (2.2.4)
rack-cors (1.1.1)
rack (>= 2.0.0)
rack-test (2.0.0)
rack-test (2.0.2)
rack (>= 1.3)
rails (7.0.3)
actioncable (= 7.0.3)
actionmailbox (= 7.0.3)
actionmailer (= 7.0.3)
actionpack (= 7.0.3)
actiontext (= 7.0.3)
actionview (= 7.0.3)
activejob (= 7.0.3)
activemodel (= 7.0.3)
activerecord (= 7.0.3)
activestorage (= 7.0.3)
activesupport (= 7.0.3)
rails (7.0.4)
actioncable (= 7.0.4)
actionmailbox (= 7.0.4)
actionmailer (= 7.0.4)
actionpack (= 7.0.4)
actiontext (= 7.0.4)
actionview (= 7.0.4)
activejob (= 7.0.4)
activemodel (= 7.0.4)
activerecord (= 7.0.4)
activestorage (= 7.0.4)
activesupport (= 7.0.4)
bundler (>= 1.15.0)
railties (= 7.0.3)
railties (= 7.0.4)
rails-dom-testing (2.0.3)
activesupport (>= 4.2.0)
nokogiri (>= 1.6)
rails-erd (1.7.1)
rails-erd (1.7.2)
activerecord (>= 4.2)
activesupport (>= 4.2)
choice (~> 0.2.0)
ruby-graphviz (~> 1.2)
rails-html-sanitizer (1.4.3)
loofah (~> 2.3)
railties (7.0.3)
actionpack (= 7.0.3)
activesupport (= 7.0.3)
railties (7.0.4)
actionpack (= 7.0.4)
activesupport (= 7.0.4)
method_source
rake (>= 12.2)
thor (~> 1.0)
zeitwerk (~> 2.5)
rainbow (3.1.1)
rake (13.0.6)
rb-fsevent (0.11.1)
rb-fsevent (0.11.2)
rb-inotify (0.10.1)
ffi (~> 1.0)
regexp_parser (2.5.0)
regexp_parser (2.6.0)
responders (3.0.1)
actionpack (>= 5.0)
railties (>= 5.0)
Expand All @@ -210,7 +204,7 @@ GEM
rexml (3.2.5)
rspec-core (3.11.0)
rspec-support (~> 3.11.0)
rspec-expectations (3.11.0)
rspec-expectations (3.11.1)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.11.0)
rspec-mocks (3.11.1)
Expand All @@ -224,25 +218,26 @@ GEM
rspec-expectations (~> 3.10)
rspec-mocks (~> 3.10)
rspec-support (~> 3.10)
rspec-support (3.11.0)
rubocop (1.31.0)
rspec-support (3.11.1)
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.18.0)
rubocop-ast (1.21.0)
parser (>= 3.1.1.0)
ruby-graphviz (1.2.5)
rexml
ruby-next-core (0.15.1)
ruby-next-core (0.15.2)
ruby-progressbar (1.11.0)
shoulda-matchers (5.1.0)
shoulda-matchers (5.2.0)
activesupport (>= 5.2.0)
solargraph (0.45.0)
solargraph (0.47.2)
backport (~> 1.2)
benchmark
bundler (>= 1.17.2)
Expand All @@ -257,17 +252,16 @@ GEM
thor (~> 1.0)
tilt (~> 2.0)
yard (~> 0.9, >= 0.9.24)
spring (2.1.1)
spring-watcher-listen (2.0.1)
spring (4.1.0)
spring-watcher-listen (2.1.0)
listen (>= 2.7, < 4.0)
spring (>= 1.2, < 3.0)
strscan (3.0.3)
spring (>= 4)
thor (1.2.1)
tilt (2.0.10)
tilt (2.0.11)
timeout (0.3.0)
tzinfo (2.0.4)
tzinfo (2.0.5)
concurrent-ruby (~> 1.0)
unicode-display_width (2.2.0)
unicode-display_width (2.3.0)
warden (1.2.9)
rack (>= 2.0.9)
webrick (1.7.0)
Expand All @@ -276,7 +270,7 @@ GEM
websocket-extensions (0.1.5)
yard (0.9.28)
webrick (~> 1.7.0)
zeitwerk (2.6.0)
zeitwerk (2.6.1)

PLATFORMS
ruby
Expand Down Expand Up @@ -310,7 +304,7 @@ DEPENDENCIES
tzinfo-data

RUBY VERSION
ruby 3.1.2p20
ruby 3.1.1p18

BUNDLED WITH
2.3.16
4 changes: 2 additions & 2 deletions api/app/controllers/graphql_controller.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ def execute
variables = ensure_hash(params[:variables])
query = params[:query]
operation_name = params[:operationName]
result = ApiSchema.execute(query, variables: variables, context: context, operation_name: operation_name)
result = ApiSchema.execute(query, variables:, context:, operation_name:)
render json: result
rescue StandardError => e
raise e unless Rails.env.development?
Expand All @@ -23,7 +23,7 @@ def execute

def context
{
current_user: current_user
current_user:
}
end

Expand Down
Loading

1 comment on commit cc58207

@vercel
Copy link

@vercel vercel bot commented on cc58207 Oct 2, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Successfully deployed to the following URLs:

realworld – ./

realworld-git-master-lifeiscontent.vercel.app
realworld.vercel.app
realworld-lifeiscontent.vercel.app

Please sign in to comment.