diff options
| author | Valery Sizov <valery@gitlab.com> | 2014-10-29 14:47:36 +0000 |
|---|---|---|
| committer | Valery Sizov <valery@gitlab.com> | 2014-10-29 14:47:36 +0000 |
| commit | ed9350dc576553b3d2c7543b80404a7c41def649 (patch) | |
| tree | 52f6d4c5c3ea85b4d67ad61e2bc3032efa0afc66 | |
| parent | 4e321ec11c6f5f88187da644cb2148d45773cdfd (diff) | |
| parent | ec5482a0dc460ec8d6f25ca6fd40377aba2d7714 (diff) | |
| download | gitlab-ce-ed9350dc576553b3d2c7543b80404a7c41def649.tar.gz | |
Merge branch 'fix-buildbox-integration' into 'master'
Fix buildbox integration
Fixes gitlab/gitlabhq#1725
See merge request !1229
| -rw-r--r-- | app/models/project_services/buildbox_service.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/app/models/project_services/buildbox_service.rb b/app/models/project_services/buildbox_service.rb index b0f8e28c97f..0ab67b79fe4 100644 --- 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 |