Skip to content

Commit

Permalink
Merge pull request #1490 from Shopify/for_release_20-1-0
Browse files Browse the repository at this point in the history
Packaging for release 20.1.0
  • Loading branch information
mkevinosullivan committed Aug 22, 2022
2 parents b382c12 + bad5aaf commit 5e3a221
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 5 deletions.
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
Unreleased
----------

20.1.0 (August 22, 2022)
----------

* Set the appropriate CSP `frame-ancestor` directive in controllers using the `EmbeddedApp` concern. [#1474](https://github.com/Shopify/shopify_app/pull/1474)
* Allow [Cloudflare Tunnel](https://developers.cloudflare.com/cloudflare-one/connections/connect-apps/run-tunnel/trycloudflare/) hosts in `config/environments/development.rb`.
* Use [Cloudflare Tunnel](https://developers.cloudflare.com/cloudflare-one/connections/connect-apps/run-tunnel/trycloudflare/) as example tunnel in readme/docs.
Expand Down
6 changes: 3 additions & 3 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
PATH
remote: .
specs:
shopify_app (20.0.2)
shopify_app (20.1.0)
activeresource
browser_sniffer (~> 2.0)
jwt (>= 2.2.3)
Expand Down Expand Up @@ -124,7 +124,7 @@ GEM
nokogiri (1.13.4)
mini_portile2 (~> 2.8.0)
racc (~> 1.4)
oj (3.13.20)
oj (3.13.21)
openssl (3.0.0)
parallel (1.21.0)
parser (3.1.0.0)
Expand Down Expand Up @@ -204,7 +204,7 @@ GEM
securerandom
sorbet-runtime
zeitwerk (~> 2.5)
sorbet-runtime (0.5.10297)
sorbet-runtime (0.5.10354)
sprockets (4.1.1)
concurrent-ruby (~> 1.0)
rack (> 1, < 3)
Expand Down
2 changes: 1 addition & 1 deletion lib/shopify_app/version.rb
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# frozen_string_literal: true

module ShopifyApp
VERSION = "20.0.2"
VERSION = "20.1.0"
end
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "shopify_app",
"version": "20.0.2",
"version": "20.1.0",
"repository": "git@github.com:Shopify/shopify_app.git",
"author": "Shopify",
"license": "MIT",
Expand Down

0 comments on commit 5e3a221

Please sign in to comment.