diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-10-12 18:08:32 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-10-12 18:08:32 +0300 |
| commit | b17f0b91a66f2101a54dd1efed0c4973f04b1daf (patch) | |
| tree | 55d2a3dc5581b90bd1304c5d53d4d5b5da0076c9 /Gemfile.lock | |
| parent | b47e7cd6b2049c1fb87e7c4ffd1de898cda52364 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 7a24130096b..97aa43db2a2 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -312,7 +312,7 @@ GEM tzinfo eventmachine (1.2.7) excon (0.71.1) - execjs (2.6.0) + execjs (2.7.0) expression_parser (0.9.0) extended-markdown-filter (0.6.0) html-pipeline (~> 2.0) @@ -436,7 +436,7 @@ GEM opentracing (~> 0.4) redis (> 3.0.0, < 5.0.0) gitlab-license (1.0.0) - gitlab-mail_room (0.0.6) + gitlab-mail_room (0.0.7) gitlab-markup (1.7.1) gitlab-net-dns (0.9.1) gitlab-puma (4.3.5.gitlab.3) @@ -1130,6 +1130,8 @@ GEM temple (0.8.2) terminal-table (1.8.0) unicode-display_width (~> 1.1, >= 1.1.1) + terser (1.0.1) + execjs (>= 0.3.0, < 3) test-prof (0.12.0) text (1.3.1) thin (1.7.2) @@ -1157,9 +1159,6 @@ GEM thread_safe (~> 0.1) u2f (0.2.1) uber (0.1.0) - uglifier (2.7.2) - execjs (>= 0.3.0) - json (>= 1.8.0) unf (0.1.4) unf_ext unf_ext (0.0.7.5) @@ -1327,7 +1326,7 @@ DEPENDENCIES gitlab-fog-azure-rm (~> 1.0) gitlab-labkit (= 0.12.1) gitlab-license (~> 1.0) - gitlab-mail_room (~> 0.0.6) + gitlab-mail_room (~> 0.0.7) gitlab-markup (~> 1.7.1) gitlab-net-dns (~> 0.9.1) gitlab-puma (~> 4.3.3.gitlab.2) @@ -1483,13 +1482,13 @@ DEPENDENCIES stackprof (~> 0.2.15) state_machines-activerecord (~> 0.6.0) sys-filesystem (~> 1.1.6) + terser (~> 1.0) test-prof (~> 0.12.0) thin (~> 1.7.0) timecop (~> 0.9.1) toml-rb (~> 1.0.0) truncato (~> 0.7.11) u2f (~> 0.2.1) - uglifier (~> 2.7.2) unf (~> 0.1.4) unicorn (~> 5.5) unicorn-worker-killer (~> 0.4.4) |