From c6a2e97678f72b679a3bd36d4aa8e6bcdf3cc13f Mon Sep 17 00:00:00 2001 From: Sam Wolfson Date: Sat, 23 Jun 2018 14:03:39 -0700 Subject: [PATCH] Update Rails version to fix vuln with sprockets --- .idea/braintrust-bot-rails.iml | 34 ++++++----- Gemfile | 1 + Gemfile.lock | 6 +- config/secrets.yml | 21 ++++--- spec/examples.txt | 102 ++++++++++++++++----------------- 5 files changed, 86 insertions(+), 78 deletions(-) diff --git a/.idea/braintrust-bot-rails.iml b/.idea/braintrust-bot-rails.iml index 8688cac..e5a5ae1 100644 --- a/.idea/braintrust-bot-rails.iml +++ b/.idea/braintrust-bot-rails.iml @@ -25,20 +25,22 @@ - - - - + + + + - - - - + + + + + - + + @@ -66,8 +68,10 @@ + + @@ -76,15 +80,15 @@ - + - + - + @@ -101,7 +105,7 @@ - + @@ -111,10 +115,10 @@ - + - + diff --git a/Gemfile b/Gemfile index b4931d7..14594ba 100644 --- a/Gemfile +++ b/Gemfile @@ -5,6 +5,7 @@ git_source(:github) do |repo_name| "https://github.com/#{repo_name}.git" end +ruby '~> 2.5.1' # Bundle edge Rails instead: gem 'rails', github: 'rails/rails' gem 'rails', '~> 5.1.6' diff --git a/Gemfile.lock b/Gemfile.lock index ba7dbcd..eb55d46 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -132,7 +132,7 @@ GEM nokogiri (1.8.3) mini_portile2 (~> 2.3.0) orm_adapter (0.5.0) - pg (0.21.0) + pg (1.0.0) polyamorous (1.3.3) activerecord (>= 3.0) puma (3.11.4) @@ -209,7 +209,7 @@ GEM spring-watcher-listen (2.0.1) listen (>= 2.7, < 4.0) spring (>= 1.2, < 3.0) - sprockets (3.7.1) + sprockets (3.7.2) concurrent-ruby (~> 1.0) rack (> 1, < 3) sprockets-rails (3.2.1) @@ -229,7 +229,7 @@ GEM turbolinks-source (5.1.0) tzinfo (1.2.5) thread_safe (~> 0.1) - uglifier (4.1.11) + uglifier (4.1.12) execjs (>= 0.3.0, < 3) warden (1.2.7) rack (>= 1.0) diff --git a/config/secrets.yml b/config/secrets.yml index 6923f2a..45f47fd 100644 --- a/config/secrets.yml +++ b/config/secrets.yml @@ -20,16 +20,18 @@ development: secret_key_base: 4c552521c3989e16bef5acb5bb1ad5e46eeb04a0d16e23c5cc3688d20c86b0bf1688604a0ee0017ebd0d7a2a770c7539e1317a31c2992c90295ae8bec00be5da telegram: - bot: - token: <%= ENV['BOT_TOKEN'] %> - username: <%= ENV['BOT_NAME'] %> + bots: + default: + token: <%= ENV['BOT_TOKEN'] %> + username: <%= ENV['BOT_NAME'] %> test: secret_key_base: 3090ff0f692db35ff2571335be6aa8f6fc7ed820dcb1eab7e899089f9000f7d4c415aa4fe64f800b94bbc4880e24a3a0c7c6c07fef7d7629bf7e8c1054d2eea3 telegram: - bot: - token: '123456' - username: 'TestBot' + bots: + default: + token: '123456' + username: 'TestBot' # Do not keep production secrets in the unencrypted secrets file. # Instead, either read values from the environment. # Or, use `bin/rails secrets:setup` to configure encrypted secrets @@ -38,6 +40,7 @@ test: production: secret_key_base: <%= ENV["SECRET_KEY_BASE"] %> telegram: - bot: - token: <%= ENV['BOT_TOKEN'] %> - username: <%= ENV['BOT_NAME'] %> \ No newline at end of file + bots: + default: + token: <%= ENV['BOT_TOKEN'] %> + username: <%= ENV['BOT_NAME'] %> \ No newline at end of file diff --git a/spec/examples.txt b/spec/examples.txt index e77bfe8..4b5284f 100644 --- a/spec/examples.txt +++ b/spec/examples.txt @@ -1,53 +1,53 @@ example_id | status | run_time | ---------------------------------------------- | ------ | --------------- | -./spec/requests/alexa_spec.rb[1:1:1] | passed | 0.08268 seconds | -./spec/requests/alexa_spec.rb[1:1:2] | passed | 0.04196 seconds | -./spec/requests/alexa_spec.rb[1:1:3] | passed | 0.04638 seconds | -./spec/requests/alexa_spec.rb[1:1:4] | passed | 0.146 seconds | -./spec/requests/bot_controller_spec.rb[1:1:1] | passed | 0.07929 seconds | -./spec/requests/bot_controller_spec.rb[1:1:2] | passed | 0.1896 seconds | -./spec/requests/bot_controller_spec.rb[1:1:3] | passed | 0.09608 seconds | -./spec/requests/bot_controller_spec.rb[1:1:4] | passed | 0.08182 seconds | -./spec/requests/bot_controller_spec.rb[1:1:5] | passed | 0.18299 seconds | -./spec/requests/bot_controller_spec.rb[1:1:6] | passed | 0.12255 seconds | -./spec/requests/bot_controller_spec.rb[1:1:7] | passed | 0.19072 seconds | -./spec/requests/bot_controller_spec.rb[1:1:8] | passed | 0.15427 seconds | -./spec/requests/bot_controller_spec.rb[1:1:9] | passed | 0.07001 seconds | -./spec/requests/bot_controller_spec.rb[1:1:10] | passed | 0.09776 seconds | -./spec/requests/bot_controller_spec.rb[1:1:11] | passed | 0.1476 seconds | -./spec/requests/bot_controller_spec.rb[1:1:12] | passed | 0.18317 seconds | -./spec/requests/bot_controller_spec.rb[1:1:13] | passed | 0.14926 seconds | -./spec/requests/bot_controller_spec.rb[1:1:14] | passed | 0.15036 seconds | -./spec/requests/bot_controller_spec.rb[1:1:15] | passed | 0.09508 seconds | -./spec/requests/bot_controller_spec.rb[1:2:1] | passed | 0.33906 seconds | -./spec/requests/bot_controller_spec.rb[1:2:2] | passed | 0.31009 seconds | -./spec/requests/bot_controller_spec.rb[1:2:3] | passed | 0.04895 seconds | -./spec/requests/bot_controller_spec.rb[1:2:4] | passed | 0.33286 seconds | -./spec/requests/bot_controller_spec.rb[1:3:1] | passed | 0.1174 seconds | -./spec/requests/bot_controller_spec.rb[1:3:2] | passed | 0.07066 seconds | -./spec/requests/bot_controller_spec.rb[1:3:3] | passed | 0.25492 seconds | -./spec/requests/bot_controller_spec.rb[1:3:4] | passed | 0.11082 seconds | -./spec/requests/bot_controller_spec.rb[1:3:5] | passed | 0.12373 seconds | -./spec/requests/bot_controller_spec.rb[1:3:6] | passed | 0.12169 seconds | -./spec/requests/bot_controller_spec.rb[1:3:7] | passed | 0.07719 seconds | -./spec/requests/bot_controller_spec.rb[1:4:1] | passed | 0.7216 seconds | -./spec/requests/bot_controller_spec.rb[1:4:2] | passed | 0.11084 seconds | -./spec/requests/bot_controller_spec.rb[1:4:3] | passed | 0.04832 seconds | -./spec/requests/bot_controller_spec.rb[1:5:1] | passed | 0.16489 seconds | -./spec/requests/bot_controller_spec.rb[1:5:2] | passed | 0.28704 seconds | -./spec/requests/bot_controller_spec.rb[1:5:3] | passed | 0.21249 seconds | -./spec/requests/bot_controller_spec.rb[1:6:1] | passed | 0.1889 seconds | -./spec/requests/bot_controller_spec.rb[1:6:2] | passed | 0.1703 seconds | -./spec/requests/bot_controller_spec.rb[1:6:3] | passed | 0.12773 seconds | -./spec/requests/bot_controller_spec.rb[1:6:4] | passed | 0.12611 seconds | -./spec/requests/bot_controller_spec.rb[1:7:1] | passed | 0.12815 seconds | -./spec/requests/bot_controller_spec.rb[1:7:2] | passed | 0.15164 seconds | -./spec/requests/bot_controller_spec.rb[1:7:3] | passed | 0.27521 seconds | -./spec/requests/bot_controller_spec.rb[1:8:1] | passed | 0.09776 seconds | -./spec/requests/bot_controller_spec.rb[1:8:2] | passed | 0.11386 seconds | -./spec/requests/bot_controller_spec.rb[1:9:1] | passed | 0.12174 seconds | -./spec/requests/helpers_spec.rb[1:1:1] | passed | 0.00077 seconds | -./spec/requests/helpers_spec.rb[1:1:2] | passed | 0.34536 seconds | -./spec/requests/helpers_spec.rb[1:1:3] | passed | 0.00096 seconds | -./spec/requests/helpers_spec.rb[1:1:4] | passed | 0.00072 seconds | -./spec/requests/helpers_spec.rb[1:1:5] | passed | 0.00102 seconds | +./spec/requests/alexa_spec.rb[1:1:1] | passed | 0.08214 seconds | +./spec/requests/alexa_spec.rb[1:1:2] | passed | 0.00839 seconds | +./spec/requests/alexa_spec.rb[1:1:3] | passed | 0.0579 seconds | +./spec/requests/alexa_spec.rb[1:1:4] | passed | 0.05811 seconds | +./spec/requests/bot_controller_spec.rb[1:1:1] | passed | 0.02187 seconds | +./spec/requests/bot_controller_spec.rb[1:1:2] | passed | 0.1026 seconds | +./spec/requests/bot_controller_spec.rb[1:1:3] | passed | 0.01733 seconds | +./spec/requests/bot_controller_spec.rb[1:1:4] | passed | 0.04519 seconds | +./spec/requests/bot_controller_spec.rb[1:1:5] | passed | 0.06155 seconds | +./spec/requests/bot_controller_spec.rb[1:1:6] | passed | 0.03112 seconds | +./spec/requests/bot_controller_spec.rb[1:1:7] | passed | 0.06919 seconds | +./spec/requests/bot_controller_spec.rb[1:1:8] | passed | 0.03539 seconds | +./spec/requests/bot_controller_spec.rb[1:1:9] | passed | 0.04722 seconds | +./spec/requests/bot_controller_spec.rb[1:1:10] | passed | 0.0361 seconds | +./spec/requests/bot_controller_spec.rb[1:1:11] | passed | 0.05554 seconds | +./spec/requests/bot_controller_spec.rb[1:1:12] | passed | 0.05319 seconds | +./spec/requests/bot_controller_spec.rb[1:1:13] | passed | 0.22196 seconds | +./spec/requests/bot_controller_spec.rb[1:1:14] | passed | 0.04497 seconds | +./spec/requests/bot_controller_spec.rb[1:1:15] | passed | 0.04904 seconds | +./spec/requests/bot_controller_spec.rb[1:2:1] | passed | 0.08711 seconds | +./spec/requests/bot_controller_spec.rb[1:2:2] | passed | 0.12027 seconds | +./spec/requests/bot_controller_spec.rb[1:2:3] | passed | 0.01859 seconds | +./spec/requests/bot_controller_spec.rb[1:2:4] | passed | 0.08978 seconds | +./spec/requests/bot_controller_spec.rb[1:3:1] | passed | 0.02232 seconds | +./spec/requests/bot_controller_spec.rb[1:3:2] | passed | 0.0174 seconds | +./spec/requests/bot_controller_spec.rb[1:3:3] | passed | 0.04118 seconds | +./spec/requests/bot_controller_spec.rb[1:3:4] | passed | 0.04207 seconds | +./spec/requests/bot_controller_spec.rb[1:3:5] | passed | 0.02629 seconds | +./spec/requests/bot_controller_spec.rb[1:3:6] | passed | 0.03239 seconds | +./spec/requests/bot_controller_spec.rb[1:3:7] | passed | 0.03868 seconds | +./spec/requests/bot_controller_spec.rb[1:4:1] | passed | 0.22396 seconds | +./spec/requests/bot_controller_spec.rb[1:4:2] | passed | 0.02533 seconds | +./spec/requests/bot_controller_spec.rb[1:4:3] | passed | 0.01652 seconds | +./spec/requests/bot_controller_spec.rb[1:5:1] | passed | 0.0413 seconds | +./spec/requests/bot_controller_spec.rb[1:5:2] | passed | 0.04422 seconds | +./spec/requests/bot_controller_spec.rb[1:5:3] | passed | 0.05424 seconds | +./spec/requests/bot_controller_spec.rb[1:6:1] | passed | 0.05825 seconds | +./spec/requests/bot_controller_spec.rb[1:6:2] | passed | 0.04592 seconds | +./spec/requests/bot_controller_spec.rb[1:6:3] | passed | 0.02534 seconds | +./spec/requests/bot_controller_spec.rb[1:6:4] | passed | 0.016 seconds | +./spec/requests/bot_controller_spec.rb[1:7:1] | passed | 0.03478 seconds | +./spec/requests/bot_controller_spec.rb[1:7:2] | passed | 0.0304 seconds | +./spec/requests/bot_controller_spec.rb[1:7:3] | passed | 0.0301 seconds | +./spec/requests/bot_controller_spec.rb[1:8:1] | passed | 0.02612 seconds | +./spec/requests/bot_controller_spec.rb[1:8:2] | passed | 0.02637 seconds | +./spec/requests/bot_controller_spec.rb[1:9:1] | passed | 0.05841 seconds | +./spec/requests/helpers_spec.rb[1:1:1] | passed | 0.00061 seconds | +./spec/requests/helpers_spec.rb[1:1:2] | passed | 0.00096 seconds | +./spec/requests/helpers_spec.rb[1:1:3] | passed | 0.00079 seconds | +./spec/requests/helpers_spec.rb[1:1:4] | passed | 0.00061 seconds | +./spec/requests/helpers_spec.rb[1:1:5] | passed | 0.00064 seconds |