Merge remote-tracking branch 'subscribers/serialize_service_properties' into...

Merge remote-tracking branch 'subscribers/serialize_service_properties' into merge-79190fe0-7.3.0-pre

app/models/project_services/jenkins_service.rb

@@ -5,19 +5,16 @@
 #  id          :integer          not null, primary key
 #  type        :string(255)
 #  title       :string(255)
-#  token       :string(255)
 #  project_id  :integer          not null
 #  created_at  :datetime
 #  updated_at  :datetime
 #  active      :boolean          default(FALSE), not null
-#  project_url :string(255)
-#  subdomain   :string(255)
-#  room        :string(255)
-#  recipients  :text
-#  api_key     :string(255)
+#  properties  :text
 #
 
 class JenkinsService < CiService
+  prop_accessor :project_url
+
   validates :project_url, presence: true, if: :activated?
 
   delegate :execute, to: :service_hook, prefix: nil

app/models/project_services/jira_service.rb

@@ -5,23 +5,18 @@
 #  id          :integer          not null, primary key
 #  type        :string(255)
 #  title       :string(255)
-#  token       :string(255)
 #  project_id  :integer          not null
 #  created_at  :datetime
 #  updated_at  :datetime
 #  active      :boolean          default(FALSE), not null
-#  project_url :string(255)
-#  subdomain   :string(255)
-#  room        :string(255)
-#  recipients  :text
-#  api_key     :string(255)
-#  username    :string(255)
-#  password    :string(255)
-#  api_version    :string(255)
+#  properties  :text
+#
 
 class JiraService < Service
   include HTTParty
 
+  prop_accessor :project_url, :username, :password,
+                :api_version, :jira_issue_transition_id
   validates :username, :password, presence: true, if: :activated?
   before_validation :set_api_version
 

db/migrate/20140907223153_remove_columns_for_services.rb

+class RemoveColumnsForServices < ActiveRecord::Migration
+  def change
+    remove_column :services, :username, :string
+    remove_column :services, :password, :string
+    remove_column :services, :jira_issue_transition_id, :string
+    remove_column :services, :api_version, :string
+  end
+end