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 
Conflicts:
- Gemfile.lock
- config/webpack/rules/css.js
- package.json
- yarn.lock
This commit is contained in:
Thibaut Girka
2019-06-03 14:54:30 +02:00
parent 35c4ff07f4 f2f5c1bd6d
commit 76918554a6
18 changed files with 896 additions and 846 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Gemfile
View File

@@ -131,7 +131,7 @@ group :development do
gem 'letter_opener', '~> 1.7'
gem 'letter_opener_web', '~> 1.3'
gem 'memory_profiler'
gem 'rubocop', '~> 0.70', require: false
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