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

Merge remote-tracking branch 'tootsuite/master'

Browse Source 
Conflicts:
 	app/controllers/statuses_controller.rb
This commit is contained in:
David Yip
2018-04-12 03:30:57 -05:00
parent eb72c3398c 8e88a18316
commit a817f084ea
14 changed files with 160 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Gemfile.lock
View File

@ -146,9 +146,9 @@ GEM
devise (~> 4.0)
railties (< 5.2)
rotp (~> 2.0)
devise_pam_authenticatable2 (9.0.0)
devise_pam_authenticatable2 (9.1.0)
devise (>= 4.0.0)
rpam2 (~> 3.0)
rpam2 (~> 4.0)
diff-lcs (1.3)
docile (1.1.5)
domain_name (0.5.20170404)
@ -467,7 +467,7 @@ GEM
actionpack (>= 4.2.0, < 5.3)
railties (>= 4.2.0, < 5.3)
rotp (2.1.2)
rpam2 (3.1.0)
rpam2 (4.0.2)
rqrcode (0.10.1)
chunky_png (~> 1.0)
rspec-core (3.7.0)
@ -642,7 +642,7 @@ DEPENDENCIES
climate_control (~> 0.2)
devise (~> 4.4)
devise-two-factor (~> 3.0)
devise_pam_authenticatable2 (~> 9.0)
devise_pam_authenticatable2 (~> 9.1)
doorkeeper (~> 4.2)
dotenv-rails (~> 2.2)
fabrication (~> 2.18)