From af5da7564edab1d3f2457e13e3157f2806b0b9a0 Mon Sep 17 00:00:00 2001
From: Takuya Noguchi <takninnovationresearch@gmail.com>
Date: Fri, 28 Jun 2019 13:25:56 +0000
Subject: [PATCH] Replace 'JIRA' with 'Jira'
https://community.atlassian.com/t5/Jira-questions/Is-it-quot-JIRA-quot-or-quot-Jira-quot/qaq-p/681163
Signed-off-by: Takuya Noguchi <takninnovationresearch@gmail.com>
---
Gemfile | 2 +-
app/models/project_services/jira_service.rb | 24 ++++++++--------
.../unreleased/63479-jira-capitalization.yml | 5 ++++
config/gitlab.yml.example | 2 +-
config/initializers/jira.rb | 2 +-
doc/README.md | 2 +-
doc/administration/logs.md | 2 +-
doc/api/merge_requests.md | 2 +-
doc/api/services.md | 26 ++++++++---------
doc/integration/README.md | 4 +--
doc/push_rules/push_rules.md | 4 +--
doc/university/README.md | 2 +-
doc/university/support/README.md | 2 +-
doc/user/index.md | 4 +--
doc/user/project/integrations/jira.md | 14 +++++-----
.../integrations/jira_cloud_configuration.md | 12 ++++----
.../integrations/jira_server_configuration.md | 2 +-
.../project/integrations/project_services.md | 2 +-
lib/api/helpers/services_helpers.rb | 10 +++----
locale/ar_SA/gitlab.po | 6 ++--
locale/bg/gitlab.po | 6 ++--
locale/bn_BD/gitlab.po | 6 ++--
locale/bn_IN/gitlab.po | 6 ++--
locale/ca_ES/gitlab.po | 6 ++--
locale/cs_CZ/gitlab.po | 6 ++--
locale/cy_GB/gitlab.po | 6 ++--
locale/da_DK/gitlab.po | 6 ++--
locale/de/gitlab.po | 6 ++--
locale/el_GR/gitlab.po | 6 ++--
locale/eo/gitlab.po | 6 ++--
locale/es/gitlab.po | 6 ++--
locale/et_EE/gitlab.po | 6 ++--
locale/fil_PH/gitlab.po | 6 ++--
locale/fr/gitlab.po | 6 ++--
locale/gitlab.pot | 6 ++--
locale/gl_ES/gitlab.po | 6 ++--
locale/he_IL/gitlab.po | 6 ++--
locale/hi_IN/gitlab.po | 6 ++--
locale/hr_HR/gitlab.po | 6 ++--
locale/hu_HU/gitlab.po | 6 ++--
locale/id_ID/gitlab.po | 6 ++--
locale/it/gitlab.po | 6 ++--
locale/ja/gitlab.po | 6 ++--
locale/ka_GE/gitlab.po | 6 ++--
locale/ko/gitlab.po | 6 ++--
locale/mn_MN/gitlab.po | 6 ++--
locale/nb_NO/gitlab.po | 6 ++--
locale/nl_NL/gitlab.po | 6 ++--
locale/pa_IN/gitlab.po | 6 ++--
locale/pl_PL/gitlab.po | 6 ++--
locale/pt_BR/gitlab.po | 6 ++--
locale/pt_PT/gitlab.po | 6 ++--
locale/ro_RO/gitlab.po | 6 ++--
locale/ru/gitlab.po | 6 ++--
locale/sk_SK/gitlab.po | 6 ++--
locale/sq_AL/gitlab.po | 6 ++--
locale/sr_CS/gitlab.po | 6 ++--
locale/sr_SP/gitlab.po | 6 ++--
locale/sv_SE/gitlab.po | 6 ++--
locale/sw_KE/gitlab.po | 6 ++--
locale/tr_TR/gitlab.po | 6 ++--
locale/uk/gitlab.po | 6 ++--
locale/zh_CN/gitlab.po | 6 ++--
locale/zh_HK/gitlab.po | 6 ++--
locale/zh_TW/gitlab.po | 6 ++--
.../projects/services_controller_spec.rb | 10 +++----
.../services/user_activates_jira_spec.rb | 28 +++++++++----------
spec/lib/gitlab/import_export/project.json | 2 +-
spec/lib/gitlab/issuable_sorter_spec.rb | 2 +-
spec/lib/gitlab/reference_extractor_spec.rb | 6 ++--
spec/models/concerns/mentionable_spec.rb | 2 +-
.../project_services/jira_service_spec.rb | 12 ++++----
.../merge_requests/merge_service_spec.rb | 6 ++--
spec/services/system_note_service_spec.rb | 2 +-
spec/support/helpers/jira_service_helper.rb | 2 +-
.../projects/services/_form.haml_spec.rb | 6 ++--
76 files changed, 241 insertions(+), 236 deletions(-)
create mode 100644 changelogs/unreleased/63479-jira-capitalization.yml
diff --git a/Gemfile b/Gemfile
index 302f39756e878..2f4e88a6457ec 100644
--- a/Gemfile
+++ b/Gemfile
@@ -211,7 +211,7 @@ gem 'discordrb-webhooks-blackst0ne', '~> 3.3', require: false
# HipChat integration
gem 'hipchat', '~> 1.5.0'
-# JIRA integration
+# Jira integration
gem 'jira-ruby', '~> 1.4'
# Flowdock integration
diff --git a/app/models/project_services/jira_service.rb b/app/models/project_services/jira_service.rb
index 7b4832b84a8ee..f31eb7fd19a42 100644
--- a/app/models/project_services/jira_service.rb
+++ b/app/models/project_services/jira_service.rb
@@ -14,8 +14,8 @@ class JiraService < IssueTrackerService
format: { with: Gitlab::Regex.jira_transition_id_regex, message: s_("JiraService|transition ids can have only numbers which can be split with , or ;") },
allow_blank: true
- # JIRA cloud version is deprecating authentication via username and password.
- # We should use username/password for JIRA server and email/api_token for JIRA cloud,
+ # Jira Cloud version is deprecating authentication via username and password.
+ # We should use username/password for Jira Server and email/api_token for Jira Cloud,
# for more information check: https://gitlab.com/gitlab-org/gitlab-ce/issues/49936.
prop_accessor :username, :password, :url, :api_url, :jira_issue_transition_id, :title, :description
@@ -24,7 +24,7 @@ class JiraService < IssueTrackerService
alias_method :project_url, :url
# When these are false GitLab does not create cross reference
- # comments on JIRA except when an issue gets transitioned.
+ # comments on Jira except when an issue gets transitioned.
def self.supported_events
%w(commit merge_request)
end
@@ -69,16 +69,16 @@ def client
end
def help
- "You need to configure JIRA before enabling this service. For more details
+ "You need to configure Jira before enabling this service. For more details
read the
- [JIRA service documentation](#{help_page_url('user/project/integrations/jira')})."
+ [Jira service documentation](#{help_page_url('user/project/integrations/jira')})."
end
def title
if self.properties && self.properties['title'].present?
self.properties['title']
else
- 'JIRA'
+ 'Jira'
end
end
@@ -97,7 +97,7 @@ def self.to_param
def fields
[
{ type: 'text', name: 'url', title: s_('JiraService|Web URL'), placeholder: 'https://jira.example.com', required: true },
- { type: 'text', name: 'api_url', title: s_('JiraService|JIRA API URL'), placeholder: s_('JiraService|If different from Web URL') },
+ { type: 'text', name: 'api_url', title: s_('JiraService|Jira API URL'), placeholder: s_('JiraService|If different from Web URL') },
{ type: 'text', name: 'username', title: s_('JiraService|Username or Email'), placeholder: s_('JiraService|Use a username for server version and an email for cloud version'), required: true },
{ type: 'password', name: 'password', title: s_('JiraService|Password or API token'), placeholder: s_('JiraService|Use a password for server version and an API token for cloud version'), required: true },
{ type: 'text', name: 'jira_issue_transition_id', title: s_('JiraService|Transition ID(s)'), placeholder: s_('JiraService|Use , or ; to separate multiple transition IDs') }
@@ -130,7 +130,7 @@ def close_issue(entity, external_issue)
commit_url = build_entity_url(:commit, commit_id)
- # Depending on the JIRA project's workflow, a comment during transition
+ # Depending on the Jira project's workflow, a comment during transition
# may or may not be allowed. Refresh the issue after transition and check
# if it is closed, so we don't have one comment for every commit.
issue = jira_request { client.Issue.find(issue.key) } if transition_issue(issue)
@@ -177,7 +177,7 @@ def test(_)
{ success: success, result: result }
end
- # JIRA does not need test data.
+ # Jira does not need test data.
# We are requesting the project that belongs to the project key.
def test_data(user = nil, project = nil)
nil
@@ -313,7 +313,7 @@ def noteable_name(noteable)
name == "project_snippet" ? "snippet" : name
end
- # Handle errors when doing JIRA API calls
+ # Handle errors when doing Jira API calls
def jira_request
yield
@@ -339,9 +339,9 @@ def reset_password?
def self.event_description(event)
case event
when "merge_request", "merge_request_events"
- s_("JiraService|JIRA comments will be created when an issue gets referenced in a merge request.")
+ s_("JiraService|Jira comments will be created when an issue gets referenced in a merge request.")
when "commit", "commit_events"
- s_("JiraService|JIRA comments will be created when an issue gets referenced in a commit.")
+ s_("JiraService|Jira comments will be created when an issue gets referenced in a commit.")
end
end
end
diff --git a/changelogs/unreleased/63479-jira-capitalization.yml b/changelogs/unreleased/63479-jira-capitalization.yml
new file mode 100644
index 0000000000000..a4cc32beba60f
--- /dev/null
+++ b/changelogs/unreleased/63479-jira-capitalization.yml
@@ -0,0 +1,5 @@
+---
+title: Replace 'JIRA' with 'Jira'
+merge_request: 29849
+author: Takuya Noguchi
+type: other
diff --git a/config/gitlab.yml.example b/config/gitlab.yml.example
index dddc5ec35406b..c82d9b5ceef79 100644
--- a/config/gitlab.yml.example
+++ b/config/gitlab.yml.example
@@ -1078,7 +1078,7 @@ test:
issues_url: "http://redmine/:project_id/:issues_tracker_id/:id"
new_issue_url: "http://redmine/projects/:issues_tracker_id/issues/new"
jira:
- title: "JIRA"
+ title: "Jira"
url: https://sample_company.atlassian.net
project_key: PROJECT
diff --git a/config/initializers/jira.rb b/config/initializers/jira.rb
index 05f784a6a2a1c..664f9c878082e 100644
--- a/config/initializers/jira.rb
+++ b/config/initializers/jira.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-# Changes JIRA DVCS user agent requests in order to be successfully handled
+# Changes Jira DVCS user agent requests in order to be successfully handled
# by our API.
#
# Gitlab::Jira::Middleware is only defined on EE
diff --git a/doc/README.md b/doc/README.md
index cfda2c9293d9c..489c8117b9da5 100644
--- a/doc/README.md
+++ b/doc/README.md
@@ -209,7 +209,7 @@ The following documentation relates to the DevOps **Create** stage:
| [GitLab API](api/README.md) | Integrate GitLab via a simple and powerful API. |
| [GitLab Integration](integration/README.md) | Integrate with multiple third-party services with GitLab to allow external issue trackers and external authentication. |
| [GitLab Webhooks](user/project/integrations/webhooks.md) | Let GitLab notify you when new code has been pushed to your project. |
-| [JIRA Development Panel](integration/jira_development_panel.md) **[PREMIUM]** | See GitLab information in the JIRA Development Panel. |
+| [Jira Development Panel](integration/jira_development_panel.md) **[PREMIUM]** | See GitLab information in the Jira Development Panel. |
| [Project Services](user/project/integrations/project_services.md) | Integrate a project with external services, such as CI and chat. |
| [Trello Power-Up](integration/trello_power_up.md) | Integrate with GitLab's Trello Power-Up. |
diff --git a/doc/administration/logs.md b/doc/administration/logs.md
index 022c23d02ced8..9921ffd8ea020 100644
--- a/doc/administration/logs.md
+++ b/doc/administration/logs.md
@@ -125,7 +125,7 @@ This file lives in `/var/log/gitlab/gitlab-rails/integrations_json.log` for
Omnibus GitLab packages or in `/home/git/gitlab/log/integrations_json.log` for
installations from source.
-It contains information about [integrations](../user/project/integrations/project_services.md) activities such as JIRA, Asana and Irker services. It uses JSON format like the example below:
+It contains information about [integrations](../user/project/integrations/project_services.md) activities such as Jira, Asana and Irker services. It uses JSON format like the example below:
``` json
{"severity":"ERROR","time":"2018-09-06T14:56:20.439Z","service_class":"JiraService","project_id":8,"project_path":"h5bp/html5-boilerplate","message":"Error sending message","client_url":"http://jira.gitlap.com:8080","error":"execution expired"}
diff --git a/doc/api/merge_requests.md b/doc/api/merge_requests.md
index 7b58aa3100e30..85a0758995635 100644
--- a/doc/api/merge_requests.md
+++ b/doc/api/merge_requests.md
@@ -1473,7 +1473,7 @@ Example response when the GitLab issue tracker is used:
]
```
-Example response when an external issue tracker (e.g. JIRA) is used:
+Example response when an external issue tracker (e.g. Jira) is used:
```json
[
diff --git a/doc/api/services.md b/doc/api/services.md
index 042fee4a21a61..2368f36e44492 100644
--- a/doc/api/services.md
+++ b/doc/api/services.md
@@ -551,21 +551,21 @@ Get Irker (IRC gateway) service settings for a project.
GET /projects/:id/services/irker
```
-## JIRA
+## Jira
-JIRA issue tracker.
+Jira issue tracker.
-### Get JIRA service settings
+### Get Jira service settings
-Get JIRA service settings for a project.
+Get Jira service settings for a project.
```
GET /projects/:id/services/jira
```
-### Create/Edit JIRA service
+### Create/Edit Jira service
-Set JIRA service for a project.
+Set Jira service for a project.
> Starting with GitLab 8.14, `api_url`, `issues_url`, `new_issue_url` and
> `project_url` are replaced by `url`. If you are using an
@@ -579,18 +579,18 @@ Parameters:
| Parameter | Type | Required | Description |
| --------- | ---- | -------- | ----------- |
-| `url` | string | yes | The URL to the JIRA project which is being linked to this GitLab project. For example, `https://jira.example.com`. |
-| `api_url` | string | no | The base URL to the JIRA instance API. Web URL value will be used if not set. For example, `https://jira-api.example.com`. |
-| `username` | string | yes | The username of the user created to be used with GitLab/JIRA. |
-| `password` | string | yes | The password of the user created to be used with GitLab/JIRA. |
+| `url` | string | yes | The URL to the Jira project which is being linked to this GitLab project. For example, `https://jira.example.com`. |
+| `api_url` | string | no | The base URL to the Jira instance API. Web URL value will be used if not set. For example, `https://jira-api.example.com`. |
+| `username` | string | yes | The username of the user created to be used with GitLab/Jira. |
+| `password` | string | yes | The password of the user created to be used with GitLab/Jira. |
| `active` | boolean | no | Activates or deactivates the service. Defaults to false (deactivated). |
-| `jira_issue_transition_id` | string | no | The ID of a transition that moves issues to a closed state. You can find this number under the JIRA workflow administration (**Administration > Issues > Workflows**) by selecting **View** under **Operations** of the desired workflow of your project. The ID of each state can be found inside the parenthesis of each transition name under the **Transitions (id)** column ([see screenshot][trans]). By default, this ID is set to `2`. |
+| `jira_issue_transition_id` | string | no | The ID of a transition that moves issues to a closed state. You can find this number under the Jira workflow administration (**Administration > Issues > Workflows**) by selecting **View** under **Operations** of the desired workflow of your project. The ID of each state can be found inside the parenthesis of each transition name under the **Transitions (id)** column ([see screenshot][trans]). By default, this ID is set to `2`. |
| `commit_events` | boolean | false | Enable notifications for commit events |
| `merge_requests_events` | boolean | false | Enable notifications for merge request events |
-### Delete JIRA service
+### Delete Jira service
-Remove all previously JIRA settings from a project.
+Remove all previously Jira settings from a project.
```
DELETE /projects/:id/services/jira
diff --git a/doc/integration/README.md b/doc/integration/README.md
index f74da97119a80..135952a1b0838 100644
--- a/doc/integration/README.md
+++ b/doc/integration/README.md
@@ -13,10 +13,10 @@ See the documentation below for details on how to configure these services.
- [Auth0 OmniAuth](auth0.md) Enable the Auth0 OmniAuth provider
- [Bitbucket](bitbucket.md) Import projects from Bitbucket.org and login to your GitLab instance with your Bitbucket.org account
- [CAS](cas.md) Configure GitLab to sign in using CAS
-- [External issue tracker](external-issue-tracker.md) Redmine, JIRA, etc.
+- [External issue tracker](external-issue-tracker.md) Redmine, Jira, etc.
- [Gmail actions buttons](gmail_action_buttons_for_gitlab.md) Adds GitLab actions to messages
- [Jenkins](jenkins.md) Integrate with the Jenkins CI
-- [JIRA](../user/project/integrations/jira.md) Integrate with the JIRA issue tracker
+- [Jira](../user/project/integrations/jira.md) Integrate with the Jira issue tracker
- [Kerberos](kerberos.md) Integrate with Kerberos
- [LDAP](ldap.md) Set up sign in via LDAP
- [OAuth2 provider](oauth_provider.md) OAuth2 application creation
diff --git a/doc/push_rules/push_rules.md b/doc/push_rules/push_rules.md
index b2d626a0a7474..2142f5a5f6938 100644
--- a/doc/push_rules/push_rules.md
+++ b/doc/push_rules/push_rules.md
@@ -26,11 +26,11 @@ Every push rule could have its own use case, but let's consider some examples.
Let's assume you have the following requirements for your workflow:
-- every commit should reference a JIRA issue, for example: `Refactored css. Fixes JIRA-123.`
+- every commit should reference a Jira issue, for example: `Refactored css. Fixes JIRA-123.`
- users should not be able to remove git tags with `git push`
All you need to do is write a simple regular expression that requires the mention
-of a JIRA issue in the commit message, like `JIRA\-\d+`.
+of a Jira issue in the commit message, like `JIRA\-\d+`.
Now when a user tries to push a commit with a message `Bugfix`, their push will
be declined. Only pushing commits with messages like `Bugfix according to JIRA-123`
diff --git a/doc/university/README.md b/doc/university/README.md
index 1d2c0f2068a8f..9d861460618da 100644
--- a/doc/university/README.md
+++ b/doc/university/README.md
@@ -181,7 +181,7 @@ The GitLab University curriculum is composed of GitLab videos, screencasts, pres
### 3.9. Integrations
-1. [How to Integrate JIRA and Jenkins with GitLab - Video](https://gitlabmeetings.webex.com/gitlabmeetings/ldr.php?RCID=44b548147a67ab4d8a62274047146415)
+1. [How to Integrate Jira and Jenkins with GitLab - Video](https://gitlabmeetings.webex.com/gitlabmeetings/ldr.php?RCID=44b548147a67ab4d8a62274047146415)
1. [How to Integrate Jira with GitLab](../user/project/integrations/jira.md)
1. [How to Integrate Jenkins with GitLab](../integration/jenkins.md)
1. [How to Integrate Bamboo with GitLab](../user/project/integrations/bamboo.md)
diff --git a/doc/university/support/README.md b/doc/university/support/README.md
index 35e65b60768f8..2c6e52acfde3f 100644
--- a/doc/university/support/README.md
+++ b/doc/university/support/README.md
@@ -80,7 +80,7 @@ Our integrations add great value to GitLab. User questions often relate to integ
- Learn about our Integrations (specially, not only):
- [LDAP](../../integration/ldap.md)
- - [JIRA](../../project_services/jira.md)
+ - [Jira](../../project_services/jira.md)
- [Jenkins](../../integration/jenkins.md)
- [SAML](../../integration/saml.md)
diff --git a/doc/user/index.md b/doc/user/index.md
index 1fc4e4c43cfea..899026a801f02 100644
--- a/doc/user/index.md
+++ b/doc/user/index.md
@@ -66,7 +66,7 @@ With GitLab Enterprise Edition, you can also:
- Leverage continuous delivery method with [Canary Deployments](project/canary_deployments.md).
- Scan your code for vulnerabilities and [display them in merge requests](application_security/sast/index.md).
-You can also [integrate](project/integrations/project_services.md) GitLab with numerous third-party applications, such as Mattermost, Microsoft Teams, HipChat, Trello, Slack, Bamboo CI, JIRA, and a lot more.
+You can also [integrate](project/integrations/project_services.md) GitLab with numerous third-party applications, such as Mattermost, Microsoft Teams, HipChat, Trello, Slack, Bamboo CI, Jira, and a lot more.
## Projects
@@ -153,7 +153,7 @@ you have quick access to. You can also gather feedback on them through
## Integrations
[Integrate GitLab](../integration/README.md) with your preferred tool,
-such as Trello, JIRA, etc.
+such as Trello, Jira, etc.
## Webhooks
diff --git a/doc/user/project/integrations/jira.md b/doc/user/project/integrations/jira.md
index 234e3ad31cce9..8f2e5a55b5fbc 100644
--- a/doc/user/project/integrations/jira.md
+++ b/doc/user/project/integrations/jira.md
@@ -39,7 +39,7 @@ a GitLab project with any single Jira project.
If you have one Jira instance, you can pre-fill the settings page with a default
template. See the [Services Templates][services-templates] docs.
-Configuration happens via user name and password. Connecting to a Jira server
+Configuration happens via user name and password. Connecting to a Jira Server
via CAS is not possible.
In order to enable the Jira service in GitLab, you need to first configure the
@@ -47,13 +47,13 @@ project in Jira and then enter the correct values in GitLab.
### Configuring Jira
-When connecting to **JIRA Server**, which supports basic authentication, a **username and password** are required. Check the link below and proceed to the next step:
+When connecting to **Jira Server**, which supports basic authentication, a **username and password** are required. Check the link below and proceed to the next step:
-- [Setting up a user in JIRA server](jira_server_configuration.md)
+- [Setting up a user in Jira Server](jira_server_configuration.md)
-When connecting to **JIRA Cloud**, which supports authentication via API token, an **email and API token**, are required. Check the link below and proceed to the next step:
+When connecting to **Jira Cloud**, which supports authentication via API token, an **email and API token**, are required. Check the link below and proceed to the next step:
-- [Setting up a user in JIRA cloud](jira_cloud_configuration.md)
+- [Setting up a user in Jira Cloud](jira_cloud_configuration.md)
### Configuring GitLab
@@ -77,8 +77,8 @@ in the table below.
| ----- | ----------- |
| `Web URL` | The base URL to the Jira instance web interface which is being linked to this GitLab project. E.g., `https://Jira.example.com`. |
| `Jira API URL` | The base URL to the Jira instance API. Web URL value will be used if not set. E.g., `https://jira-api.example.com`. |
-| `Username/Email` | Created when [configuring Jira step](#configuring-jira). Use `username` for **JIRA server** or `email` for **JIRA cloud**. |
-| `Password/API token` |Created in [configuring Jira step](#configuring-jira). Use `password` for **JIRA server** or `API token` for **JIRA cloud**. |
+| `Username/Email` | Created when [configuring Jira step](#configuring-jira). Use `username` for **Jira Server** or `email` for **Jira Cloud**. |
+| `Password/API token` |Created in [configuring Jira step](#configuring-jira). Use `password` for **Jira Server** or `API token` for **Jira Cloud**. |
| `Transition ID` | This is the ID of a transition that moves issues to the desired state. It is possible to insert transition ids separated by `,` or `;` which means the issue will be moved to each state after another using the given order. **Closing Jira issues via commits or Merge Requests won't work if you don't set the ID correctly.** |
### Obtaining a transition ID
diff --git a/doc/user/project/integrations/jira_cloud_configuration.md b/doc/user/project/integrations/jira_cloud_configuration.md
index 849df7075213f..614f05d5b7ed8 100644
--- a/doc/user/project/integrations/jira_cloud_configuration.md
+++ b/doc/user/project/integrations/jira_cloud_configuration.md
@@ -1,18 +1,18 @@
-# Creating an API token in JIRA cloud
+# Creating an API token in Jira Cloud
-An API token is needed when integrating with JIRA Cloud, follow the steps
+An API token is needed when integrating with Jira Cloud, follow the steps
below to create one:
1. Log in to <https://id.atlassian.com> with your email.
1. **Click API tokens**, then **Create API token**.
-
+
-
+
1. Make sure to write down your new API token as you will need it in the next [steps](jira.md#configuring-gitlab).
NOTE: **Note**
-It is important that the user associated with this email has 'write' access to projects in JIRA.
+It is important that the user associated with this email has 'write' access to projects in Jira.
-The JIRA configuration is complete. You are going to need this new created token and the email you used to log in when [configuring GitLab in the next section](jira.md#configuring-gitlab).
+The Jira configuration is complete. You are going to need this newly created token and the email you used to log in, when [configuring GitLab in the next section](jira.md#configuring-gitlab).
diff --git a/doc/user/project/integrations/jira_server_configuration.md b/doc/user/project/integrations/jira_server_configuration.md
index 13d65c4d8e43e..3299171497326 100644
--- a/doc/user/project/integrations/jira_server_configuration.md
+++ b/doc/user/project/integrations/jira_server_configuration.md
@@ -1,4 +1,4 @@
-# Creating a username and password for JIRA server
+# Creating a username and password for Jira Server
We need to create a user in Jira which will have access to all projects that
need to integrate with GitLab.
diff --git a/doc/user/project/integrations/project_services.md b/doc/user/project/integrations/project_services.md
index 0bfee3bac9903..0e4c71a9d3ea4 100644
--- a/doc/user/project/integrations/project_services.md
+++ b/doc/user/project/integrations/project_services.md
@@ -38,7 +38,7 @@ Click on the service links to see further configuration instructions and details
| [Hangouts Chat](hangouts_chat.md) | Receive events notifications in Google Hangouts Chat |
| [HipChat](hipchat.md) | Private group chat and IM |
| [Irker (IRC gateway)](irker.md) | Send IRC messages, on update, to a list of recipients through an Irker gateway |
-| [JIRA](jira.md) | JIRA issue tracker |
+| [Jira](jira.md) | Jira issue tracker |
| [Jenkins](../../../integration/jenkins.md) **[STARTER]** | An extendable open source continuous integration server |
| JetBrains TeamCity CI | A continuous integration and build server |
| [Mattermost slash commands](mattermost_slash_commands.md) | Mattermost chat and ChatOps slash commands |
diff --git a/lib/api/helpers/services_helpers.rb b/lib/api/helpers/services_helpers.rb
index cf2e9d01356ef..c4ecf55969c41 100644
--- a/lib/api/helpers/services_helpers.rb
+++ b/lib/api/helpers/services_helpers.rb
@@ -462,31 +462,31 @@ def self.services
required: true,
name: :url,
type: String,
- desc: 'The base URL to the JIRA instance web interface which is being linked to this GitLab project. E.g., https://jira.example.com'
+ desc: 'The base URL to the Jira instance web interface which is being linked to this GitLab project. E.g., https://jira.example.com'
},
{
required: false,
name: :api_url,
type: String,
- desc: 'The base URL to the JIRA instance API. Web URL value will be used if not set. E.g., https://jira-api.example.com'
+ desc: 'The base URL to the Jira instance API. Web URL value will be used if not set. E.g., https://jira-api.example.com'
},
{
required: true,
name: :username,
type: String,
- desc: 'The username of the user created to be used with GitLab/JIRA'
+ desc: 'The username of the user created to be used with GitLab/Jira'
},
{
required: true,
name: :password,
type: String,
- desc: 'The password of the user created to be used with GitLab/JIRA'
+ desc: 'The password of the user created to be used with GitLab/Jira'
},
{
required: false,
name: :jira_issue_transition_id,
type: String,
- desc: 'The ID of a transition that moves issues to a closed state. You can find this number under the JIRA workflow administration (**Administration > Issues > Workflows**) by selecting **View** under **Operations** of the desired workflow of your project. The ID of each state can be found inside the parenthesis of each transition name under the **Transitions (id)** column ([see screenshot][trans]). By default, this ID is set to `2`'
+ desc: 'The ID of a transition that moves issues to a closed state. You can find this number under the Jira workflow administration (**Administration > Issues > Workflows**) by selecting **View** under **Operations** of the desired workflow of your project. The ID of each state can be found inside the parenthesis of each transition name under the **Transitions (id)** column ([see screenshot][trans]). By default, this ID is set to `2`'
}
],
'kubernetes' => [
diff --git a/locale/ar_SA/gitlab.po b/locale/ar_SA/gitlab.po
index 1b561621f6f6f..7ccdfa282e846 100644
--- a/locale/ar_SA/gitlab.po
+++ b/locale/ar_SA/gitlab.po
@@ -7581,13 +7581,13 @@ msgstr ""
msgid "JiraService|If different from Web URL"
msgstr ""
-msgid "JiraService|JIRA API URL"
+msgid "JiraService|Jira API URL"
msgstr ""
-msgid "JiraService|JIRA comments will be created when an issue gets referenced in a commit."
+msgid "JiraService|Jira comments will be created when an issue gets referenced in a commit."
msgstr ""
-msgid "JiraService|JIRA comments will be created when an issue gets referenced in a merge request."
+msgid "JiraService|Jira comments will be created when an issue gets referenced in a merge request."
msgstr ""
msgid "JiraService|Jira issue tracker"
diff --git a/locale/bg/gitlab.po b/locale/bg/gitlab.po
index 4d72599f5a326..9e24b950cdd7b 100644
--- a/locale/bg/gitlab.po
+++ b/locale/bg/gitlab.po
@@ -7373,13 +7373,13 @@ msgstr ""
msgid "JiraService|If different from Web URL"
msgstr ""
-msgid "JiraService|JIRA API URL"
+msgid "JiraService|Jira API URL"
msgstr ""
-msgid "JiraService|JIRA comments will be created when an issue gets referenced in a commit."
+msgid "JiraService|Jira comments will be created when an issue gets referenced in a commit."
msgstr ""
-msgid "JiraService|JIRA comments will be created when an issue gets referenced in a merge request."
+msgid "JiraService|Jira comments will be created when an issue gets referenced in a merge request."
msgstr ""
msgid "JiraService|Jira issue tracker"
diff --git a/locale/bn_BD/gitlab.po b/locale/bn_BD/gitlab.po
index c1b139055cc3d..c7c0695b58007 100644
--- a/locale/bn_BD/gitlab.po
+++ b/locale/bn_BD/gitlab.po
@@ -7373,13 +7373,13 @@ msgstr ""
msgid "JiraService|If different from Web URL"
msgstr ""
-msgid "JiraService|JIRA API URL"
+msgid "JiraService|Jira API URL"
msgstr ""
-msgid "JiraService|JIRA comments will be created when an issue gets referenced in a commit."
+msgid "JiraService|Jira comments will be created when an issue gets referenced in a commit."
msgstr ""
-msgid "JiraService|JIRA comments will be created when an issue gets referenced in a merge request."
+msgid "JiraService|Jira comments will be created when an issue gets referenced in a merge request."
msgstr ""
msgid "JiraService|Jira issue tracker"
diff --git a/locale/bn_IN/gitlab.po b/locale/bn_IN/gitlab.po
index 8c3512497e76f..56c5a3b3704e4 100644
--- a/locale/bn_IN/gitlab.po
+++ b/locale/bn_IN/gitlab.po
@@ -7373,13 +7373,13 @@ msgstr ""
msgid "JiraService|If different from Web URL"
msgstr ""
-msgid "JiraService|JIRA API URL"
+msgid "JiraService|Jira API URL"
msgstr ""
-msgid "JiraService|JIRA comments will be created when an issue gets referenced in a commit."
+msgid "JiraService|Jira comments will be created when an issue gets referenced in a commit."
msgstr ""
-msgid "JiraService|JIRA comments will be created when an issue gets referenced in a merge request."
+msgid "JiraService|Jira comments will be created when an issue gets referenced in a merge request."
msgstr ""
msgid "JiraService|Jira issue tracker"
diff --git a/locale/ca_ES/gitlab.po b/locale/ca_ES/gitlab.po
index 69c1971701ffb..c0b4aea4a998e 100644
--- a/locale/ca_ES/gitlab.po
+++ b/locale/ca_ES/gitlab.po
@@ -7373,13 +7373,13 @@ msgstr ""
msgid "JiraService|If different from Web URL"
msgstr ""
-msgid "JiraService|JIRA API URL"
+msgid "JiraService|Jira API URL"
msgstr ""
-msgid "JiraService|JIRA comments will be created when an issue gets referenced in a commit."
+msgid "JiraService|Jira comments will be created when an issue gets referenced in a commit."
msgstr ""
-msgid "JiraService|JIRA comments will be created when an issue gets referenced in a merge request."
+msgid "JiraService|Jira comments will be created when an issue gets referenced in a merge request."
msgstr ""
msgid "JiraService|Jira issue tracker"
diff --git a/locale/cs_CZ/gitlab.po b/locale/cs_CZ/gitlab.po
index 2e072b2a16eca..1184a326ede9d 100644
--- a/locale/cs_CZ/gitlab.po
+++ b/locale/cs_CZ/gitlab.po
@@ -7477,13 +7477,13 @@ msgstr ""
msgid "JiraService|If different from Web URL"
msgstr ""
-msgid "JiraService|JIRA API URL"
+msgid "JiraService|Jira API URL"
msgstr ""
-msgid "JiraService|JIRA comments will be created when an issue gets referenced in a commit."
+msgid "JiraService|Jira comments will be created when an issue gets referenced in a commit."
msgstr ""
-msgid "JiraService|JIRA comments will be created when an issue gets referenced in a merge request."
+msgid "JiraService|Jira comments will be created when an issue gets referenced in a merge request."
msgstr ""
msgid "JiraService|Jira issue tracker"
diff --git a/locale/cy_GB/gitlab.po b/locale/cy_GB/gitlab.po
index 24ab2e96c782e..019dcd25e72f6 100644
--- a/locale/cy_GB/gitlab.po
+++ b/locale/cy_GB/gitlab.po
@@ -7581,13 +7581,13 @@ msgstr ""
msgid "JiraService|If different from Web URL"
msgstr ""
-msgid "JiraService|JIRA API URL"
+msgid "JiraService|Jira API URL"
msgstr ""
-msgid "JiraService|JIRA comments will be created when an issue gets referenced in a commit."
+msgid "JiraService|Jira comments will be created when an issue gets referenced in a commit."
msgstr ""
-msgid "JiraService|JIRA comments will be created when an issue gets referenced in a merge request."
+msgid "JiraService|Jira comments will be created when an issue gets referenced in a merge request."
msgstr ""
msgid "JiraService|Jira issue tracker"
diff --git a/locale/da_DK/gitlab.po b/locale/da_DK/gitlab.po
index bada56b442ac8..f30fbc0806cfc 100644
--- a/locale/da_DK/gitlab.po
+++ b/locale/da_DK/gitlab.po
@@ -7373,13 +7373,13 @@ msgstr ""
msgid "JiraService|If different from Web URL"
msgstr ""
-msgid "JiraService|JIRA API URL"
+msgid "JiraService|Jira API URL"
msgstr ""
-msgid "JiraService|JIRA comments will be created when an issue gets referenced in a commit."
+msgid "JiraService|Jira comments will be created when an issue gets referenced in a commit."
msgstr ""
-msgid "JiraService|JIRA comments will be created when an issue gets referenced in a merge request."
+msgid "JiraService|Jira comments will be created when an issue gets referenced in a merge request."
msgstr ""
msgid "JiraService|Jira issue tracker"
diff --git a/locale/de/gitlab.po b/locale/de/gitlab.po
index daf877d3cff0e..7faeed34e59dd 100644
--- a/locale/de/gitlab.po
+++ b/locale/de/gitlab.po
@@ -7373,13 +7373,13 @@ msgstr ""
msgid "JiraService|If different from Web URL"
msgstr ""
-msgid "JiraService|JIRA API URL"
+msgid "JiraService|Jira API URL"
msgstr ""
-msgid "JiraService|JIRA comments will be created when an issue gets referenced in a commit."
+msgid "JiraService|Jira comments will be created when an issue gets referenced in a commit."
msgstr ""
-msgid "JiraService|JIRA comments will be created when an issue gets referenced in a merge request."
+msgid "JiraService|Jira comments will be created when an issue gets referenced in a merge request."
msgstr ""
msgid "JiraService|Jira issue tracker"
diff --git a/locale/el_GR/gitlab.po b/locale/el_GR/gitlab.po
index f2d8321020cb2..2ac09933c10d8 100644
--- a/locale/el_GR/gitlab.po
+++ b/locale/el_GR/gitlab.po
@@ -7373,13 +7373,13 @@ msgstr ""
msgid "JiraService|If different from Web URL"
msgstr ""
-msgid "JiraService|JIRA API URL"
+msgid "JiraService|Jira API URL"
msgstr ""
-msgid "JiraService|JIRA comments will be created when an issue gets referenced in a commit."
+msgid "JiraService|Jira comments will be created when an issue gets referenced in a commit."
msgstr ""
-msgid "JiraService|JIRA comments will be created when an issue gets referenced in a merge request."
+msgid "JiraService|Jira comments will be created when an issue gets referenced in a merge request."
msgstr ""
msgid "JiraService|Jira issue tracker"
diff --git a/locale/eo/gitlab.po b/locale/eo/gitlab.po
index 7960be28abdc6..df88e81f3d3ed 100644
--- a/locale/eo/gitlab.po
+++ b/locale/eo/gitlab.po
@@ -7373,13 +7373,13 @@ msgstr ""
msgid "JiraService|If different from Web URL"
msgstr ""
-msgid "JiraService|JIRA API URL"
+msgid "JiraService|Jira API URL"
msgstr ""
-msgid "JiraService|JIRA comments will be created when an issue gets referenced in a commit."
+msgid "JiraService|Jira comments will be created when an issue gets referenced in a commit."
msgstr ""
-msgid "JiraService|JIRA comments will be created when an issue gets referenced in a merge request."
+msgid "JiraService|Jira comments will be created when an issue gets referenced in a merge request."
msgstr ""
msgid "JiraService|Jira issue tracker"
diff --git a/locale/es/gitlab.po b/locale/es/gitlab.po
index ca2c3450b4d34..616ef854a7d5c 100644
--- a/locale/es/gitlab.po
+++ b/locale/es/gitlab.po
@@ -7373,13 +7373,13 @@ msgstr "Los eventos para %{noteable_model_name} están deshabilitados."
msgid "JiraService|If different from Web URL"
msgstr "Si es diferente de la URL Web"
-msgid "JiraService|JIRA API URL"
+msgid "JiraService|Jira API URL"
msgstr "URL del API de JIRA"
-msgid "JiraService|JIRA comments will be created when an issue gets referenced in a commit."
+msgid "JiraService|Jira comments will be created when an issue gets referenced in a commit."
msgstr "Los comentarios de JIRA se crearán cuando se haga referencia a una incidencia en un commit."
-msgid "JiraService|JIRA comments will be created when an issue gets referenced in a merge request."
+msgid "JiraService|Jira comments will be created when an issue gets referenced in a merge request."
msgstr "Los comentarios de JIRA se crearán cuando se haga referencia a una incidencia en un commit."
msgid "JiraService|Jira issue tracker"
diff --git a/locale/et_EE/gitlab.po b/locale/et_EE/gitlab.po
index f1ed6ff3630c2..c7473191a42b5 100644
--- a/locale/et_EE/gitlab.po
+++ b/locale/et_EE/gitlab.po
@@ -7373,13 +7373,13 @@ msgstr ""
msgid "JiraService|If different from Web URL"
msgstr ""
-msgid "JiraService|JIRA API URL"
+msgid "JiraService|Jira API URL"
msgstr ""
-msgid "JiraService|JIRA comments will be created when an issue gets referenced in a commit."
+msgid "JiraService|Jira comments will be created when an issue gets referenced in a commit."
msgstr ""
-msgid "JiraService|JIRA comments will be created when an issue gets referenced in a merge request."
+msgid "JiraService|Jira comments will be created when an issue gets referenced in a merge request."
msgstr ""
msgid "JiraService|Jira issue tracker"
diff --git a/locale/fil_PH/gitlab.po b/locale/fil_PH/gitlab.po
index 30b0e53ea19bf..be757241241f6 100644
--- a/locale/fil_PH/gitlab.po
+++ b/locale/fil_PH/gitlab.po
@@ -7373,13 +7373,13 @@ msgstr ""
msgid "JiraService|If different from Web URL"
msgstr ""
-msgid "JiraService|JIRA API URL"
+msgid "JiraService|Jira API URL"
msgstr ""
-msgid "JiraService|JIRA comments will be created when an issue gets referenced in a commit."
+msgid "JiraService|Jira comments will be created when an issue gets referenced in a commit."
msgstr ""
-msgid "JiraService|JIRA comments will be created when an issue gets referenced in a merge request."
+msgid "JiraService|Jira comments will be created when an issue gets referenced in a merge request."
msgstr ""
msgid "JiraService|Jira issue tracker"
diff --git a/locale/fr/gitlab.po b/locale/fr/gitlab.po
index 12edcf96cffb0..9b938ee38e6e1 100644
--- a/locale/fr/gitlab.po
+++ b/locale/fr/gitlab.po
@@ -7373,13 +7373,13 @@ msgstr ""
msgid "JiraService|If different from Web URL"
msgstr ""
-msgid "JiraService|JIRA API URL"
+msgid "JiraService|Jira API URL"
msgstr ""
-msgid "JiraService|JIRA comments will be created when an issue gets referenced in a commit."
+msgid "JiraService|Jira comments will be created when an issue gets referenced in a commit."
msgstr ""
-msgid "JiraService|JIRA comments will be created when an issue gets referenced in a merge request."
+msgid "JiraService|Jira comments will be created when an issue gets referenced in a merge request."
msgstr ""
msgid "JiraService|Jira issue tracker"
diff --git a/locale/gitlab.pot b/locale/gitlab.pot
index b8ce2c20563d9..f6f1df21ba48a 100644
--- a/locale/gitlab.pot
+++ b/locale/gitlab.pot
@@ -5575,13 +5575,13 @@ msgstr ""
msgid "JiraService|If different from Web URL"
msgstr ""
-msgid "JiraService|JIRA API URL"
+msgid "JiraService|Jira API URL"
msgstr ""
-msgid "JiraService|JIRA comments will be created when an issue gets referenced in a commit."
+msgid "JiraService|Jira comments will be created when an issue gets referenced in a commit."
msgstr ""
-msgid "JiraService|JIRA comments will be created when an issue gets referenced in a merge request."
+msgid "JiraService|Jira comments will be created when an issue gets referenced in a merge request."
msgstr ""
msgid "JiraService|Jira issue tracker"
diff --git a/locale/gl_ES/gitlab.po b/locale/gl_ES/gitlab.po
index 880d0f2e9a994..50d4d42f36a6c 100644
--- a/locale/gl_ES/gitlab.po
+++ b/locale/gl_ES/gitlab.po
@@ -7373,13 +7373,13 @@ msgstr ""
msgid "JiraService|If different from Web URL"
msgstr ""
-msgid "JiraService|JIRA API URL"
+msgid "JiraService|Jira API URL"
msgstr ""
-msgid "JiraService|JIRA comments will be created when an issue gets referenced in a commit."
+msgid "JiraService|Jira comments will be created when an issue gets referenced in a commit."
msgstr ""
-msgid "JiraService|JIRA comments will be created when an issue gets referenced in a merge request."
+msgid "JiraService|Jira comments will be created when an issue gets referenced in a merge request."
msgstr ""
msgid "JiraService|Jira issue tracker"
diff --git a/locale/he_IL/gitlab.po b/locale/he_IL/gitlab.po
index dcfe3ceb8a380..dc6ff54372680 100644
--- a/locale/he_IL/gitlab.po
+++ b/locale/he_IL/gitlab.po
@@ -7477,13 +7477,13 @@ msgstr ""
msgid "JiraService|If different from Web URL"
msgstr ""
-msgid "JiraService|JIRA API URL"
+msgid "JiraService|Jira API URL"
msgstr ""
-msgid "JiraService|JIRA comments will be created when an issue gets referenced in a commit."
+msgid "JiraService|Jira comments will be created when an issue gets referenced in a commit."
msgstr ""
-msgid "JiraService|JIRA comments will be created when an issue gets referenced in a merge request."
+msgid "JiraService|Jira comments will be created when an issue gets referenced in a merge request."
msgstr ""
msgid "JiraService|Jira issue tracker"
diff --git a/locale/hi_IN/gitlab.po b/locale/hi_IN/gitlab.po
index 76b060f25c3cc..126759c5828bc 100644
--- a/locale/hi_IN/gitlab.po
+++ b/locale/hi_IN/gitlab.po
@@ -7373,13 +7373,13 @@ msgstr ""
msgid "JiraService|If different from Web URL"
msgstr ""
-msgid "JiraService|JIRA API URL"
+msgid "JiraService|Jira API URL"
msgstr ""
-msgid "JiraService|JIRA comments will be created when an issue gets referenced in a commit."
+msgid "JiraService|Jira comments will be created when an issue gets referenced in a commit."
msgstr ""
-msgid "JiraService|JIRA comments will be created when an issue gets referenced in a merge request."
+msgid "JiraService|Jira comments will be created when an issue gets referenced in a merge request."
msgstr ""
msgid "JiraService|Jira issue tracker"
diff --git a/locale/hr_HR/gitlab.po b/locale/hr_HR/gitlab.po
index ae4a40dd8f748..1f3242a6731cd 100644
--- a/locale/hr_HR/gitlab.po
+++ b/locale/hr_HR/gitlab.po
@@ -7425,13 +7425,13 @@ msgstr ""
msgid "JiraService|If different from Web URL"
msgstr ""
-msgid "JiraService|JIRA API URL"
+msgid "JiraService|Jira API URL"
msgstr ""
-msgid "JiraService|JIRA comments will be created when an issue gets referenced in a commit."
+msgid "JiraService|Jira comments will be created when an issue gets referenced in a commit."
msgstr ""
-msgid "JiraService|JIRA comments will be created when an issue gets referenced in a merge request."
+msgid "JiraService|Jira comments will be created when an issue gets referenced in a merge request."
msgstr ""
msgid "JiraService|Jira issue tracker"
diff --git a/locale/hu_HU/gitlab.po b/locale/hu_HU/gitlab.po
index 131782290b2b4..142845c24a776 100644
--- a/locale/hu_HU/gitlab.po
+++ b/locale/hu_HU/gitlab.po
@@ -7373,13 +7373,13 @@ msgstr ""
msgid "JiraService|If different from Web URL"
msgstr ""
-msgid "JiraService|JIRA API URL"
+msgid "JiraService|Jira API URL"
msgstr ""
-msgid "JiraService|JIRA comments will be created when an issue gets referenced in a commit."
+msgid "JiraService|Jira comments will be created when an issue gets referenced in a commit."
msgstr ""
-msgid "JiraService|JIRA comments will be created when an issue gets referenced in a merge request."
+msgid "JiraService|Jira comments will be created when an issue gets referenced in a merge request."
msgstr ""
msgid "JiraService|Jira issue tracker"
diff --git a/locale/id_ID/gitlab.po b/locale/id_ID/gitlab.po
index f168090962334..be6c29d933c52 100644
--- a/locale/id_ID/gitlab.po
+++ b/locale/id_ID/gitlab.po
@@ -7321,13 +7321,13 @@ msgstr ""
msgid "JiraService|If different from Web URL"
msgstr ""
-msgid "JiraService|JIRA API URL"
+msgid "JiraService|Jira API URL"
msgstr ""
-msgid "JiraService|JIRA comments will be created when an issue gets referenced in a commit."
+msgid "JiraService|Jira comments will be created when an issue gets referenced in a commit."
msgstr ""
-msgid "JiraService|JIRA comments will be created when an issue gets referenced in a merge request."
+msgid "JiraService|Jira comments will be created when an issue gets referenced in a merge request."
msgstr ""
msgid "JiraService|Jira issue tracker"
diff --git a/locale/it/gitlab.po b/locale/it/gitlab.po
index 02fa65dfa10ee..9b3ec1809727a 100644
--- a/locale/it/gitlab.po
+++ b/locale/it/gitlab.po
@@ -7373,13 +7373,13 @@ msgstr ""
msgid "JiraService|If different from Web URL"
msgstr ""
-msgid "JiraService|JIRA API URL"
+msgid "JiraService|Jira API URL"
msgstr ""
-msgid "JiraService|JIRA comments will be created when an issue gets referenced in a commit."
+msgid "JiraService|Jira comments will be created when an issue gets referenced in a commit."
msgstr ""
-msgid "JiraService|JIRA comments will be created when an issue gets referenced in a merge request."
+msgid "JiraService|Jira comments will be created when an issue gets referenced in a merge request."
msgstr ""
msgid "JiraService|Jira issue tracker"
diff --git a/locale/ja/gitlab.po b/locale/ja/gitlab.po
index 8964d2081bf2c..cc27cb0636480 100644
--- a/locale/ja/gitlab.po
+++ b/locale/ja/gitlab.po
@@ -7321,13 +7321,13 @@ msgstr ""
msgid "JiraService|If different from Web URL"
msgstr ""
-msgid "JiraService|JIRA API URL"
+msgid "JiraService|Jira API URL"
msgstr "JIRA APIã®URL"
-msgid "JiraService|JIRA comments will be created when an issue gets referenced in a commit."
+msgid "JiraService|Jira comments will be created when an issue gets referenced in a commit."
msgstr "課題ãŒã‚³ãƒŸãƒƒãƒˆã§å‚ç…§ã•ã‚Œã‚‹ã¨ JiraコメントãŒä½œæˆã•ã‚Œã¾ã™ã€‚"
-msgid "JiraService|JIRA comments will be created when an issue gets referenced in a merge request."
+msgid "JiraService|Jira comments will be created when an issue gets referenced in a merge request."
msgstr ""
msgid "JiraService|Jira issue tracker"
diff --git a/locale/ka_GE/gitlab.po b/locale/ka_GE/gitlab.po
index 5510c93d89165..f6d768828ca4c 100644
--- a/locale/ka_GE/gitlab.po
+++ b/locale/ka_GE/gitlab.po
@@ -7373,13 +7373,13 @@ msgstr ""
msgid "JiraService|If different from Web URL"
msgstr ""
-msgid "JiraService|JIRA API URL"
+msgid "JiraService|Jira API URL"
msgstr ""
-msgid "JiraService|JIRA comments will be created when an issue gets referenced in a commit."
+msgid "JiraService|Jira comments will be created when an issue gets referenced in a commit."
msgstr ""
-msgid "JiraService|JIRA comments will be created when an issue gets referenced in a merge request."
+msgid "JiraService|Jira comments will be created when an issue gets referenced in a merge request."
msgstr ""
msgid "JiraService|Jira issue tracker"
diff --git a/locale/ko/gitlab.po b/locale/ko/gitlab.po
index e9ae48c0a960b..6138874ac7d57 100644
--- a/locale/ko/gitlab.po
+++ b/locale/ko/gitlab.po
@@ -7321,13 +7321,13 @@ msgstr ""
msgid "JiraService|If different from Web URL"
msgstr ""
-msgid "JiraService|JIRA API URL"
+msgid "JiraService|Jira API URL"
msgstr ""
-msgid "JiraService|JIRA comments will be created when an issue gets referenced in a commit."
+msgid "JiraService|Jira comments will be created when an issue gets referenced in a commit."
msgstr ""
-msgid "JiraService|JIRA comments will be created when an issue gets referenced in a merge request."
+msgid "JiraService|Jira comments will be created when an issue gets referenced in a merge request."
msgstr ""
msgid "JiraService|Jira issue tracker"
diff --git a/locale/mn_MN/gitlab.po b/locale/mn_MN/gitlab.po
index 3e127d662ab15..11bb2a40d1480 100644
--- a/locale/mn_MN/gitlab.po
+++ b/locale/mn_MN/gitlab.po
@@ -7373,13 +7373,13 @@ msgstr ""
msgid "JiraService|If different from Web URL"
msgstr ""
-msgid "JiraService|JIRA API URL"
+msgid "JiraService|Jira API URL"
msgstr ""
-msgid "JiraService|JIRA comments will be created when an issue gets referenced in a commit."
+msgid "JiraService|Jira comments will be created when an issue gets referenced in a commit."
msgstr ""
-msgid "JiraService|JIRA comments will be created when an issue gets referenced in a merge request."
+msgid "JiraService|Jira comments will be created when an issue gets referenced in a merge request."
msgstr ""
msgid "JiraService|Jira issue tracker"
diff --git a/locale/nb_NO/gitlab.po b/locale/nb_NO/gitlab.po
index 1a65c08fd327f..7f150c167ee92 100644
--- a/locale/nb_NO/gitlab.po
+++ b/locale/nb_NO/gitlab.po
@@ -7373,13 +7373,13 @@ msgstr ""
msgid "JiraService|If different from Web URL"
msgstr ""
-msgid "JiraService|JIRA API URL"
+msgid "JiraService|Jira API URL"
msgstr ""
-msgid "JiraService|JIRA comments will be created when an issue gets referenced in a commit."
+msgid "JiraService|Jira comments will be created when an issue gets referenced in a commit."
msgstr ""
-msgid "JiraService|JIRA comments will be created when an issue gets referenced in a merge request."
+msgid "JiraService|Jira comments will be created when an issue gets referenced in a merge request."
msgstr ""
msgid "JiraService|Jira issue tracker"
diff --git a/locale/nl_NL/gitlab.po b/locale/nl_NL/gitlab.po
index a21a659f33d70..faa40d15de95a 100644
--- a/locale/nl_NL/gitlab.po
+++ b/locale/nl_NL/gitlab.po
@@ -7373,13 +7373,13 @@ msgstr ""
msgid "JiraService|If different from Web URL"
msgstr ""
-msgid "JiraService|JIRA API URL"
+msgid "JiraService|Jira API URL"
msgstr ""
-msgid "JiraService|JIRA comments will be created when an issue gets referenced in a commit."
+msgid "JiraService|Jira comments will be created when an issue gets referenced in a commit."
msgstr ""
-msgid "JiraService|JIRA comments will be created when an issue gets referenced in a merge request."
+msgid "JiraService|Jira comments will be created when an issue gets referenced in a merge request."
msgstr ""
msgid "JiraService|Jira issue tracker"
diff --git a/locale/pa_IN/gitlab.po b/locale/pa_IN/gitlab.po
index f24100b1dc5bd..723f2d4cb22f0 100644
--- a/locale/pa_IN/gitlab.po
+++ b/locale/pa_IN/gitlab.po
@@ -7373,13 +7373,13 @@ msgstr ""
msgid "JiraService|If different from Web URL"
msgstr ""
-msgid "JiraService|JIRA API URL"
+msgid "JiraService|Jira API URL"
msgstr ""
-msgid "JiraService|JIRA comments will be created when an issue gets referenced in a commit."
+msgid "JiraService|Jira comments will be created when an issue gets referenced in a commit."
msgstr ""
-msgid "JiraService|JIRA comments will be created when an issue gets referenced in a merge request."
+msgid "JiraService|Jira comments will be created when an issue gets referenced in a merge request."
msgstr ""
msgid "JiraService|Jira issue tracker"
diff --git a/locale/pl_PL/gitlab.po b/locale/pl_PL/gitlab.po
index 00fa4c3f03c73..e3b257d8c16e7 100644
--- a/locale/pl_PL/gitlab.po
+++ b/locale/pl_PL/gitlab.po
@@ -7477,13 +7477,13 @@ msgstr ""
msgid "JiraService|If different from Web URL"
msgstr ""
-msgid "JiraService|JIRA API URL"
+msgid "JiraService|Jira API URL"
msgstr ""
-msgid "JiraService|JIRA comments will be created when an issue gets referenced in a commit."
+msgid "JiraService|Jira comments will be created when an issue gets referenced in a commit."
msgstr ""
-msgid "JiraService|JIRA comments will be created when an issue gets referenced in a merge request."
+msgid "JiraService|Jira comments will be created when an issue gets referenced in a merge request."
msgstr ""
msgid "JiraService|Jira issue tracker"
diff --git a/locale/pt_BR/gitlab.po b/locale/pt_BR/gitlab.po
index b5dab7c6379c9..0a1e2508d66ec 100644
--- a/locale/pt_BR/gitlab.po
+++ b/locale/pt_BR/gitlab.po
@@ -7373,13 +7373,13 @@ msgstr "Eventos para %{noteable_model_name} estão desabilitados."
msgid "JiraService|If different from Web URL"
msgstr "Se diferente do URL da Web"
-msgid "JiraService|JIRA API URL"
+msgid "JiraService|Jira API URL"
msgstr "URL da API do JIRA"
-msgid "JiraService|JIRA comments will be created when an issue gets referenced in a commit."
+msgid "JiraService|Jira comments will be created when an issue gets referenced in a commit."
msgstr ""
-msgid "JiraService|JIRA comments will be created when an issue gets referenced in a merge request."
+msgid "JiraService|Jira comments will be created when an issue gets referenced in a merge request."
msgstr ""
msgid "JiraService|Jira issue tracker"
diff --git a/locale/pt_PT/gitlab.po b/locale/pt_PT/gitlab.po
index c9921faf12931..f9174152adf12 100644
--- a/locale/pt_PT/gitlab.po
+++ b/locale/pt_PT/gitlab.po
@@ -7373,13 +7373,13 @@ msgstr ""
msgid "JiraService|If different from Web URL"
msgstr ""
-msgid "JiraService|JIRA API URL"
+msgid "JiraService|Jira API URL"
msgstr ""
-msgid "JiraService|JIRA comments will be created when an issue gets referenced in a commit."
+msgid "JiraService|Jira comments will be created when an issue gets referenced in a commit."
msgstr ""
-msgid "JiraService|JIRA comments will be created when an issue gets referenced in a merge request."
+msgid "JiraService|Jira comments will be created when an issue gets referenced in a merge request."
msgstr ""
msgid "JiraService|Jira issue tracker"
diff --git a/locale/ro_RO/gitlab.po b/locale/ro_RO/gitlab.po
index 3d77b1552b4ed..71e8f9b199de0 100644
--- a/locale/ro_RO/gitlab.po
+++ b/locale/ro_RO/gitlab.po
@@ -7425,13 +7425,13 @@ msgstr ""
msgid "JiraService|If different from Web URL"
msgstr ""
-msgid "JiraService|JIRA API URL"
+msgid "JiraService|Jira API URL"
msgstr ""
-msgid "JiraService|JIRA comments will be created when an issue gets referenced in a commit."
+msgid "JiraService|Jira comments will be created when an issue gets referenced in a commit."
msgstr ""
-msgid "JiraService|JIRA comments will be created when an issue gets referenced in a merge request."
+msgid "JiraService|Jira comments will be created when an issue gets referenced in a merge request."
msgstr ""
msgid "JiraService|Jira issue tracker"
diff --git a/locale/ru/gitlab.po b/locale/ru/gitlab.po
index 521c7ea6203e4..bb9e59a36a4cf 100644
--- a/locale/ru/gitlab.po
+++ b/locale/ru/gitlab.po
@@ -7477,13 +7477,13 @@ msgstr ""
msgid "JiraService|If different from Web URL"
msgstr ""
-msgid "JiraService|JIRA API URL"
+msgid "JiraService|Jira API URL"
msgstr ""
-msgid "JiraService|JIRA comments will be created when an issue gets referenced in a commit."
+msgid "JiraService|Jira comments will be created when an issue gets referenced in a commit."
msgstr ""
-msgid "JiraService|JIRA comments will be created when an issue gets referenced in a merge request."
+msgid "JiraService|Jira comments will be created when an issue gets referenced in a merge request."
msgstr ""
msgid "JiraService|Jira issue tracker"
diff --git a/locale/sk_SK/gitlab.po b/locale/sk_SK/gitlab.po
index 763bb4a46f88f..0b014f91082a4 100644
--- a/locale/sk_SK/gitlab.po
+++ b/locale/sk_SK/gitlab.po
@@ -7477,13 +7477,13 @@ msgstr ""
msgid "JiraService|If different from Web URL"
msgstr ""
-msgid "JiraService|JIRA API URL"
+msgid "JiraService|Jira API URL"
msgstr ""
-msgid "JiraService|JIRA comments will be created when an issue gets referenced in a commit."
+msgid "JiraService|Jira comments will be created when an issue gets referenced in a commit."
msgstr ""
-msgid "JiraService|JIRA comments will be created when an issue gets referenced in a merge request."
+msgid "JiraService|Jira comments will be created when an issue gets referenced in a merge request."
msgstr ""
msgid "JiraService|Jira issue tracker"
diff --git a/locale/sq_AL/gitlab.po b/locale/sq_AL/gitlab.po
index d136efa8675b2..2e43589b1fcc3 100644
--- a/locale/sq_AL/gitlab.po
+++ b/locale/sq_AL/gitlab.po
@@ -7373,13 +7373,13 @@ msgstr ""
msgid "JiraService|If different from Web URL"
msgstr ""
-msgid "JiraService|JIRA API URL"
+msgid "JiraService|Jira API URL"
msgstr ""
-msgid "JiraService|JIRA comments will be created when an issue gets referenced in a commit."
+msgid "JiraService|Jira comments will be created when an issue gets referenced in a commit."
msgstr ""
-msgid "JiraService|JIRA comments will be created when an issue gets referenced in a merge request."
+msgid "JiraService|Jira comments will be created when an issue gets referenced in a merge request."
msgstr ""
msgid "JiraService|Jira issue tracker"
diff --git a/locale/sr_CS/gitlab.po b/locale/sr_CS/gitlab.po
index 4b89734ad0378..34ba686fc4582 100644
--- a/locale/sr_CS/gitlab.po
+++ b/locale/sr_CS/gitlab.po
@@ -7425,13 +7425,13 @@ msgstr ""
msgid "JiraService|If different from Web URL"
msgstr ""
-msgid "JiraService|JIRA API URL"
+msgid "JiraService|Jira API URL"
msgstr ""
-msgid "JiraService|JIRA comments will be created when an issue gets referenced in a commit."
+msgid "JiraService|Jira comments will be created when an issue gets referenced in a commit."
msgstr ""
-msgid "JiraService|JIRA comments will be created when an issue gets referenced in a merge request."
+msgid "JiraService|Jira comments will be created when an issue gets referenced in a merge request."
msgstr ""
msgid "JiraService|Jira issue tracker"
diff --git a/locale/sr_SP/gitlab.po b/locale/sr_SP/gitlab.po
index 8a796c7d2c4d0..cefbe0910c45a 100644
--- a/locale/sr_SP/gitlab.po
+++ b/locale/sr_SP/gitlab.po
@@ -7425,13 +7425,13 @@ msgstr ""
msgid "JiraService|If different from Web URL"
msgstr ""
-msgid "JiraService|JIRA API URL"
+msgid "JiraService|Jira API URL"
msgstr ""
-msgid "JiraService|JIRA comments will be created when an issue gets referenced in a commit."
+msgid "JiraService|Jira comments will be created when an issue gets referenced in a commit."
msgstr ""
-msgid "JiraService|JIRA comments will be created when an issue gets referenced in a merge request."
+msgid "JiraService|Jira comments will be created when an issue gets referenced in a merge request."
msgstr ""
msgid "JiraService|Jira issue tracker"
diff --git a/locale/sv_SE/gitlab.po b/locale/sv_SE/gitlab.po
index 5fc6478d0227d..33c75c49a0fcd 100644
--- a/locale/sv_SE/gitlab.po
+++ b/locale/sv_SE/gitlab.po
@@ -7373,13 +7373,13 @@ msgstr ""
msgid "JiraService|If different from Web URL"
msgstr ""
-msgid "JiraService|JIRA API URL"
+msgid "JiraService|Jira API URL"
msgstr ""
-msgid "JiraService|JIRA comments will be created when an issue gets referenced in a commit."
+msgid "JiraService|Jira comments will be created when an issue gets referenced in a commit."
msgstr ""
-msgid "JiraService|JIRA comments will be created when an issue gets referenced in a merge request."
+msgid "JiraService|Jira comments will be created when an issue gets referenced in a merge request."
msgstr ""
msgid "JiraService|Jira issue tracker"
diff --git a/locale/sw_KE/gitlab.po b/locale/sw_KE/gitlab.po
index 3b0ac677db728..63860064d3c3f 100644
--- a/locale/sw_KE/gitlab.po
+++ b/locale/sw_KE/gitlab.po
@@ -7373,13 +7373,13 @@ msgstr ""
msgid "JiraService|If different from Web URL"
msgstr ""
-msgid "JiraService|JIRA API URL"
+msgid "JiraService|Jira API URL"
msgstr ""
-msgid "JiraService|JIRA comments will be created when an issue gets referenced in a commit."
+msgid "JiraService|Jira comments will be created when an issue gets referenced in a commit."
msgstr ""
-msgid "JiraService|JIRA comments will be created when an issue gets referenced in a merge request."
+msgid "JiraService|Jira comments will be created when an issue gets referenced in a merge request."
msgstr ""
msgid "JiraService|Jira issue tracker"
diff --git a/locale/tr_TR/gitlab.po b/locale/tr_TR/gitlab.po
index a35ff0ce09f20..3b552a3cbda7a 100644
--- a/locale/tr_TR/gitlab.po
+++ b/locale/tr_TR/gitlab.po
@@ -7373,13 +7373,13 @@ msgstr ""
msgid "JiraService|If different from Web URL"
msgstr ""
-msgid "JiraService|JIRA API URL"
+msgid "JiraService|Jira API URL"
msgstr ""
-msgid "JiraService|JIRA comments will be created when an issue gets referenced in a commit."
+msgid "JiraService|Jira comments will be created when an issue gets referenced in a commit."
msgstr ""
-msgid "JiraService|JIRA comments will be created when an issue gets referenced in a merge request."
+msgid "JiraService|Jira comments will be created when an issue gets referenced in a merge request."
msgstr ""
msgid "JiraService|Jira issue tracker"
diff --git a/locale/uk/gitlab.po b/locale/uk/gitlab.po
index b802c6fa3238c..ee9d9bc0feece 100644
--- a/locale/uk/gitlab.po
+++ b/locale/uk/gitlab.po
@@ -7477,13 +7477,13 @@ msgstr ""
msgid "JiraService|If different from Web URL"
msgstr ""
-msgid "JiraService|JIRA API URL"
+msgid "JiraService|Jira API URL"
msgstr ""
-msgid "JiraService|JIRA comments will be created when an issue gets referenced in a commit."
+msgid "JiraService|Jira comments will be created when an issue gets referenced in a commit."
msgstr ""
-msgid "JiraService|JIRA comments will be created when an issue gets referenced in a merge request."
+msgid "JiraService|Jira comments will be created when an issue gets referenced in a merge request."
msgstr ""
msgid "JiraService|Jira issue tracker"
diff --git a/locale/zh_CN/gitlab.po b/locale/zh_CN/gitlab.po
index 7706403530547..bfa6064303c3e 100644
--- a/locale/zh_CN/gitlab.po
+++ b/locale/zh_CN/gitlab.po
@@ -7321,13 +7321,13 @@ msgstr "%{noteable_model_name} 事件已ç¦ç”¨ã€‚"
msgid "JiraService|If different from Web URL"
msgstr "如果与 Web URL ä¸åŒ"
-msgid "JiraService|JIRA API URL"
+msgid "JiraService|Jira API URL"
msgstr "JIRA API URL"
-msgid "JiraService|JIRA comments will be created when an issue gets referenced in a commit."
+msgid "JiraService|Jira comments will be created when an issue gets referenced in a commit."
msgstr "在æ交ä¸å¼•ç”¨è®®é¢˜æ—¶å°†åˆ›å»º JIRA 评论。"
-msgid "JiraService|JIRA comments will be created when an issue gets referenced in a merge request."
+msgid "JiraService|Jira comments will be created when an issue gets referenced in a merge request."
msgstr "在åˆå¹¶è¯·æ±‚ä¸å¼•ç”¨è®®é¢˜æ—¶å°†åˆ›å»º JIRA 评论。"
msgid "JiraService|Jira issue tracker"
diff --git a/locale/zh_HK/gitlab.po b/locale/zh_HK/gitlab.po
index 8485e17cd0d00..541978fd726a0 100644
--- a/locale/zh_HK/gitlab.po
+++ b/locale/zh_HK/gitlab.po
@@ -7321,13 +7321,13 @@ msgstr ""
msgid "JiraService|If different from Web URL"
msgstr ""
-msgid "JiraService|JIRA API URL"
+msgid "JiraService|Jira API URL"
msgstr ""
-msgid "JiraService|JIRA comments will be created when an issue gets referenced in a commit."
+msgid "JiraService|Jira comments will be created when an issue gets referenced in a commit."
msgstr ""
-msgid "JiraService|JIRA comments will be created when an issue gets referenced in a merge request."
+msgid "JiraService|Jira comments will be created when an issue gets referenced in a merge request."
msgstr ""
msgid "JiraService|Jira issue tracker"
diff --git a/locale/zh_TW/gitlab.po b/locale/zh_TW/gitlab.po
index e7be5df3c8014..22de348bdaa8e 100644
--- a/locale/zh_TW/gitlab.po
+++ b/locale/zh_TW/gitlab.po
@@ -7321,13 +7321,13 @@ msgstr ""
msgid "JiraService|If different from Web URL"
msgstr ""
-msgid "JiraService|JIRA API URL"
+msgid "JiraService|Jira API URL"
msgstr ""
-msgid "JiraService|JIRA comments will be created when an issue gets referenced in a commit."
+msgid "JiraService|Jira comments will be created when an issue gets referenced in a commit."
msgstr ""
-msgid "JiraService|JIRA comments will be created when an issue gets referenced in a merge request."
+msgid "JiraService|Jira comments will be created when an issue gets referenced in a merge request."
msgstr ""
msgid "JiraService|Jira issue tracker"
diff --git a/spec/controllers/projects/services_controller_spec.rb b/spec/controllers/projects/services_controller_spec.rb
index 5c7f8d95f825b..68eabce851361 100644
--- a/spec/controllers/projects/services_controller_spec.rb
+++ b/spec/controllers/projects/services_controller_spec.rb
@@ -128,7 +128,7 @@ def do_put
params: { namespace_id: project.namespace, project_id: project, id: service.to_param, service: { active: true } }
expect(response).to redirect_to(project_settings_integrations_path(project))
- expect(flash[:notice]).to eq 'JIRA activated.'
+ expect(flash[:notice]).to eq 'Jira activated.'
end
end
@@ -137,17 +137,17 @@ def do_put
put :update,
params: { namespace_id: project.namespace, project_id: project, id: service.to_param, service: { active: false } }
- expect(flash[:notice]).to eq 'JIRA settings saved, but not activated.'
+ expect(flash[:notice]).to eq 'Jira settings saved, but not activated.'
end
end
- context 'when activating JIRA service from a template' do
+ context 'when activating Jira service from a template' do
let(:template_service) { create(:jira_service, project: project, template: true) }
- it 'activate JIRA service from template' do
+ it 'activate Jira service from template' do
put :update, params: { namespace_id: project.namespace, project_id: project, id: service.to_param, service: { active: true } }
- expect(flash[:notice]).to eq 'JIRA activated.'
+ expect(flash[:notice]).to eq 'Jira activated.'
end
end
end
diff --git a/spec/features/projects/services/user_activates_jira_spec.rb b/spec/features/projects/services/user_activates_jira_spec.rb
index 08e1855d034c4..c52f38e28067c 100644
--- a/spec/features/projects/services/user_activates_jira_spec.rb
+++ b/spec/features/projects/services/user_activates_jira_spec.rb
@@ -29,27 +29,27 @@ def fill_form(active = true)
server_info = { key: 'value' }.to_json
WebMock.stub_request(:get, test_url).with(basic_auth: %w(username password)).to_return(body: server_info)
- click_link('JIRA')
+ click_link('Jira')
fill_form
click_button('Test settings and save changes')
wait_for_requests
end
- it 'activates the JIRA service' do
- expect(page).to have_content('JIRA activated.')
+ it 'activates the Jira service' do
+ expect(page).to have_content('Jira activated.')
expect(current_path).to eq(project_settings_integrations_path(project))
end
- it 'shows the JIRA link in the menu' do
+ it 'shows the Jira link in the menu' do
page.within('.nav-sidebar') do
- expect(page).to have_link('JIRA', href: url)
+ expect(page).to have_link('Jira', href: url)
end
end
end
context 'when Jira connection test fails' do
it 'shows errors when some required fields are not filled in' do
- click_link('JIRA')
+ click_link('Jira')
check 'Active'
fill_in 'service_password', with: 'password'
@@ -60,11 +60,11 @@ def fill_form(active = true)
end
end
- it 'activates the JIRA service' do
+ it 'activates the Jira service' do
WebMock.stub_request(:get, test_url).with(basic_auth: %w(username password))
.to_raise(JIRA::HTTPError.new(double(message: 'message')))
- click_link('JIRA')
+ click_link('Jira')
fill_form
click_button('Test settings and save changes')
wait_for_requests
@@ -75,7 +75,7 @@ def fill_form(active = true)
find('.flash-alert .flash-action').click
wait_for_requests
- expect(page).to have_content('JIRA activated.')
+ expect(page).to have_content('Jira activated.')
expect(current_path).to eq(project_settings_integrations_path(project))
end
end
@@ -83,19 +83,19 @@ def fill_form(active = true)
describe 'user sets Jira Service but keeps it disabled' do
before do
- click_link('JIRA')
+ click_link('Jira')
fill_form(false)
click_button('Save changes')
end
- it 'saves but does not activate the JIRA service' do
- expect(page).to have_content('JIRA settings saved, but not activated.')
+ it 'saves but does not activate the Jira service' do
+ expect(page).to have_content('Jira settings saved, but not activated.')
expect(current_path).to eq(project_settings_integrations_path(project))
end
- it 'does not show the JIRA link in the menu' do
+ it 'does not show the Jira link in the menu' do
page.within('.nav-sidebar') do
- expect(page).not_to have_link('JIRA', href: url)
+ expect(page).not_to have_link('Jira', href: url)
end
end
end
diff --git a/spec/lib/gitlab/import_export/project.json b/spec/lib/gitlab/import_export/project.json
index 6512fe80a3bdf..8be074f4b9b3c 100644
--- a/spec/lib/gitlab/import_export/project.json
+++ b/spec/lib/gitlab/import_export/project.json
@@ -6760,7 +6760,7 @@
},
{
"id": 95,
- "title": "JIRA",
+ "title": "Jira",
"project_id": 5,
"created_at": "2016-06-14T15:01:51.255Z",
"updated_at": "2016-06-14T15:01:51.255Z",
diff --git a/spec/lib/gitlab/issuable_sorter_spec.rb b/spec/lib/gitlab/issuable_sorter_spec.rb
index 642a6cb6caa1e..5bd76bc6081cf 100644
--- a/spec/lib/gitlab/issuable_sorter_spec.rb
+++ b/spec/lib/gitlab/issuable_sorter_spec.rb
@@ -26,7 +26,7 @@
expect(described_class.sort(project1, unsorted)).to eq(sorted)
end
- context 'for JIRA issues' do
+ context 'for Jira issues' do
let(:sorted) do
[ExternalIssue.new('JIRA-1', project1),
ExternalIssue.new('JIRA-2', project1),
diff --git a/spec/lib/gitlab/reference_extractor_spec.rb b/spec/lib/gitlab/reference_extractor_spec.rb
index d982053d92eb4..7513dbeeb6f37 100644
--- a/spec/lib/gitlab/reference_extractor_spec.rb
+++ b/spec/lib/gitlab/reference_extractor_spec.rb
@@ -197,14 +197,14 @@
let(:issue) { create(:issue, project: project) }
context 'when GitLab issues are enabled' do
- it 'returns both JIRA and internal issues' do
+ it 'returns both Jira and internal issues' do
subject.analyze("JIRA-123 and FOOBAR-4567 and #{issue.to_reference}")
expect(subject.issues).to eq [ExternalIssue.new('JIRA-123', project),
ExternalIssue.new('FOOBAR-4567', project),
issue]
end
- it 'returns only JIRA issues if the internal one does not exists' do
+ it 'returns only Jira issues if the internal one does not exists' do
subject.analyze("JIRA-123 and FOOBAR-4567 and #999")
expect(subject.issues).to eq [ExternalIssue.new('JIRA-123', project),
ExternalIssue.new('FOOBAR-4567', project)]
@@ -217,7 +217,7 @@
project.save!
end
- it 'returns only JIRA issues' do
+ it 'returns only Jira issues' do
subject.analyze("JIRA-123 and FOOBAR-4567 and #{issue.to_reference}")
expect(subject.issues).to eq [ExternalIssue.new('JIRA-123', project),
ExternalIssue.new('FOOBAR-4567', project)]
diff --git a/spec/models/concerns/mentionable_spec.rb b/spec/models/concerns/mentionable_spec.rb
index f31e3e8821d2b..6034344d03411 100644
--- a/spec/models/concerns/mentionable_spec.rb
+++ b/spec/models/concerns/mentionable_spec.rb
@@ -18,7 +18,7 @@ def author
let(:project) { create(:project) }
let(:mentionable) { Example.new }
- it 'excludes JIRA references' do
+ it 'excludes Jira references' do
allow(project).to receive_messages(jira_tracker?: true)
mentionable.project = project
diff --git a/spec/models/project_services/jira_service_spec.rb b/spec/models/project_services/jira_service_spec.rb
index 04ae9390436f6..fc08457a3c5dd 100644
--- a/spec/models/project_services/jira_service_spec.rb
+++ b/spec/models/project_services/jira_service_spec.rb
@@ -158,7 +158,7 @@
WebMock.stub_request(:post, @remote_link_url).with(basic_auth: %w(gitlab_jira_username gitlab_jira_password))
end
- it 'calls JIRA API' do
+ it 'calls Jira API' do
@jira_service.close_issue(resource, ExternalIssue.new('JIRA-123', project))
expect(WebMock).to have_requested(:post, @comment_url).with(
@@ -175,14 +175,14 @@
# Check https://developer.atlassian.com/jiradev/jira-platform/guides/other/guide-jira-remote-issue-links/fields-in-remote-issue-links
# for more information
- it 'creates Remote Link reference in JIRA for comment' do
+ it 'creates Remote Link reference in Jira for comment' do
@jira_service.close_issue(resource, ExternalIssue.new('JIRA-123', project))
favicon_path = "http://localhost/assets/#{find_asset('favicon.png').digest_path}"
# Creates comment
expect(WebMock).to have_requested(:post, @comment_url)
- # Creates Remote Link in JIRA issue fields
+ # Creates Remote Link in Jira issue fields
expect(WebMock).to have_requested(:post, @remote_link_url).with(
body: hash_including(
GlobalID: 'GitLab',
@@ -319,7 +319,7 @@ def test_settings(api_url = nil)
end
context 'when the test succeeds' do
- it 'tries to get JIRA project with URL when API URL not set' do
+ it 'tries to get Jira project with URL when API URL not set' do
test_settings('jira.example.com')
end
@@ -327,7 +327,7 @@ def test_settings(api_url = nil)
expect(test_settings).to eq( { success: true, result: { 'url' => 'http://url' } })
end
- it 'tries to get JIRA project with API URL if set' do
+ it 'tries to get Jira project with API URL if set' do
jira_service.update(api_url: 'http://jira.api.com')
test_settings('jira.api.com')
end
@@ -462,7 +462,7 @@ def test_settings(api_url = nil)
end
it 'is initialized' do
- expect(@service.title).to eq('JIRA')
+ expect(@service.title).to eq('Jira')
expect(@service.description).to eq('Jira issue tracker')
end
end
diff --git a/spec/services/merge_requests/merge_service_spec.rb b/spec/services/merge_requests/merge_service_spec.rb
index 2fbe5468b21d5..aa759ac9edc3f 100644
--- a/spec/services/merge_requests/merge_service_spec.rb
+++ b/spec/services/merge_requests/merge_service_spec.rb
@@ -58,7 +58,7 @@
expect(issue.reload.closed?).to be_truthy
end
- context 'with JIRA integration' do
+ context 'with Jira integration' do
include JiraServiceHelper
let(:jira_tracker) { project.create_jira_service }
@@ -72,7 +72,7 @@
allow(merge_request).to receive(:commits).and_return([commit])
end
- it 'closes issues on JIRA issue tracker' do
+ it 'closes issues on Jira issue tracker' do
jira_issue = ExternalIssue.new('JIRA-123', project)
stub_jira_urls(jira_issue)
commit = double('commit', safe_message: "Fixes #{jira_issue.to_reference}")
@@ -98,7 +98,7 @@
end
context "wrong issue markdown" do
- it 'does not close issues on JIRA issue tracker' do
+ it 'does not close issues on Jira issue tracker' do
jira_issue = ExternalIssue.new('#JIRA-123', project)
stub_jira_urls(jira_issue)
commit = double('commit', safe_message: "Fixes #{jira_issue.to_reference}")
diff --git a/spec/services/system_note_service_spec.rb b/spec/services/system_note_service_spec.rb
index 30a867fa7ba68..93fe3290d8bb1 100644
--- a/spec/services/system_note_service_spec.rb
+++ b/spec/services/system_note_service_spec.rb
@@ -750,7 +750,7 @@ def build_note(old_assignees, new_assignees)
end
end
- describe 'JIRA integration' do
+ describe 'Jira integration' do
include JiraServiceHelper
let(:project) { create(:jira_project, :repository) }
diff --git a/spec/support/helpers/jira_service_helper.rb b/spec/support/helpers/jira_service_helper.rb
index 477bbf1c2e0e5..7e955f3d59307 100644
--- a/spec/support/helpers/jira_service_helper.rb
+++ b/spec/support/helpers/jira_service_helper.rb
@@ -4,7 +4,7 @@ module JiraServiceHelper
def jira_service_settings
properties = {
- title: "JIRA tracker",
+ title: "Jira tracker",
url: JIRA_URL,
username: 'jira-user',
password: 'my-secret-password',
diff --git a/spec/views/projects/services/_form.haml_spec.rb b/spec/views/projects/services/_form.haml_spec.rb
index 85167bca11513..06e159f103b19 100644
--- a/spec/views/projects/services/_form.haml_spec.rb
+++ b/spec/views/projects/services/_form.haml_spec.rb
@@ -28,7 +28,7 @@
expect(rendered).to have_content('Event will be triggered when a merge request is created/updated/merged')
end
- context 'when service is JIRA' do
+ context 'when service is Jira' do
let(:project) { create(:jira_project) }
before do
@@ -38,8 +38,8 @@
it 'display merge_request_events and commit_events descriptions' do
render
- expect(rendered).to have_content('JIRA comments will be created when an issue gets referenced in a commit.')
- expect(rendered).to have_content('JIRA comments will be created when an issue gets referenced in a merge request.')
+ expect(rendered).to have_content('Jira comments will be created when an issue gets referenced in a commit.')
+ expect(rendered).to have_content('Jira comments will be created when an issue gets referenced in a merge request.')
end
end
end
--
GitLab