diff options
author | Thibaut Girka <thib@sitedethib.com> | 2019-04-10 09:16:08 +0200 |
---|---|---|
committer | Thibaut Girka <thib@sitedethib.com> | 2019-04-10 09:16:08 +0200 |
commit | 5085559b15ef1c1fe3742757d00e5651fc52b5b5 (patch) | |
tree | 0249b98caced1e39387564f04391eb1a0c39a2d7 /Gemfile.lock | |
parent | cb410f80a40d03b509cec244b0cdd4ed3957c6a0 (diff) | |
parent | 830c2a9ccbe98e145640e12637ef3da56f41a7b5 (diff) |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: - app/views/admin/pending_accounts/index.html.haml No real conflict, upstream changes too close to glitch-specific theming system changes. - config/navigation.rb Upstream redesigned the settings navigation, took those changes and re-inserted the flavours menu.
Diffstat (limited to 'Gemfile.lock')
-rw-r--r-- | Gemfile.lock | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 7d98a2fdc..c6169b260 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -99,7 +99,7 @@ GEM rack (>= 0.9.0) binding_of_caller (0.8.0) debug_inspector (>= 0.0.1) - bootsnap (1.4.2) + bootsnap (1.4.3) msgpack (~> 1.0) brakeman (4.5.0) browser (2.5.3) @@ -240,11 +240,11 @@ GEM http (~> 3.0) nokogiri (~> 1.8) oj (~> 3.0) - hamlit (2.9.2) + hamlit (2.9.3) temple (>= 0.8.0) thor tilt - hamlit-rails (0.2.2) + hamlit-rails (0.2.3) actionpack (>= 4.0.1) activesupport (>= 4.0.1) hamlit (>= 1.2.0) @@ -426,7 +426,7 @@ GEM pundit (2.0.1) activesupport (>= 3.0.0) raabro (1.1.6) - rack (2.0.6) + rack (2.0.7) rack-attack (5.4.2) rack (>= 1.0, < 3) rack-cors (1.0.3) @@ -597,7 +597,7 @@ GEM multi_json (~> 1.8) strong_migrations (0.3.1) activerecord (>= 3.2.0) - temple (0.8.0) + temple (0.8.1) terminal-table (1.8.0) unicode-display_width (~> 1.1, >= 1.1.1) terrapin (0.6.0) |