Commit 34cb1e3b authored by Robert Speicher's avatar Robert Speicher

Merge branch 'fix_jenkins_regression' into 'master'

Fix Jenkins service regression where category was incorrectly set to "common"

Fixes #263 

Migrate `JenkinsService` and `JenkinsDeprecatedService` so they are
correctly categorized as `ci` services again.

This prevented the deprecated service from correctly showing the build
status on merge requests.

See merge request !163
parents f69e4287 623d5f8e
......@@ -6,6 +6,7 @@ v 8.5.0 (unreleased)
v 8.4.4
- Re-introduce "Send email to users" link in Admin area
- Fix category values for Jenkins and JenkinsDeprecated services
v 8.4.3
- Elasticsearch: fix partial blob indexing on push
......
class UpdateJenkinsServiceCategory < ActiveRecord::Migration
def up
category = quote_column_name('category')
type = quote_column_name('type')
execute <<-EOS
UPDATE services
SET #{category} = 'ci'
WHERE #{type} IN (
'JenkinsService',
'JenkinsDeprecatedService'
)
EOS
end
def down
# don't do anything
end
end
......@@ -11,7 +11,7 @@
#
# It's strongly recommended that you check this file into your version control system.
ActiveRecord::Schema.define(version: 20160129075828) do
ActiveRecord::Schema.define(version: 20160204190809) do
# These are extensions that must be enabled in order to support this database
enable_extension "plpgsql"
......
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