Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Snyk] Fix for 1 vulnerabilities #123

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,9 @@ end

group :development do
gem "listen"
gem "rubocop"
gem "rubocop-performance"
gem "rubocop-rails"
gem "rubocop", ">= 1.27.0"
gem "rubocop-performance", ">= 1.14.0"
gem "rubocop-rails", ">= 2.15.0"
gem "spring"
gem "web-console"
end
Expand Down
61 changes: 34 additions & 27 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ GEM
bindex (0.8.1)
builder (3.2.4)
byebug (11.1.3)
concurrent-ruby (1.1.10)
concurrent-ruby (1.3.3)
connection_pool (2.2.5)
crass (1.0.6)
dalli (3.2.1)
Expand Down Expand Up @@ -120,14 +120,16 @@ GEM
globalid (1.0.0)
activesupport (>= 5.0)
hashie (5.0.0)
i18n (1.10.0)
i18n (1.14.5)
concurrent-ruby (~> 1.0)
jquery-rails (4.4.0)
rails-dom-testing (>= 1, < 3)
railties (>= 4.2.0)
thor (>= 0.14, < 2.0)
json (2.7.2)
jwt (2.3.0)
kgio (2.11.4)
language_server-protocol (3.17.0.3)
listen (3.7.1)
rb-fsevent (~> 0.10, >= 0.10.3)
rb-inotify (~> 0.9, >= 0.9.10)
Expand All @@ -141,7 +143,7 @@ GEM
method_source (1.0.0)
mini_mime (1.1.2)
mini_portile2 (2.8.0)
minitest (5.15.0)
minitest (5.24.1)
multi_json (1.15.0)
multi_xml (0.6.0)
multipart-post (2.1.1)
Expand Down Expand Up @@ -191,15 +193,16 @@ GEM
actionpack (>= 4.2)
omniauth (~> 2.0)
orm_adapter (0.5.0)
parallel (1.22.1)
parser (3.1.1.0)
parallel (1.25.1)
parser (3.3.4.0)
ast (~> 2.4.1)
racc
pg (1.3.5)
public_suffix (4.0.6)
puma (5.6.4)
nio4r (~> 2.0)
racc (1.6.0)
rack (2.2.3)
rack (2.2.9)
rack-cache (1.13.0)
rack (>= 0.4)
rack-host-redirect (1.3.0)
Expand Down Expand Up @@ -239,31 +242,35 @@ GEM
rb-fsevent (0.11.1)
rb-inotify (0.10.1)
ffi (~> 1.0)
regexp_parser (2.2.1)
regexp_parser (2.9.2)
responders (3.0.1)
actionpack (>= 5.0)
railties (>= 5.0)
rexml (3.2.5)
rexml (3.3.2)
strscan
rtl (0.4.0)
rubocop (1.26.1)
rubocop (1.65.0)
json (~> 2.3)
language_server-protocol (>= 3.17.0)
parallel (~> 1.10)
parser (>= 3.1.0.0)
parser (>= 3.3.0.2)
rainbow (>= 2.2.2, < 4.0)
regexp_parser (>= 1.8, < 3.0)
rexml
rubocop-ast (>= 1.16.0, < 2.0)
regexp_parser (>= 2.4, < 3.0)
rexml (>= 3.2.5, < 4.0)
rubocop-ast (>= 1.31.1, < 2.0)
ruby-progressbar (~> 1.7)
unicode-display_width (>= 1.4.0, < 3.0)
rubocop-ast (1.16.0)
parser (>= 3.1.1.0)
rubocop-performance (1.13.3)
rubocop (>= 1.7.0, < 2.0)
rubocop-ast (>= 0.4.0)
rubocop-rails (2.14.2)
unicode-display_width (>= 2.4.0, < 3.0)
rubocop-ast (1.31.3)
parser (>= 3.3.1.0)
rubocop-performance (1.21.1)
rubocop (>= 1.48.1, < 2.0)
rubocop-ast (>= 1.31.1, < 2.0)
rubocop-rails (2.25.1)
activesupport (>= 4.2.0)
rack (>= 1.1)
rubocop (>= 1.7.0, < 2.0)
ruby-progressbar (1.11.0)
rubocop (>= 1.33.0, < 2.0)
rubocop-ast (>= 1.31.1, < 2.0)
ruby-progressbar (1.13.0)
ruby2_keywords (0.0.5)
sassc (2.4.0)
ffi (~> 1.9)
Expand Down Expand Up @@ -299,11 +306,11 @@ GEM
turbolinks (5.2.1)
turbolinks-source (~> 5.2)
turbolinks-source (5.2.0)
tzinfo (2.0.4)
tzinfo (2.0.6)
concurrent-ruby (~> 1.0)
uglifier (4.2.0)
execjs (>= 0.3.0, < 3)
unicode-display_width (2.1.0)
unicode-display_width (2.5.0)
vcr (6.1.0)
warden (1.2.9)
rack (>= 2.0.9)
Expand Down Expand Up @@ -342,9 +349,9 @@ DEPENDENCIES
rack-host-redirect
rails (~> 7.0)
rtl
rubocop
rubocop-performance
rubocop-rails
rubocop (>= 1.27.0)
rubocop-performance (>= 1.14.0)
rubocop-rails (>= 2.15.0)
sassc-rails
simplecov
sitemap_generator
Expand Down
4 changes: 2 additions & 2 deletions app/controllers/users_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -168,8 +168,8 @@ def octokit
if current_user && !Rails.env.test?
config.access_token = current_user.oauth_token
else
config.client_id = ENV["github_client_id"]
config.client_secret = ENV["github_client_secret"]
config.client_id = ENV.fetch("github_client_id", nil)
config.client_secret = ENV.fetch("github_client_secret", nil)
end
end
client
Expand Down
8 changes: 4 additions & 4 deletions config/environments/production.rb
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
config.public_file_server.headers = {
"Cache-Control" => "public, max-age=31536000",
# 6 months from now
"Expires" => (DateTime.now + 180.days).to_datetime.to_formatted_s(:rfc822),
"Expires" => (DateTime.now + 180.days).to_datetime.to_fs(:rfc822),
}

# `config.assets.precompile` and `config.assets.version` have moved to config/initializers/assets.rb
Expand Down Expand Up @@ -59,8 +59,8 @@
# Use a memcached cache store in production.
client = Dalli::Client.new \
(ENV["MEMCACHIER_SERVERS"] || "").split(","),
username: ENV["MEMCACHIER_USERNAME"],
password: ENV["MEMCACHIER_PASSWORD"],
username: ENV.fetch("MEMCACHIER_USERNAME", nil),
password: ENV.fetch("MEMCACHIER_PASSWORD", nil),
failover: true,
socket_timeout: 1.5,
socket_failure_delay: 0.2,
Expand Down Expand Up @@ -89,7 +89,7 @@
config.active_support.deprecation = :notify

# Use default logging formatter so that PID and timestamp are not suppressed.
config.log_formatter = ::Logger::Formatter.new
config.log_formatter = Logger::Formatter.new

# Use a different logger for distributed setups.
# require 'syslog/logger'
Expand Down
4 changes: 2 additions & 2 deletions config/initializers/devise.rb
Original file line number Diff line number Diff line change
Expand Up @@ -248,8 +248,8 @@
# Add a new OmniAuth provider. Check the wiki for more information on setting
# up on your models and hooks.
config.omniauth :github,
ENV["github_client_id"],
ENV["github_client_secret"],
ENV.fetch("github_client_id", nil),
ENV.fetch("github_client_secret", nil),
scope: ""

# ==> Warden configuration
Expand Down