diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-07-01 18:08:33 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-07-01 18:08:33 +0000 |
| commit | 24d67ec55454fc6f4e8e80bf7c8dc5bc677e8514 (patch) | |
| tree | 6ce73c2fd8ec96c6f043c4a1403c0991fd448b81 /Gemfile.lock | |
| parent | a0fdcfcdd514c2af98f18cadfa75f8a6a85b4d2c (diff) | |
| download | gitlab-ce-24d67ec55454fc6f4e8e80bf7c8dc5bc677e8514.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 02068c3a243..53cb0789513 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -826,12 +826,13 @@ GEM shellany (~> 0.0) numerizer (0.2.0) oauth (0.5.6) - oauth2 (1.4.7) - faraday (>= 0.8, < 2.0) + oauth2 (2.0.3) + faraday (>= 0.17.3, < 3.0) jwt (>= 1.0, < 3.0) - multi_json (~> 1.3) multi_xml (~> 0.5) rack (>= 1.2, < 3) + rash_alt (>= 0.4, < 1) + version_gem (~> 1.0) octokit (4.20.0) faraday (>= 0.9) sawyer (~> 0.8.0, >= 0.5.3) @@ -1050,6 +1051,8 @@ GEM rainbow (3.1.1) rake (13.0.6) randexp (0.1.7) + rash_alt (0.4.12) + hashie (>= 3.4) rb-fsevent (0.10.4) rb-inotify (0.10.1) ffi (~> 1.0) @@ -1408,6 +1411,7 @@ GEM validates_hostname (1.0.11) activerecord (>= 3.0) activesupport (>= 3.0) + version_gem (1.0.0) version_sorter (2.2.4) view_component (2.50.0) activesupport (>= 5.0.0, < 8.0) @@ -1612,7 +1616,7 @@ DEPENDENCIES net-ldap (~> 0.16.3) net-ntp nokogiri (~> 1.13.6) - oauth2 (~> 1.4) + oauth2 (~> 2.0) octokit (~> 4.15) ohai (~> 16.10) oj (~> 3.10.6) |