diff options
| author | Robert Speicher <rspeicher@gmail.com> | 2015-04-11 14:02:13 -0400 |
|---|---|---|
| committer | Robert Speicher <rspeicher@gmail.com> | 2015-04-11 14:05:22 -0400 |
| commit | 307962a0466f3b91862dd37178595f70e92d9c8b (patch) | |
| tree | 1dbb8e08ed797d37db1a67f4dcfe0650631aa048 | |
| parent | 93b17677999015ee5d942e61881ac21e6de4aadf (diff) | |
| download | gitlab-ce-307962a0466f3b91862dd37178595f70e92d9c8b.tar.gz | |
Rename last uses of Buildbox to Buildkite
| -rw-r--r-- | app/models/project.rb | 2 | ||||
| -rw-r--r-- | app/models/project_services/buildkite_service.rb | 4 | ||||
| -rw-r--r-- | app/models/service.rb | 2 | ||||
| -rw-r--r-- | spec/models/project_services/buildkite_service_spec.rb | 4 |
4 files changed, 5 insertions, 7 deletions
diff --git a/app/models/project.rb b/app/models/project.rb index 79572f255db..5c310b4a8df 100644 --- a/app/models/project.rb +++ b/app/models/project.rb @@ -81,7 +81,7 @@ class Project < ActiveRecord::Base has_one :asana_service, dependent: :destroy has_one :gemnasium_service, dependent: :destroy has_one :slack_service, dependent: :destroy - has_one :buildbox_service, dependent: :destroy + has_one :buildkite_service, dependent: :destroy has_one :bamboo_service, dependent: :destroy has_one :teamcity_service, dependent: :destroy has_one :pushover_service, dependent: :destroy diff --git a/app/models/project_services/buildkite_service.rb b/app/models/project_services/buildkite_service.rb index 3a381ff11b8..a714bc82246 100644 --- a/app/models/project_services/buildkite_service.rb +++ b/app/models/project_services/buildkite_service.rb @@ -20,9 +20,7 @@ require "addressable/uri" -# Buildbox renamed to Buildkite, but for backwards compatability with the STI -# of Services, the class name is kept as "Buildbox" -class BuildboxService < CiService +class BuildkiteService < CiService ENDPOINT = "https://buildkite.com" prop_accessor :project_url, :token diff --git a/app/models/service.rb b/app/models/service.rb index b7eee5ee3e4..393cf55a69f 100644 --- a/app/models/service.rb +++ b/app/models/service.rb @@ -125,7 +125,7 @@ class Service < ActiveRecord::Base asana assembla bamboo - buildbox + buildkite campfire custom_issue_tracker emails_on_push diff --git a/spec/models/project_services/buildkite_service_spec.rb b/spec/models/project_services/buildkite_service_spec.rb index 9f29fbe12b0..e987241f3ca 100644 --- a/spec/models/project_services/buildkite_service_spec.rb +++ b/spec/models/project_services/buildkite_service_spec.rb @@ -19,7 +19,7 @@ require 'spec_helper' -describe BuildboxService do +describe BuildkiteService do describe 'Associations' do it { is_expected.to belong_to :project } it { is_expected.to have_one :service_hook } @@ -32,7 +32,7 @@ describe BuildboxService do default_branch: 'default-brancho' ) - @service = BuildboxService.new + @service = BuildkiteService.new @service.stub( project: @project, service_hook: true, |