diff options
| author | Grzegorz Bizon <grzegorz@gitlab.com> | 2018-03-16 07:48:48 +0000 |
|---|---|---|
| committer | Grzegorz Bizon <grzegorz@gitlab.com> | 2018-03-16 07:48:48 +0000 |
| commit | 3c1dd2343f6823b564f7e88b47953e596af884af (patch) | |
| tree | b952217813f0c372d540f46c17881c3f51f09092 | |
| parent | 16d92de1e2ef5c187f7826c5a15fbc2121273dde (diff) | |
| parent | 6886f64ec3f67a28f5d051100faf5b8fb3407386 (diff) | |
| download | gitlab-ce-3c1dd2343f6823b564f7e88b47953e596af884af.tar.gz | |
Merge branch 'revert-feb95ce3' into 'master'
Revert "Merge branch 'update-httparty' into 'master'"
See merge request gitlab-org/gitlab-ce!17789
| -rw-r--r-- | Gemfile | 2 | ||||
| -rw-r--r-- | Gemfile.lock | 5 |
2 files changed, 4 insertions, 3 deletions
@@ -164,7 +164,7 @@ gem 'sidekiq-limit_fetch', '~> 3.4', require: false gem 'rufus-scheduler', '~> 3.4' # HTTP requests -gem 'httparty', '~> 0.15.6' +gem 'httparty', '~> 0.13.3' # Colored output to console gem 'rainbow', '~> 2.2' diff --git a/Gemfile.lock b/Gemfile.lock index fcc6ef8468c..10b683a44ee 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -411,7 +411,8 @@ GEM domain_name (~> 0.5) http-form_data (1.0.1) http_parser.rb (0.6.0) - httparty (0.15.7) + httparty (0.13.7) + json (~> 1.8) multi_xml (>= 0.5.2) httpclient (2.8.2) i18n (0.9.5) @@ -1081,7 +1082,7 @@ DEPENDENCIES hipchat (~> 1.5.0) html-pipeline (~> 1.11.0) html2text - httparty (~> 0.15.6) + httparty (~> 0.13.3) influxdb (~> 0.2) jira-ruby (~> 1.4) jquery-atwho-rails (~> 1.3.2) |