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

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

Browse Source
This commit is contained in:
Thibaut Girka
2019-06-04 20:40:19 +02:00
parent 58946fef3c 48fee1a800
commit 02b56c7e1a
16 changed files with 952 additions and 365 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Gemfile
View File

@ -99,7 +99,7 @@ gem 'redcarpet', '~> 3.4'
group :development, :test do
gem 'fabrication', '~> 2.20'
gem 'fuubar', '~> 2.3'
gem 'fuubar', '~> 2.4'
gem 'i18n-tasks', '~> 0.9', require: false
gem 'pry-byebug', '~> 3.7'
gem 'pry-rails', '~> 0.3'
@ -134,7 +134,6 @@ group :development do
gem 'rubocop', '~> 0.71', require: false
gem 'brakeman', '~> 4.5', require: false
gem 'bundler-audit', '~> 0.6', require: false
gem 'scss_lint', '~> 0.58', require: false
gem 'capistrano', '~> 3.11'
gem 'capistrano-rails', '~> 1.4'