tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into glitch-soc/merge-upstream

Browse Source 
Conflicts:
	app/javascript/packs/public.js

Changes made to app/javascript/packs/publics.js were applied to
app/javascript/core/settings.js
This commit is contained in:
Thibaut Girka
2018-10-09 21:08:26 +02:00
parent 269edc0e48 46e4a759bb
commit a02244f17c
7 changed files with 50 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Gemfile
View File

@@ -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'