diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-07-09 18:10:09 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-07-09 18:10:09 +0000 |
| commit | f67f18d9492786e635e942beefa63d41f4c35765 (patch) | |
| tree | 7fb6cf67d62508295b2e79f4041474ed4aa16f29 /Gemfile.lock | |
| parent | 4a14cfd1959c6a03758d0a75afe7b4277cf113ec (diff) | |
| download | gitlab-ce-f67f18d9492786e635e942beefa63d41f4c35765.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index f68fd455352..a14b657a983 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -687,6 +687,7 @@ GEM octokit (4.15.0) faraday (>= 0.9) sawyer (~> 0.8.0, >= 0.5.3) + oj (3.10.6) omniauth (1.9.0) hashie (>= 3.4.6, < 3.7.0) rack (>= 1.6.2, < 3) @@ -1312,6 +1313,7 @@ DEPENDENCIES mimemagic (~> 0.3.2) mini_magick minitest (~> 5.11.0) + multi_json (~> 1.14.1) nakayoshi_fork (~> 0.0.4) net-ldap net-ntp @@ -1319,6 +1321,7 @@ DEPENDENCIES nokogiri (~> 1.10.9) oauth2 (~> 1.4) octokit (~> 4.15) + oj (~> 3.10.6) omniauth (~> 1.8) omniauth-auth0 (~> 2.0.0) omniauth-authentiq (~> 0.3.3) |