Commit 0e09cb28 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Merge branch 'rs-issue-2214' into 'master'

Rename all uses of Buildbox to Buildkite

Closes #2214

See merge request !1759
parents 5155b979 bb5f3e78
......@@ -67,6 +67,7 @@ v 7.10.0 (unreleased)
- Fix and improve help rendering (Sullivan Sénéchal)
- Fix final line in EmailsOnPush email diff being rendered as error.
- Authometic setup GitLab CI project for forks if origin project has GitLab CI enabled
- Prevent duplicate Buildkite service creation.
v 7.9.3
- Contains no changes
......
......@@ -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
......
......@@ -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
......
......@@ -122,25 +122,25 @@ class Service < ActiveRecord::Base
def self.available_services_names
%w(
gitlab_ci
campfire
hipchat
pivotaltracker
flowdock
assembla
asana
assembla
bamboo
buildkite
campfire
custom_issue_tracker
emails_on_push
external_wiki
flowdock
gemnasium
slack
pushover
buildbox
bamboo
teamcity
gitlab_ci
hipchat
irker
jira
pivotaltracker
pushover
redmine
custom_issue_tracker
irker
external_wiki
slack
teamcity
)
end
......
class RenameBuildboxService < ActiveRecord::Migration
def up
execute "UPDATE services SET type = 'BuildkiteService' WHERE type = 'BuildboxService';"
end
def down
execute "UPDATE services SET type = 'BuildboxService' WHERE type = 'BuildkiteService';"
end
end
......@@ -11,7 +11,7 @@
#
# It's strongly recommended that you check this file into your version control system.
ActiveRecord::Schema.define(version: 20150328132231) do
ActiveRecord::Schema.define(version: 20150411180045) do
# These are extensions that must be enabled in order to support this database
enable_extension "plpgsql"
......
......@@ -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,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment