Merge branch 'fix-buildbox-integration' into 'master'

Fix buildbox integration Fixes gitlab/gitlabhq#1725 See merge request !1229

Merge branch 'fix-buildbox-integration' into 'master'
ed9350dc · Valery Sizov · 4e321ec1 · ec5482a0 · ed9350dc
Commit ed9350dc authored Oct 29, 2014 by Valery Sizov
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 0 deletions

buildbox_service.rb app/models/project_services/buildbox_service.rb +2 -0

No files found.
--- a/app/models/project_services/buildbox_service.rb
+++ b/app/models/project_services/buildbox_service.rb
@@ -12,6 +12,8 @@
 #  properties :text
 #

+require "addressable/uri"
+
 class BuildboxService < CiService
  prop_accessor :project_url, :token