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
This commit is contained in:
Thibaut Girka
2019-05-15 17:11:40 +02:00
parent cd534830ad f4f22391b2
commit 6badf2d252
39 changed files with 271 additions and 155 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Gemfile
View File

@@ -109,7 +109,7 @@ group :production, :test do
end
group :test do
gem 'capybara', '~> 3.18'
gem 'capybara', '~> 3.19'
gem 'climate_control', '~> 0.2'
gem 'faker', '~> 1.9'
gem 'microformats', '~> 4.1'
@@ -129,7 +129,7 @@ group :development do
gem 'letter_opener', '~> 1.7'
gem 'letter_opener_web', '~> 1.3'
gem 'memory_profiler'
gem 'rubocop', '~> 0.68', require: false
gem 'rubocop', '~> 0.69', require: false
gem 'brakeman', '~> 4.5', require: false
gem 'bundler-audit', '~> 0.6', require: false
gem 'scss_lint', '~> 0.58', require: false