Merge branch '47193-uri-invalidurierror-bad-uri-is-not-uri-users-xxx-bot' into 'master'

Resolve "URI::InvalidURIError: bad URI(is not URI?): users/xxx[bot]" Closes #47193 See merge request gitlab-org/gitlab-ce!19354

Merge branch '47193-uri-invalidurierror-bad-uri-is-not-uri-users-xxx-bot' into 'master'
c0d1e386 · Stan Hu · ee111285 · b0ec7766 · c0d1e386 · c0d1e386
Commit c0d1e386 authored Jun 04, 2018 by Stan Hu
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 3 deletions

Gemfile Gemfile +1 -1

Gemfile.lock Gemfile.lock +2 -2

No files found.
--- a/Gemfile
+++ b/Gemfile
@@ -384,7 +384,7 @@ group :test do
  gem 'test-prof', '~> 0.2.5'
 end

-gem 'octokit', '~> 4.8'
+gem 'octokit', '~> 4.9'

 gem 'mail_room', '~> 0.9.1'


--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -517,7 +517,7 @@ GEM
      multi_json (~> 1.3)
      multi_xml (~> 0.5)
      rack (>= 1.2, < 3)
-    octokit (4.8.0)
+    octokit (4.9.0)
      sawyer (~> 0.8.0, >= 0.5.3)
    omniauth (1.8.1)
      hashie (>= 3.4.6, < 3.6.0)
@@ -1084,7 +1084,7 @@ DEPENDENCIES
  net-ssh (~> 4.2.0)
  nokogiri (~> 1.8.2)
  oauth2 (~> 1.4)
-  octokit (~> 4.8)
+  octokit (~> 4.9)
  omniauth (~> 1.8)
  omniauth-auth0 (~> 2.0.0)
  omniauth-authentiq (~> 0.3.3)