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
2020-01-13 13:14:35 +01:00
parent 7ab12b7654 3287ec8ca3
commit 83f8bf48d9
75 changed files with 311 additions and 245 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Gemfile.lock
View File

@@ -430,7 +430,7 @@ GEM
parallel (1.19.1)
parallel_tests (2.30.0)
parallel
parser (2.6.5.0)
parser (2.7.0.2)
ast (~> 2.4.0)
parslet (1.8.2)
pastel (0.7.3)
@@ -462,7 +462,7 @@ GEM
pundit (2.1.0)
activesupport (>= 3.0.0)
raabro (1.1.6)
rack (2.0.8)
rack (2.1.1)
rack-attack (6.2.2)
rack (>= 1.0, < 3)
rack-cors (1.1.1)
@@ -572,7 +572,7 @@ GEM
rainbow (>= 2.2.2, < 4.0)
ruby-progressbar (~> 1.7)
unicode-display_width (>= 1.4.0, < 1.7)
rubocop-rails (2.4.0)
rubocop-rails (2.4.1)
rack (>= 1.1)
rubocop (>= 0.72.0)
ruby-progressbar (1.10.1)