Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
28bbec91
Commit
28bbec91
authored
Apr 21, 2020
by
Justin Ho Tuan Duong
Committed by
Lin Jen-Shin
Apr 21, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add comment_detail column to services
- Use enum for efficiency. - Allow passing as parameter in controller.
parent
d2958460
Changes
6
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
28 additions
and
1 deletion
+28
-1
app/controllers/concerns/service_params.rb
app/controllers/concerns/service_params.rb
+1
-0
app/models/project_services/jira_service.rb
app/models/project_services/jira_service.rb
+5
-0
changelogs/unreleased/195887-jira-comment-details-column-migration.yml
...released/195887-jira-comment-details-column-migration.yml
+5
-0
db/migrate/20200410104828_add_comment_detail_to_services.rb
db/migrate/20200410104828_add_comment_detail_to_services.rb
+13
-0
db/structure.sql
db/structure.sql
+3
-1
spec/lib/gitlab/import_export/safe_model_attributes.yml
spec/lib/gitlab/import_export/safe_model_attributes.yml
+1
-0
No files found.
app/controllers/concerns/service_params.rb
View file @
28bbec91
...
@@ -19,6 +19,7 @@ module ServiceParams
...
@@ -19,6 +19,7 @@ module ServiceParams
:color
,
:color
,
:colorize_messages
,
:colorize_messages
,
:comment_on_event_enabled
,
:comment_on_event_enabled
,
:comment_detail
,
:confidential_issues_events
,
:confidential_issues_events
,
:default_irc_uri
,
:default_irc_uri
,
:description
,
:description
,
...
...
app/models/project_services/jira_service.rb
View file @
28bbec91
...
@@ -25,6 +25,11 @@ class JiraService < IssueTrackerService
...
@@ -25,6 +25,11 @@ class JiraService < IssueTrackerService
before_update
:reset_password
before_update
:reset_password
enum
comment_detail:
{
standard:
1
,
all_details:
2
}
alias_method
:project_url
,
:url
alias_method
:project_url
,
:url
# When these are false GitLab does not create cross reference
# When these are false GitLab does not create cross reference
...
...
changelogs/unreleased/195887-jira-comment-details-column-migration.yml
0 → 100644
View file @
28bbec91
---
title
:
Add comment_detail column to services
merge_request
:
29891
author
:
type
:
added
db/migrate/20200410104828_add_comment_detail_to_services.rb
0 → 100644
View file @
28bbec91
# frozen_string_literal: true
class
AddCommentDetailToServices
<
ActiveRecord
::
Migration
[
6.0
]
DOWNTIME
=
false
def
up
add_column
:services
,
:comment_detail
,
:smallint
end
def
down
remove_column
:services
,
:comment_detail
end
end
db/structure.sql
View file @
28bbec91
...
@@ -5845,7 +5845,8 @@ CREATE TABLE public.services (
...
@@ -5845,7 +5845,8 @@ CREATE TABLE public.services (
description
character
varying
(
500
),
description
character
varying
(
500
),
comment_on_event_enabled
boolean
DEFAULT
true
NOT
NULL
,
comment_on_event_enabled
boolean
DEFAULT
true
NOT
NULL
,
template
boolean
DEFAULT
false
,
template
boolean
DEFAULT
false
,
instance
boolean
DEFAULT
false
NOT
NULL
instance
boolean
DEFAULT
false
NOT
NULL
,
comment_detail
smallint
);
);
CREATE
SEQUENCE
public
.
services_id_seq
CREATE
SEQUENCE
public
.
services_id_seq
...
@@ -13243,6 +13244,7 @@ COPY "schema_migrations" (version) FROM STDIN;
...
@@ -13243,6 +13244,7 @@ COPY "schema_migrations" (version) FROM STDIN;
20200408212219
20200408212219
20200409085956
20200409085956
20200409211607
20200409211607
20200410104828
20200410232012
20200410232012
20200413072059
20200413072059
20200413230056
20200413230056
...
...
spec/lib/gitlab/import_export/safe_model_attributes.yml
View file @
28bbec91
...
@@ -480,6 +480,7 @@ Service:
...
@@ -480,6 +480,7 @@ Service:
-
pipeline_events
-
pipeline_events
-
job_events
-
job_events
-
comment_on_event_enabled
-
comment_on_event_enabled
-
comment_detail
-
category
-
category
-
default
-
default
-
wiki_page_events
-
wiki_page_events
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment