BigW Consortium Gitlab

Skip to content

G
gitlab-ce
Commit 3c1dd234 by Grzegorz Bizon
Options

Merge branch 'revert-feb95ce3' into 'master'

Revert "Merge branch 'update-httparty' into 'master'" See merge request gitlab-org/gitlab-ce!17789
parents 16d92de1 6886f64e
Showing with 4 additions and 3 deletions
Gemfile
...@@ -164,7 +164,7 @@ gem 'sidekiq-limit_fetch', '~> 3.4', require: false ...@@ -164,7 +164,7 @@ gem 'sidekiq-limit_fetch', '~> 3.4', require: false
gem 'rufus-scheduler', '~> 3.4' gem 'rufus-scheduler', '~> 3.4'
# HTTP requests # HTTP requests
gem 'httparty', '~> 0.15.6' gem 'httparty', '~> 0.13.3'
# Colored output to console # Colored output to console
gem 'rainbow', '~> 2.2' gem 'rainbow', '~> 2.2'
......
Gemfile.lock
...@@ -411,7 +411,8 @@ GEM ...@@ -411,7 +411,8 @@ GEM
domain_name (~> 0.5) domain_name (~> 0.5)
http-form_data (1.0.1) http-form_data (1.0.1)
http_parser.rb (0.6.0) http_parser.rb (0.6.0)
httparty (0.15.7) httparty (0.13.7)
json (~> 1.8)
multi_xml (>= 0.5.2) multi_xml (>= 0.5.2)
httpclient (2.8.2) httpclient (2.8.2)
i18n (0.9.5) i18n (0.9.5)
...@@ -1081,7 +1082,7 @@ DEPENDENCIES ...@@ -1081,7 +1082,7 @@ DEPENDENCIES
hipchat (~> 1.5.0) hipchat (~> 1.5.0)
html-pipeline (~> 1.11.0) html-pipeline (~> 1.11.0)
html2text html2text
httparty (~> 0.15.6) httparty (~> 0.13.3)
influxdb (~> 0.2) influxdb (~> 0.2)
jira-ruby (~> 1.4) jira-ruby (~> 1.4)
jquery-atwho-rails (~> 1.3.2) jquery-atwho-rails (~> 1.3.2)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment