Merge pull request #628 from haiafara/development

[release] 2020-08-31 - Reconfigure deploy for new server
haiafara · Aug 31, 2020 · 16ab5f7 · 16ab5f7
2 parents 9e4c4cd + 8060ebd
commit 16ab5f7
Show file tree

Hide file tree

Showing 7 changed files with 16 additions and 15 deletions.
diff --git a/.ruby-version b/.ruby-version
@@ -1 +1 @@
-ruby-2.6.6
+2.6.6
diff --git a/.travis.yml b/.travis.yml
@@ -19,7 +19,7 @@ script:
 - bundle exec rails webpacker:compile
 - bundle exec rspec
 before_deploy:
-- openssl aes-256-cbc -K $encrypted_545545218908_key -iv $encrypted_545545218908_iv
+  - openssl aes-256-cbc -K $encrypted_db2095f63ba3_key -iv $encrypted_db2095f63ba3_iv
   -in deploy_rsa.enc -out deploy_rsa -d
 - eval "$(ssh-agent -s)"
 - chmod 600 deploy_rsa

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -343,7 +343,7 @@ GEM
       childprocess (>= 0.5, < 4.0)
       rubyzip (>= 1.2.2)
     semantic_range (2.3.0)
-    sentry-raven (3.0.2)
+    sentry-raven (3.0.4)
       faraday (>= 1.0)
     shrine (3.2.2)
       content_disposition (~> 1.0)

diff --git a/config/initializers/sentry.rb b/config/initializers/sentry.rb
@@ -1,5 +1,6 @@
+# frozen_string_literal: true
+
 Raven.configure do |config|
-  config_file = "#{Rails.root.to_s}/config/sentry.yml"
-  config.dsn = File.exists?(config_file) ? YAML.load_file(config_file)['dsn'] : nil
+  config.dsn = ENV['SENTRY_DSN']
   config.sanitize_fields = Rails.application.config.filter_parameters.map(&:to_s)
 end
diff --git a/deploy_rsa.enc b/deploy_rsa.enc
diff --git a/package.json b/package.json
@@ -7,7 +7,7 @@
     "@babel/plugin-transform-runtime": "^7.10.5",
     "@babel/preset-env": "^7.10.3",
     "@rails/webpacker": "^5.2.1",
-    "caniuse-lite": "^1.0.30001118",
+    "caniuse-lite": "^1.0.30001119",
     "css-element-queries": "^1.2.3",
     "css-loader": "^3.6.0",
     "file-loader": "^6.0.0",
@@ -18,7 +18,7 @@
     "postcss-cssnext": "^3.1.0",
     "set-value": "^3.0.2",
     "style-loader": "^1.2.1",
-    "tailwindcss": "^1.7.5",
+    "tailwindcss": "^1.7.6",
     "typescript": "^3.9.7",
     "vue": "^2.6.12",
     "vue-it-bigger": "^0.0.2",

diff --git a/yarn.lock b/yarn.lock
@@ -1889,10 +1889,10 @@ caniuse-api@^3.0.0:
     lodash.memoize "^4.1.2"
     lodash.uniq "^4.5.0"
 
-caniuse-lite@^1.0.0, caniuse-lite@^1.0.30000792, caniuse-lite@^1.0.30000805, caniuse-lite@^1.0.30000981, caniuse-lite@^1.0.30001012, caniuse-lite@^1.0.30001043, caniuse-lite@^1.0.30001118:
-  version "1.0.30001118"
-  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001118.tgz#116a9a670e5264aec895207f5e918129174c6f62"
-  integrity sha512-RNKPLojZo74a0cP7jFMidQI7nvLER40HgNfgKQEJ2PFm225L0ectUungNQoK3Xk3StQcFbpBPNEvoWD59436Hg==
+caniuse-lite@^1.0.0, caniuse-lite@^1.0.30000792, caniuse-lite@^1.0.30000805, caniuse-lite@^1.0.30000981, caniuse-lite@^1.0.30001012, caniuse-lite@^1.0.30001043, caniuse-lite@^1.0.30001119:
+  version "1.0.30001119"
+  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001119.tgz#99185d04bc00e76a86c9ff731dc5ec8e53aefca1"
+  integrity sha512-Hpwa4obv7EGP+TjkCh/wVvbtNJewxmtg4yVJBLFnxo35vbPapBr138bUWENkb5j5L9JZJ9RXLn4OrXRG/cecPQ==
 
 case-sensitive-paths-webpack-plugin@^2.3.0:
   version "2.3.0"
@@ -8110,10 +8110,10 @@ table@^5.2.3:
     slice-ansi "^2.1.0"
     string-width "^3.0.0"
 
-tailwindcss@^1.7.5:
-  version "1.7.5"
-  resolved "https://registry.yarnpkg.com/tailwindcss/-/tailwindcss-1.7.5.tgz#4a54ffcc5691822cbc20416242e92505728f79b7"
-  integrity sha512-thDHLkRioJh0/62EFcEfQCCBEsZXpluehymrPzn8Hkycy8uI9svvtOqyWtcfkBPB0s5yb6R2tY9zPzh5mIr0Wg==
+tailwindcss@^1.7.6:
+  version "1.7.6"
+  resolved "https://registry.yarnpkg.com/tailwindcss/-/tailwindcss-1.7.6.tgz#77f294428e399fb570f4bebde2e9bef98456de8a"
+  integrity sha512-focAhU3ciM1/UYBHQVKKzede4zC3y9+IHzU2N/ZF6mbZbhY8S96lOxrO2Y6LMU08+Dbh2xBLmO1bsioLk3Egig==
   dependencies:
     "@fullhuman/postcss-purgecss" "^2.1.2"
     autoprefixer "^9.4.5"