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

Fix buildbox integration

Fixes gitlab/gitlabhq#1725

See merge request !1229

app/models/project_services/buildbox_service.rb

@@ -12,6 +12,8 @@
 #  properties :text
 #
 
+require "addressable/uri"
+
 class BuildboxService < CiService
   prop_accessor :project_url, :token