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.

Sign up for GitHub

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

Updates multiple gems recommended by dependabot #746

Merged
merged 1 commit into from
May 7, 2018
Merged

Updates multiple gems recommended by dependabot #746

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 5 additions & 5 deletions Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ source "https://rubygems.org"

ruby RUBY_VERSION

gem "rails", "~> 5.1"
gem "rails", "~> 5.1"
gem "rails-i18n", "~> 5.1"

gem "jbuilder", "~> 2.6"
Expand Down Expand Up @@ -43,9 +43,9 @@ end

group :development do
gem "faker", "~> 1.8"
gem "i18n-tasks", "0.9.20"
gem "i18n-tasks", "~> 0.9"
gem "listen", "~> 3.1"
gem "localeapp", "~> 2.4"
gem "localeapp", "~> 3.0"

# deploy
gem "capistrano", "~> 3.10"
Expand All @@ -70,9 +70,9 @@ gem "omniauth-google-oauth2", "0.5.3"
# Image processing in the background. @todo Properly reenable it
# gem 'delayed_paperclip'

gem "paperclip", "~> 5.2"
gem "paperclip", "~> 6.0"
gem "pundit", "~> 1.1"
gem "recaptcha", "~> 4.6", require: "recaptcha/rails"
gem "recaptcha", "~> 4.7", require: "recaptcha/rails"

