kotovalexarian-likes-gitlab
/
gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Add latest changes from gitlab-org/gitlab@master

This commit is contained in:
GitLab Bot 2020-07-04 00:09:05 +00:00
parent e173695d9b
commit b213d3a14b
4 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/models/project_services/jira_service.rb
View File

@ -23,7 +23,7 @@ class JiraService < IssueTrackerService
# TODO: we can probably just delegate as part of
# https://gitlab.com/gitlab-org/gitlab/issues/29404
data_field :username, :password, :url, :api_url, :jira_issue_transition_id, :project_key
data_field :username, :password, :url, :api_url, :jira_issue_transition_id, :project_key, :issues_enabled
before_update :reset_password

5
changelogs/unreleased/225706-add-issues-enabled-to-jira-tracker-data.yml Normal file
View File

@ -0,0 +1,5 @@
---
title: Add issues_enabled column to jira_tracker_data table
merge_request: 35987
author:
type: other

9
db/migrate/20200703154822_add_issues_enabled_to_jira_tracker_data.rb Normal file
View File

@ -0,0 +1,9 @@
# frozen_string_literal: true
class AddIssuesEnabledToJiraTrackerData < ActiveRecord::Migration[6.0]
DOWNTIME = false
def change
add_column :jira_tracker_data, :issues_enabled, :boolean, default: false, null: false
end
end

2
db/structure.sql
View File

@ -12404,6 +12404,7 @@ CREATE TABLE public.jira_tracker_data (
encrypted_password_iv character varying,
jira_issue_transition_id character varying,
project_key text,
issues_enabled boolean DEFAULT false NOT NULL,
CONSTRAINT check_214cf6a48b CHECK ((char_length(project_key) <= 255))
);
@ -23539,5 +23540,6 @@ COPY "schema_migrations" (version) FROM STDIN;
20200626060151
20200626130220
20200702123805
20200703154822
\.