diff options
author | Thibaut Girka <thib@sitedethib.com> | 2019-03-18 18:03:27 +0100 |
---|---|---|
committer | Thibaut Girka <thib@sitedethib.com> | 2019-03-18 18:03:27 +0100 |
commit | 291012ec0c08f5323b2102eb4d2dc8714ddce4d9 (patch) | |
tree | 09e7a5fef106da1b6ebdc53ac0df62cafc159520 /Gemfile.lock | |
parent | 6e3a4bcbc70bb33bfb0746cf3b2186ee9f4e6515 (diff) | |
parent | f85b66eb8cc9513822d0ece3928b12aa789bb410 (diff) |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: - app/controllers/accounts_controller.rb - app/controllers/follower_accounts_controller.rb - app/controllers/statuses_controller.rb All conflicts caused by the additional `use_pack` used for glitch-soc's theming system.
Diffstat (limited to 'Gemfile.lock')
-rw-r--r-- | Gemfile.lock | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 6ab8ae819..45370d154 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -102,7 +102,7 @@ GEM debug_inspector (>= 0.0.1) bootsnap (1.4.1) msgpack (~> 1.0) - brakeman (4.4.0) + brakeman (4.5.0) browser (2.5.3) builder (3.2.3) bullet (5.9.0) @@ -271,7 +271,7 @@ GEM domain_name (~> 0.5) http-form_data (2.1.1) http_accept_language (2.1.1) - httplog (1.2.1) + httplog (1.2.2) rack (>= 1.0) rainbow (>= 2.0.0) i18n (1.6.0) @@ -405,7 +405,7 @@ GEM pg (1.1.4) pghero (2.2.0) activerecord - pkg-config (1.3.6) + pkg-config (1.3.7) powerpack (0.1.2) premailer (1.11.1) addressable @@ -668,7 +668,7 @@ DEPENDENCIES better_errors (~> 2.5) binding_of_caller (~> 0.7) bootsnap (~> 1.4) - brakeman (~> 4.4) + brakeman (~> 4.5) browser bullet (~> 5.9) bundler-audit (~> 0.6) |