Commit ed3d787e authored by Douglas Barbosa Alexandre's avatar Douglas Barbosa Alexandre

Merge branch 'update-comment-with-gitlab-foss-link' into 'master'

Update comment linking to the new issue

See merge request gitlab-org/gitlab!18197
parents 4cea6101 0578651c
...@@ -5,7 +5,7 @@ module DataFields ...@@ -5,7 +5,7 @@ module DataFields
class_methods do class_methods do
# Provide convenient accessor methods for data fields. # Provide convenient accessor methods for data fields.
# TODO: Simplify as part of https://gitlab.com/gitlab-org/gitlab-foss/issues/63084 # TODO: Simplify as part of https://gitlab.com/gitlab-org/gitlab/issues/29404
def data_field(*args) def data_field(*args)
args.each do |arg| args.each do |arg|
self.class_eval <<-RUBY, __FILE__, __LINE__ + 1 self.class_eval <<-RUBY, __FILE__, __LINE__ + 1
......
...@@ -4,7 +4,7 @@ class IssueTrackerService < Service ...@@ -4,7 +4,7 @@ class IssueTrackerService < Service
validate :one_issue_tracker, if: :activated?, on: :manual_change validate :one_issue_tracker, if: :activated?, on: :manual_change
# TODO: we can probably just delegate as part of # TODO: we can probably just delegate as part of
# https://gitlab.com/gitlab-org/gitlab-foss/issues/63084 # https://gitlab.com/gitlab-org/gitlab/issues/29404
data_field :project_url, :issues_url, :new_issue_url data_field :project_url, :issues_url, :new_issue_url
default_value_for :category, 'issue_tracker' default_value_for :category, 'issue_tracker'
...@@ -25,7 +25,7 @@ class IssueTrackerService < Service ...@@ -25,7 +25,7 @@ class IssueTrackerService < Service
end end
end end
# this will be removed as part of https://gitlab.com/gitlab-org/gitlab-foss/issues/63084 # this will be removed as part of https://gitlab.com/gitlab-org/gitlab/issues/29404
def title def title
if title_attribute = read_attribute(:title) if title_attribute = read_attribute(:title)
title_attribute title_attribute
...@@ -36,7 +36,7 @@ class IssueTrackerService < Service ...@@ -36,7 +36,7 @@ class IssueTrackerService < Service
end end
end end
# this will be removed as part of https://gitlab.com/gitlab-org/gitlab-foss/issues/63084 # this will be removed as part of https://gitlab.com/gitlab-org/gitlab/issues/29404
def description def description
if description_attribute = read_attribute(:description) if description_attribute = read_attribute(:description)
description_attribute description_attribute
...@@ -49,7 +49,7 @@ class IssueTrackerService < Service ...@@ -49,7 +49,7 @@ class IssueTrackerService < Service
def handle_properties def handle_properties
# this has been moved from initialize_properties and should be improved # this has been moved from initialize_properties and should be improved
# as part of https://gitlab.com/gitlab-org/gitlab-foss/issues/63084 # as part of https://gitlab.com/gitlab-org/gitlab/issues/29404
return unless properties return unless properties
@legacy_properties_data = properties.dup @legacy_properties_data = properties.dup
......
...@@ -19,7 +19,7 @@ class JiraService < IssueTrackerService ...@@ -19,7 +19,7 @@ class JiraService < IssueTrackerService
# for more information check: https://gitlab.com/gitlab-org/gitlab-foss/issues/49936. # for more information check: https://gitlab.com/gitlab-org/gitlab-foss/issues/49936.
# TODO: we can probably just delegate as part of # TODO: we can probably just delegate as part of
# https://gitlab.com/gitlab-org/gitlab-foss/issues/63084 # https://gitlab.com/gitlab-org/gitlab/issues/29404
data_field :username, :password, :url, :api_url, :jira_issue_transition_id data_field :username, :password, :url, :api_url, :jira_issue_transition_id
before_update :reset_password before_update :reset_password
......
...@@ -41,7 +41,7 @@ describe BugzillaService do ...@@ -41,7 +41,7 @@ describe BugzillaService do
{ project_url: url, issues_url: url, new_issue_url: url } { project_url: url, issues_url: url, new_issue_url: url }
end end
# this will be removed as part of https://gitlab.com/gitlab-org/gitlab-foss/issues/63084 # this will be removed as part of https://gitlab.com/gitlab-org/gitlab/issues/29404
context 'when data are stored in properties' do context 'when data are stored in properties' do
let(:properties) { access_params.merge(title: title, description: description) } let(:properties) { access_params.merge(title: title, description: description) }
let(:service) do let(:service) do
......
...@@ -55,7 +55,7 @@ describe CustomIssueTrackerService do ...@@ -55,7 +55,7 @@ describe CustomIssueTrackerService do
{ project_url: url, issues_url: url, new_issue_url: url } { project_url: url, issues_url: url, new_issue_url: url }
end end
# this will be removed as part of https://gitlab.com/gitlab-org/gitlab-foss/issues/63084 # this will be removed as part of https://gitlab.com/gitlab-org/gitlab/issues/29404
context 'when data are stored in properties' do context 'when data are stored in properties' do
let(:properties) { access_params.merge(title: title, description: description) } let(:properties) { access_params.merge(title: title, description: description) }
let(:service) do let(:service) do
......
...@@ -58,7 +58,7 @@ describe GitlabIssueTrackerService do ...@@ -58,7 +58,7 @@ describe GitlabIssueTrackerService do
{ project_url: url, issues_url: url, new_issue_url: url } { project_url: url, issues_url: url, new_issue_url: url }
end end
# this will be removed as part of https://gitlab.com/gitlab-org/gitlab-foss/issues/63084 # this will be removed as part of https://gitlab.com/gitlab-org/gitlab/issues/29404
context 'when data are stored in properties' do context 'when data are stored in properties' do
let(:properties) { access_params.merge(title: title, description: description) } let(:properties) { access_params.merge(title: title, description: description) }
let(:service) do let(:service) do
......
...@@ -278,7 +278,7 @@ describe JiraService do ...@@ -278,7 +278,7 @@ describe JiraService do
end end
end end
# this will be removed as part of https://gitlab.com/gitlab-org/gitlab-foss/issues/63084 # this will be removed as part of https://gitlab.com/gitlab-org/gitlab/issues/29404
context 'when data are stored in properties' do context 'when data are stored in properties' do
let(:properties) { data_params.merge(title: title, description: description) } let(:properties) { data_params.merge(title: title, description: description) }
let!(:service) do let!(:service) do
......
...@@ -57,7 +57,7 @@ describe RedmineService do ...@@ -57,7 +57,7 @@ describe RedmineService do
{ project_url: url, issues_url: url, new_issue_url: url } { project_url: url, issues_url: url, new_issue_url: url }
end end
# this will be removed as part of https://gitlab.com/gitlab-org/gitlab-foss/issues/63084 # this will be removed as part of https://gitlab.com/gitlab-org/gitlab/issues/29404
context 'when data are stored in properties' do context 'when data are stored in properties' do
let(:properties) { access_params.merge(title: title, description: description) } let(:properties) { access_params.merge(title: title, description: description) }
let(:service) do let(:service) do
......
...@@ -45,7 +45,7 @@ describe YoutrackService do ...@@ -45,7 +45,7 @@ describe YoutrackService do
{ project_url: url, issues_url: url, new_issue_url: url } { project_url: url, issues_url: url, new_issue_url: url }
end end
# this will be removed as part of https://gitlab.com/gitlab-org/gitlab-foss/issues/63084 # this will be removed as part of https://gitlab.com/gitlab-org/gitlab/issues/29404
context 'when data are stored in properties' do context 'when data are stored in properties' do
let(:properties) { access_params.merge(title: title, description: description) } let(:properties) { access_params.merge(title: title, description: description) }
let(:service) do let(:service) do
......
...@@ -121,7 +121,7 @@ describe Service do ...@@ -121,7 +121,7 @@ describe Service do
end end
end end
# this will be removed as part of https://gitlab.com/gitlab-org/gitlab-foss/issues/63084 # this will be removed as part of https://gitlab.com/gitlab-org/gitlab/issues/29404
context 'when data are stored in properties' do context 'when data are stored in properties' do
let(:properties) { data_params.merge(title: title, description: description) } let(:properties) { data_params.merge(title: title, description: description) }
let!(:template) do let!(:template) 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