diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2020-02-09 12:15:55 +0100 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2020-02-09 12:15:55 +0100 |
| commit | dae5e446fe7294dba0e14311ef3da4dc8fff6a3a (patch) | |
| tree | 33a76386b1e8bc9c968bfc49409f72000b7ec410 /Gemfile.lock | |
| parent | a2cfe3daaadabfaad71969a44c460bd76b8405ff (diff) | |
| parent | 57c42c20c01b46f0d7cad5a357d56190274a3fa1 (diff) | |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: - `Gemfile`: We updated httplog in a separate commit. Took upstream's change which updated it further. - `Gemfile.lock`: We updated httplog in a separate commit. Took upstream's change which updated it further. - `app/lib/sanitize_config.rb`: Upstream added better unsupported link stripping, while we had different sanitizing configs. Took only upstream's link stripping code. - `config/locales/simple_form.pl.yml`: Strings unused in glitch-soc had been removed from glitch-soc, reintroduced them even if they are not useful, to reduce the risk of later merge conflicts.
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index f5076302e..e33748197 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -284,7 +284,7 @@ GEM http-parser (1.2.1) ffi-compiler (>= 1.0, < 2.0) http_accept_language (2.1.1) - httplog (1.4.1) + httplog (1.4.2) rack (>= 1.0) rainbow (>= 2.0.0) i18n (1.8.2) @@ -713,7 +713,7 @@ DEPENDENCIES http (~> 4.3) http_accept_language (~> 2.1) http_parser.rb (~> 0.6)! - httplog (~> 1.4.1) + httplog (~> 1.4.2) i18n-tasks (~> 0.9) idn-ruby iso-639 |