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
150dc86e
Commit
150dc86e
authored
Jun 18, 2021
by
Alex Kalderimis
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Rename youtrack integration
Renames project association from youtrack_service to youtrack_integration.
parent
f62a8657
Changes
9
Hide whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
15 additions
and
12 deletions
+15
-12
app/models/integration.rb
app/models/integration.rb
+1
-0
app/models/project.rb
app/models/project.rb
+1
-1
spec/factories/integrations.rb
spec/factories/integrations.rb
+1
-1
spec/factories/projects.rb
spec/factories/projects.rb
+1
-1
spec/lib/banzai/filter/references/external_issue_reference_filter_spec.rb
...filter/references/external_issue_reference_filter_spec.rb
+3
-1
spec/lib/gitlab/import_export/all_models.yml
spec/lib/gitlab/import_export/all_models.yml
+1
-1
spec/migrations/20190924152703_migrate_issue_trackers_data_spec.rb
...ations/20190924152703_migrate_issue_trackers_data_spec.rb
+3
-3
spec/migrations/20200130145430_reschedule_migrate_issue_trackers_data_spec.rb
...0130145430_reschedule_migrate_issue_trackers_data_spec.rb
+3
-3
spec/models/project_spec.rb
spec/models/project_spec.rb
+1
-1
No files found.
app/models/integration.rb
View file @
150dc86e
...
...
@@ -56,6 +56,7 @@ class Integration < ApplicationRecord
teamcity
unify_circuit
webex_teams
youtrack
]
.
to_set
.
freeze
def
self
.
renamed?
(
name
)
...
...
app/models/project.rb
View file @
150dc86e
...
...
@@ -190,7 +190,7 @@ class Project < ApplicationRecord
has_one
:teamcity_integration
,
class_name:
'Integrations::Teamcity'
has_one
:unify_circuit_integration
,
class_name:
'Integrations::UnifyCircuit'
has_one
:webex_teams_integration
,
class_name:
'Integrations::WebexTeams'
has_one
:youtrack_
service
,
class_name:
'Integrations::Youtrack'
has_one
:youtrack_
integration
,
class_name:
'Integrations::Youtrack'
has_one
:root_of_fork_network
,
foreign_key:
'root_project_id'
,
...
...
spec/factories/integrations.rb
View file @
150dc86e
...
...
@@ -97,7 +97,7 @@ FactoryBot.define do
issue_tracker
end
factory
:youtrack_
service
,
class:
'Integrations::Youtrack'
do
factory
:youtrack_
integration
,
class:
'Integrations::Youtrack'
do
project
active
{
true
}
issue_tracker
...
...
spec/factories/projects.rb
View file @
150dc86e
...
...
@@ -402,7 +402,7 @@ FactoryBot.define do
factory
:youtrack_project
,
parent: :project
do
has_external_issue_tracker
{
true
}
youtrack_
service
youtrack_
integration
end
factory
:jira_project
,
parent: :project
do
...
...
spec/lib/banzai/filter/references/external_issue_reference_filter_spec.rb
View file @
150dc86e
...
...
@@ -140,7 +140,9 @@ RSpec.describe Banzai::Filter::References::ExternalIssueReferenceFilter do
end
context
"youtrack project"
do
let_it_be
(
:service
)
{
create
(
:youtrack_service
,
project:
project
)
}
before_all
do
create
(
:youtrack_integration
,
project:
project
)
end
before
do
project
.
update!
(
issues_enabled:
false
)
...
...
spec/lib/gitlab/import_export/all_models.yml
View file @
150dc86e
...
...
@@ -388,7 +388,7 @@ project:
-
pushover_integration
-
jira_integration
-
redmine_integration
-
youtrack_
service
-
youtrack_
integration
-
custom_issue_tracker_integration
-
bugzilla_integration
-
ewm_integration
...
...
spec/migrations/20190924152703_migrate_issue_trackers_data_spec.rb
View file @
150dc86e
...
...
@@ -26,11 +26,11 @@ RSpec.describe MigrateIssueTrackersData do
services
.
create!
(
type:
'BugzillaService'
,
properties:
properties
,
category:
'issue_tracker'
)
end
let!
(
:youtrack_
service
)
do
let!
(
:youtrack_
integration
)
do
services
.
create!
(
type:
'YoutrackService'
,
properties:
properties
,
category:
'issue_tracker'
)
end
let!
(
:youtrack_
service
_empty
)
do
let!
(
:youtrack_
integration
_empty
)
do
services
.
create!
(
type:
'YoutrackService'
,
properties:
''
,
category:
'issue_tracker'
)
end
...
...
@@ -56,7 +56,7 @@ RSpec.describe MigrateIssueTrackersData do
migrate!
expect
(
migration_name
).
to
be_scheduled_delayed_migration
(
3
.
minutes
,
jira_integration
.
id
,
bugzilla_integration
.
id
)
expect
(
migration_name
).
to
be_scheduled_delayed_migration
(
6
.
minutes
,
youtrack_
service
.
id
,
gitlab_service
.
id
)
expect
(
migration_name
).
to
be_scheduled_delayed_migration
(
6
.
minutes
,
youtrack_
integration
.
id
,
gitlab_service
.
id
)
expect
(
BackgroundMigrationWorker
.
jobs
.
size
).
to
eq
(
2
)
end
end
...
...
spec/migrations/20200130145430_reschedule_migrate_issue_trackers_data_spec.rb
View file @
150dc86e
...
...
@@ -26,11 +26,11 @@ RSpec.describe RescheduleMigrateIssueTrackersData do
services
.
create!
(
id:
12
,
type:
'BugzillaService'
,
properties:
properties
,
category:
'issue_tracker'
)
end
let!
(
:youtrack_
service
)
do
let!
(
:youtrack_
integration
)
do
services
.
create!
(
id:
13
,
type:
'YoutrackService'
,
properties:
properties
,
category:
'issue_tracker'
)
end
let!
(
:youtrack_
service
_empty
)
do
let!
(
:youtrack_
integration
_empty
)
do
services
.
create!
(
id:
14
,
type:
'YoutrackService'
,
properties:
''
,
category:
'issue_tracker'
)
end
...
...
@@ -57,7 +57,7 @@ RSpec.describe RescheduleMigrateIssueTrackersData do
migrate!
expect
(
migration_name
).
to
be_scheduled_delayed_migration
(
3
.
minutes
,
jira_integration
.
id
,
bugzilla_integration
.
id
)
expect
(
migration_name
).
to
be_scheduled_delayed_migration
(
6
.
minutes
,
youtrack_
service
.
id
,
gitlab_service
.
id
)
expect
(
migration_name
).
to
be_scheduled_delayed_migration
(
6
.
minutes
,
youtrack_
integration
.
id
,
gitlab_service
.
id
)
expect
(
BackgroundMigrationWorker
.
jobs
.
size
).
to
eq
(
2
)
end
end
...
...
spec/models/project_spec.rb
View file @
150dc86e
...
...
@@ -62,7 +62,7 @@ RSpec.describe Project, factory_default: :keep do
it
{
is_expected
.
to
have_one
(
:teamcity_integration
)
}
it
{
is_expected
.
to
have_one
(
:jira_integration
)
}
it
{
is_expected
.
to
have_one
(
:redmine_integration
)
}
it
{
is_expected
.
to
have_one
(
:youtrack_
service
)
}
it
{
is_expected
.
to
have_one
(
:youtrack_
integration
)
}
it
{
is_expected
.
to
have_one
(
:custom_issue_tracker_integration
)
}
it
{
is_expected
.
to
have_one
(
:bugzilla_integration
)
}
it
{
is_expected
.
to
have_one
(
:ewm_integration
)
}
...
...
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