diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-03-24 18:09:19 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-03-24 18:09:19 +0300 |
| commit | 036de5f31f136a7482f9e2b1d1e98a9c4b45ea80 (patch) | |
| tree | 6e32fae7b756a9bd712158856b47e7dd3bf7827d /Gemfile.lock | |
| parent | a46b489e175708cc64fc5198f458f927558f11ba (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 18 |
1 files changed, 2 insertions, 16 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 5a2787130ef..5d63cb1cb2d 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -268,7 +268,6 @@ GEM diff-lcs (1.4.4) diff_match_patch (0.1.0) diffy (3.3.0) - digest (3.0.0) discordrb-webhooks (3.4.2) rest-client (>= 2.0.0) docile (1.3.2) @@ -465,8 +464,7 @@ GEM pg_query (~> 1.3) redis (> 3.0.0, < 5.0.0) gitlab-license (1.3.1) - gitlab-mail_room (0.0.10) - net-imap (>= 0.2.1) + gitlab-mail_room (0.0.9) gitlab-markup (1.7.1) gitlab-net-dns (0.9.1) gitlab-pry-byebug (3.9.0) @@ -765,18 +763,10 @@ GEM mustermann (>= 1.0.0) nap (1.1.0) nenv (0.3.0) - net-http (0.1.1) - net-protocol - uri net-http-persistent (4.0.1) connection_pool (~> 2.2) - net-imap (0.2.1) - digest - net-protocol - strscan net-ldap (0.16.3) net-ntp (2.1.3) - net-protocol (0.1.0) net-scp (3.0.0) net-ssh (>= 2.6.5, < 7.0.0) net-ssh (6.0.0) @@ -1218,7 +1208,6 @@ GEM state_machines-activerecord (0.8.0) activerecord (>= 5.1) state_machines-activemodel (>= 0.8.0) - strscan (3.0.0) swd (1.1.2) activesupport (>= 3) attr_required (>= 0.0.5) @@ -1289,7 +1278,6 @@ GEM equalizer (~> 0.0.9) parser (>= 2.6.5) procto (~> 0.0.2) - uri (0.10.0) uri_template (0.7.0) valid_email (0.1.3) activemodel @@ -1439,7 +1427,7 @@ DEPENDENCIES gitlab-fog-google (~> 1.13) gitlab-labkit (~> 0.16.2) gitlab-license (~> 1.3) - gitlab-mail_room (~> 0.0.10) + gitlab-mail_room (~> 0.0.9) gitlab-markup (~> 1.7.1) gitlab-net-dns (~> 0.9.1) gitlab-pry-byebug @@ -1501,7 +1489,6 @@ DEPENDENCIES mini_magick (~> 4.10.1) minitest (~> 5.11.0) multi_json (~> 1.14.1) - net-http (~> 0.1) net-ldap (~> 0.16.3) net-ntp net-ssh (~> 6.0) @@ -1610,7 +1597,6 @@ DEPENDENCIES unicorn (~> 5.5) unicorn-worker-killer (~> 0.4.4) unleash (~> 0.1.5) - uri (= 0.10.0) valid_email (~> 0.1) validates_hostname (~> 1.0.11) version_sorter (~> 2.2.4) |