# Admin backend.
# @todo Get rid of this, possibly by completely ditching activeadmin and
Expand Down
67 changes: 33 additions & 34 deletions Gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,10 +68,10 @@ GEM
autoprefixer-rails (>= 5.2.1)
sass (>= 3.3.4)
builder (3.2.3)
bullet (5.7.3)
bullet (5.7.5)
activesupport (>= 3.0.0)
uniform_notifier (~> 1.11.0)
byebug (10.0.0)
byebug (10.0.2)
capistrano (3.10.1)
airbrussh (>= 1.0.0)
i18n
Expand All @@ -98,8 +98,6 @@ GEM
xpath (>= 2.0, < 4.0)
climate_control (0.2.0)
cliver (0.3.2)
cocaine (0.5.8)
climate_control (>= 0.0.3, < 1.0)
coffee-rails (4.2.2)
coffee-script (>= 2.2.0)
railties (>= 4.0.0)
Expand All @@ -111,15 +109,15 @@ GEM
connection_pool (2.2.1)
crack (0.4.3)
safe_yaml (~> 1.0.0)
crass (1.0.3)
crass (1.0.4)
database_cleaner (1.6.2)
devise (4.4.1)
devise (4.4.3)
bcrypt (~> 3.0)
orm_adapter (~> 0.1)
railties (>= 4.1.0, < 5.2)
railties (>= 4.1.0, < 6.0)
responders
warden (~> 1.2.3)
domain_name (0.5.20170404)
domain_name (0.5.20180417)
unf (>= 0.0.5, < 1.0.0)
dotenv (2.2.1)
dotenv-rails (2.2.1)
Expand All @@ -143,7 +141,7 @@ GEM
formtastic (3.1.5)
actionpack (>= 3.2.13)
formtastic_i18n (0.6.0)
gli (2.16.1)
gli (2.17.1)
globalid (0.4.1)
activesupport (>= 4.2.0)
has_scope (0.7.1)
Expand All @@ -155,17 +153,17 @@ GEM
http-cookie (1.0.3)
domain_name (~> 0.5)
http_accept_language (2.1.1)
i18n (0.9.5)
i18n (1.0.1)
concurrent-ruby (~> 1.0)
i18n-tasks (0.9.20)
i18n-tasks (0.9.21)
activesupport (>= 4.0.2)
ast (>= 2.1.0)
easy_translate (>= 0.5.1)
erubi
highline (>= 1.7.3)
i18n
parser (>= 2.2.3.0)
rainbow (~> 2.2)
rainbow (>= 2.2.2, < 4.0)
terminal-table (>= 1.5.1)
inherited_resources (1.8.0)
actionpack (>= 4.2, <= 5.2)
Expand Down Expand Up @@ -199,11 +197,11 @@ GEM
rb-fsevent (~> 0.9, >= 0.9.4)
rb-inotify (~> 0.9, >= 0.9.7)
ruby_dep (~> 1.2)
localeapp (2.4.0)
localeapp (3.1.0)
gli
i18n (~> 0.4)
json
rest-client
i18n (>= 0.7, < 2)
json (>= 1.7.7)
rest-client (>= 1.8.0)
loofah (2.2.2)
crass (~> 1.0.2)
nokogiri (>= 1.5.9)
Expand Down Expand Up @@ -251,15 +249,15 @@ GEM
oauth2 (~> 1.1)
omniauth (~> 1.2)
orm_adapter (0.5.0)
paperclip (5.2.1)
paperclip (6.0.0)
activemodel (>= 4.2.0)
activesupport (>= 4.2.0)
cocaine (~> 0.5.5)
mime-types
mimemagic (~> 0.3.0)
terrapin (~> 0.6.0)
parallel (1.12.1)
parser (2.4.0.2)
ast (~> 2.3)
parser (2.5.1.0)
ast (~> 2.4.0)
pg (0.21.0)
poltergeist (1.17.0)
capybara (~> 2.1)
Expand All @@ -271,8 +269,8 @@ GEM
public_suffix (3.0.2)
pundit (1.1.0)
activesupport (>= 3.0.0)
rack (2.0.4)
rack-protection (2.0.0)
rack (2.0.5)
rack-protection (2.0.1)
rack
rack-test (1.0.0)
rack (>= 1.0, < 3)
Expand All @@ -297,7 +295,7 @@ GEM
nokogiri (>= 1.6)
rails-html-sanitizer (1.0.4)
loofah (~> 2.2, >= 2.2.2)
rails-i18n (5.1.0)
rails-i18n (5.1.1)
i18n (>= 0.7, < 2)
railties (>= 5.0, < 6)
railties (5.1.6)
Expand All @@ -306,8 +304,7 @@ GEM
method_source
rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0)
rainbow (2.2.2)
rake
rainbow (3.0.0)
rake (12.3.1)
ransack (1.8.6)
actionpack (>= 3.0)
Expand All @@ -318,7 +315,7 @@ GEM
rb-fsevent (0.10.2)
rb-inotify (0.9.10)
ffi (>= 0.5.0, < 2)
recaptcha (4.6.4)
recaptcha (4.8.0)
json
record_tag_helper (1.0.0)
actionview (~> 5.x)
Expand Down Expand Up @@ -369,7 +366,7 @@ GEM
sprockets (>= 2.8, < 4.0)
sprockets-rails (>= 2.0, < 4.0)
tilt (>= 1.1, < 3)
sidekiq (5.1.1)
sidekiq (5.1.3)
concurrent-ruby (~> 1.0)
connection_pool (~> 2.2, >= 2.2.0)
rack-protection (>= 1.5.0)
Expand All @@ -388,18 +385,20 @@ GEM
net-ssh (>= 2.8.0)
terminal-table (1.8.0)
unicode-display_width (~> 1.1, >= 1.1.1)
terrapin (0.6.0)
climate_control (>= 0.0.3, < 1.0)
thor (0.20.0)
thread (0.2.2)
thread_safe (0.3.6)
tilt (2.0.8)
tzinfo (1.2.5)
thread_safe (~> 0.1)
uglifier (4.1.6)
uglifier (4.1.10)
execjs (>= 0.3.0, < 3)
unf (0.1.4)
unf_ext
unf_ext (0.0.7.4)
unicode-display_width (1.3.0)
unf_ext (0.0.7.5)
unicode-display_width (1.3.2)
uniform_notifier (1.11.0)
vcr (4.0.0)
warden (1.2.7)
Expand Down Expand Up @@ -434,27 +433,27 @@ DEPENDENCIES
factory_bot_rails (~> 4.8)
faker (~> 1.8)
http_accept_language (~> 2.1)
i18n-tasks (= 0.9.20)
i18n-tasks (~> 0.9)
jbuilder (~> 2.6)
jquery-rails (~> 4.3)
kaminari (~> 1.1)
launchy (~> 2.4)
listen (~> 3.1)
localeapp (~> 2.4)
localeapp (~> 3.0)
maxminddb (= 0.1.15)
minitest-hooks (~> 1.4)
minitest-spec-rails (~> 5.4)
omniauth (~> 1.8)
omniauth-facebook (~> 4.0)
omniauth-google-oauth2 (= 0.5.3)
paperclip (~> 5.2)
paperclip (~> 6.0)
pg (= 0.21.0)
poltergeist (~> 1.17)
pundit (~> 1.1)
rails (~> 5.1)
rails-controller-testing (~> 1.0)
rails-i18n (~> 5.1)
recaptcha (~> 4.6)
recaptcha (~> 4.7)
record_tag_helper (~> 1.0)
redis-rails (~> 5.0)
rest-client (~> 2.0)
Expand Down