Commit 5c864443 authored by Sean McGivern's avatar Sean McGivern

Merge branch 'service_desk_enabled_by_default' into 'master'

Enable service desk by default

Closes #2138

See merge request !2358
parents a78f01e7 8d252bc0
---
title: Enable service desk be default
merge_request:
author:
# See http://doc.gitlab.com/ce/development/migration_style_guide.html
# for more information on how to write migrations for GitLab.
class MakeServiceDeskEnabledByDefault < ActiveRecord::Migration
include Gitlab::Database::MigrationHelpers
# Set this constant to true if this migration requires downtime.
DOWNTIME = false
# When a migration requires downtime you **must** uncomment the following
# constant and define a short and easy to understand explanation as to why the
# migration requires downtime.
# DOWNTIME_REASON = ''
# When using the methods "add_concurrent_index", "remove_concurrent_index" or
# "add_column_with_default" you must disable the use of transactions
# as these methods can not run in an existing transaction.
# When using "add_concurrent_index" or "remove_concurrent_index" methods make sure
# that either of them is the _only_ method called in the migration,
# any other changes should go in a separate migration.
# This ensures that upon failure _only_ the index creation or removing fails
# and can be retried or reverted easily.
#
# To disable transactions uncomment the following line and remove these
# comments:
# disable_ddl_transaction!
def up
change_column_default :projects, :service_desk_enabled, true
end
def down
change_column_default :projects, :service_desk_enabled, nil
end
end
......@@ -11,7 +11,7 @@
#
# It's strongly recommended that you check this file into your version control system.
ActiveRecord::Schema.define(version: 20170703102400) do
ActiveRecord::Schema.define(version: 20170706121518) do
# These are extensions that must be enabled in order to support this database
enable_extension "plpgsql"
......@@ -1337,7 +1337,7 @@ ActiveRecord::Schema.define(version: 20170703102400) do
t.integer "repository_size_limit", limit: 8
t.boolean "printing_merge_request_link_enabled", default: true, null: false
t.integer "auto_cancel_pending_pipelines", default: 1, null: false
t.boolean "service_desk_enabled"
t.boolean "service_desk_enabled", default: true
t.string "import_jid"
t.integer "cached_markdown_version"
t.datetime "last_repository_updated_at"
......
require 'spec_helper'
describe 'Service Desk Setting', js: true, feature: true do
let(:project) { create(:project_empty_repo, :private) }
let(:project) { create(:project_empty_repo, :private, service_desk_enabled: false) }
let(:user) { create(:user) }
before do
......
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