about summary refs log tree commit diff
path: root/Gemfile
diff options
context:
space:
mode:
authorThibaut Girka <thib@sitedethib.com>2018-10-09 21:08:26 +0200
committerThibaut Girka <thib@sitedethib.com>2018-10-09 21:08:26 +0200
commita02244f17c841f641c9ed289fb592b73fecf472d (patch)
tree39a682cbdd9307bd437f6cbf4eda3430cac87bc6 /Gemfile
parent269edc0e48886ea90455283f08a646c86387cfbc (diff)
parent46e4a759bbe0e78fdbb4c1573a404bd4b531315a (diff)
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
	app/javascript/packs/public.js

Changes made to app/javascript/packs/publics.js were applied to
app/javascript/core/settings.js
Diffstat (limited to 'Gemfile')
-rw-r--r--Gemfile6
1 files changed, 3 insertions, 3 deletions
diff --git a/Gemfile b/Gemfile
index d77a29b79..7474efb3a 100644
--- a/Gemfile
+++ b/Gemfile
@@ -13,7 +13,7 @@ gem 'hamlit-rails', '~> 0.2'
 gem 'pg', '~> 1.1'
 gem 'makara', '~> 0.4'
 gem 'pghero', '~> 2.2'
-gem 'dotenv-rails', '~> 2.2', '< 2.3'
+gem 'dotenv-rails', '~> 2.5'
 
 gem 'aws-sdk-s3', '~> 1.21', require: false
 gem 'fog-core', '~> 2.1'
@@ -109,7 +109,7 @@ end
 group :test do
   gem 'capybara', '~> 3.9'
   gem 'climate_control', '~> 0.2'
-  gem 'faker', '~> 1.8'
+  gem 'faker', '~> 1.9'
   gem 'microformats', '~> 4.0'
   gem 'rails-controller-testing', '~> 1.0'
   gem 'rspec-sidekiq', '~> 3.0'
@@ -133,7 +133,7 @@ group :development do
   gem 'scss_lint', '~> 0.57', require: false
 
   gem 'capistrano', '~> 3.11'
-  gem 'capistrano-rails', '~> 1.3'
+  gem 'capistrano-rails', '~> 1.4'
   gem 'capistrano-rbenv', '~> 2.1'
   gem 'capistrano-yarn', '~> 2.0'