diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-14 15:07:55 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-14 15:07:55 +0000 |
| commit | 85e494935a8726dc98bb19ffa584488420e5011e (patch) | |
| tree | 5acf279dab81a2363e4504a9679c32c16510542b /Gemfile.lock | |
| parent | 4ce0bee95df15c05cdb0d777eba31fe753bc443b (diff) | |
| download | gitlab-ce-85e494935a8726dc98bb19ffa584488420e5011e.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 13e1e4ac828..f55fb554c4a 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -55,8 +55,8 @@ GEM adamantium (0.2.0) ice_nine (~> 0.11.0) memoizable (~> 0.4.0) - addressable (2.5.2) - public_suffix (>= 2.0.2, < 4.0) + addressable (2.7.0) + public_suffix (>= 2.0.2, < 5.0) aes_key_wrap (1.0.1) akismet (3.0.0) apollo_upload_server (2.0.0.beta.3) @@ -650,7 +650,8 @@ GEM multi_json (~> 1.3) multi_xml (~> 0.5) rack (>= 1.2, < 3) - octokit (4.9.0) + octokit (4.15.0) + faraday (>= 0.9) sawyer (~> 0.8.0, >= 0.5.3) omniauth (1.9.0) hashie (>= 3.4.6, < 3.7.0) @@ -762,7 +763,7 @@ GEM pry (~> 0.10) pry-rails (0.3.6) pry (>= 0.10.4) - public_suffix (3.1.1) + public_suffix (4.0.3) pyu-ruby-sasl (0.0.3.3) raabro (1.1.6) rack (2.0.7) @@ -961,9 +962,9 @@ GEM sprockets (> 3.0) sprockets-rails tilt - sawyer (0.8.1) - addressable (>= 2.3.5, < 2.6) - faraday (~> 0.8, < 1.0) + sawyer (0.8.2) + addressable (>= 2.3.5) + faraday (> 0.8, < 2.0) scss_lint (0.56.0) rake (>= 0.9, < 13) sass (~> 3.5.3) @@ -1130,7 +1131,7 @@ DEPENDENCIES acme-client (~> 2.0.2) activerecord-explain-analyze (~> 0.1) acts-as-taggable-on (~> 6.0) - addressable (~> 2.5.2) + addressable (~> 2.7) akismet (~> 3.0) apollo_upload_server (~> 2.0.0.beta3) asana (~> 0.9) @@ -1272,7 +1273,7 @@ DEPENDENCIES net-ssh (~> 5.2) nokogiri (~> 1.10.5) oauth2 (~> 1.4) - octokit (~> 4.9) + octokit (~> 4.15) omniauth (~> 1.8) omniauth-auth0 (~> 2.0.0) omniauth-authentiq (~> 0.3.3) |