Merge branch 'master' into repository-owners

* master: Handle Bitbucket Unauthorized exceptions properly Update gitlab Update dependencies, fixes #1343
librariesio · Apr 11, 2017 · a2d5ef7 · a2d5ef7
2 parents 2c588e0 + cbaecb6
commit a2d5ef7
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 9 deletions.
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -22,11 +22,10 @@ GIT
 
 GIT
   remote: https://github.com/librariesio/gitlab
-  revision: a060f1939bb776d96e9e9c76a2cf5543f22755f0
+  revision: 69b59cd43b29c316b4f380610bb961ec398b22ee
   specs:
-    gitlab (3.7.0)
+    gitlab (4.0.0)
       httparty
-      terminal-table
 
 GIT
   remote: https://github.com/librariesio/payola
@@ -416,7 +415,7 @@ GEM
       rspec-expectations (~> 3.5.0)
       rspec-mocks (~> 3.5.0)
       rspec-support (~> 3.5.0)
-    rspec-sidekiq (3.0.0)
+    rspec-sidekiq (3.0.1)
       rspec-core (~> 3.0, >= 3.0.0)
       sidekiq (>= 2.4.0)
     rspec-support (3.5.0)
@@ -501,8 +500,6 @@ GEM
     stripe_event (1.6.0)
       activesupport (>= 3.1)
       stripe (>= 1.6, < 3.0)
-    terminal-table (1.7.3)
-      unicode-display_width (~> 1.1.1)
     thor (0.19.4)
     thread_safe (0.3.6)
     tilt (2.0.7)
@@ -517,7 +514,6 @@ GEM
       thread_safe (~> 0.1)
     uglifier (3.2.0)
       execjs (>= 0.3.0, < 3)
-    unicode-display_width (1.1.3)
     websocket-driver (0.6.5)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.2)

diff --git a/app/models/repository_host/bitbucket.rb b/app/models/repository_host/bitbucket.rb
@@ -5,7 +5,8 @@ class Bitbucket < Base
       BitBucket::Error::Forbidden,
       BitBucket::Error::ServiceError,
       BitBucket::Error::InternalServerError,
-      BitBucket::Error::ServiceUnavailable]
+      BitBucket::Error::ServiceUnavailable,
+      BitBucket::Error::Unauthorized]
 
     def self.api_missing_error_class
       BitBucket::Error::NotFound

diff --git a/app/views/admin/stats/graphs.html.erb b/app/views/admin/stats/graphs.html.erb
@@ -9,7 +9,7 @@
   <div class="col-md-10">
     <%= form_tag admin_graphs_path, method: :get, enforce_utf8: false do |f| %>
     <h4>
-      <%= select_tag 'platform', options_for_select(Project.popular_platforms{|t| t['key'] }, @platform), onchange: "this.form.submit()" %>
+      <%= select_tag 'platform', options_for_select(Project.popular_platforms.map{|t| t['key'] }, @platform), onchange: "this.form.submit()" %>
     </h4>
     <% end %>
   </div>