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
31e89bc3
Commit
31e89bc3
authored
Apr 20, 2020
by
charlieablett
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Make Jira capitalisation consistent
- Change from `jira` to `Jira` in UI
parent
45183ce3
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
6 additions
and
6 deletions
+6
-6
app/controllers/projects/import/jira_controller.rb
app/controllers/projects/import/jira_controller.rb
+1
-1
app/services/jira_import/start_import_service.rb
app/services/jira_import/start_import_service.rb
+1
-1
lib/gitlab/jira_import/labels_importer.rb
lib/gitlab/jira_import/labels_importer.rb
+1
-1
locale/gitlab.pot
locale/gitlab.pot
+1
-1
spec/controllers/projects/import/jira_controller_spec.rb
spec/controllers/projects/import/jira_controller_spec.rb
+1
-1
spec/lib/gitlab/jira_import/labels_importer_spec.rb
spec/lib/gitlab/jira_import/labels_importer_spec.rb
+1
-1
No files found.
app/controllers/projects/import/jira_controller.rb
View file @
31e89bc3
...
@@ -36,7 +36,7 @@ module Projects
...
@@ -36,7 +36,7 @@ module Projects
response
=
::
JiraImport
::
StartImportService
.
new
(
current_user
,
@project
,
jira_project_key
).
execute
response
=
::
JiraImport
::
StartImportService
.
new
(
current_user
,
@project
,
jira_project_key
).
execute
flash
[
:notice
]
=
response
.
message
if
response
.
message
.
present?
flash
[
:notice
]
=
response
.
message
if
response
.
message
.
present?
else
else
flash
[
:alert
]
=
'No
j
ira project key has been provided.'
flash
[
:alert
]
=
'No
J
ira project key has been provided.'
end
end
redirect_to
project_import_jira_path
(
@project
)
redirect_to
project_import_jira_path
(
@project
)
...
...
app/services/jira_import/start_import_service.rb
View file @
31e89bc3
...
@@ -56,7 +56,7 @@ module JiraImport
...
@@ -56,7 +56,7 @@ module JiraImport
import_start_time
=
Time
.
zone
.
now
import_start_time
=
Time
.
zone
.
now
jira_imports_for_project
=
project
.
jira_imports
.
by_jira_project_key
(
jira_project_key
).
size
+
1
jira_imports_for_project
=
project
.
jira_imports
.
by_jira_project_key
(
jira_project_key
).
size
+
1
title
=
"jira-import::
#{
jira_project_key
}
-
#{
jira_imports_for_project
}
"
title
=
"jira-import::
#{
jira_project_key
}
-
#{
jira_imports_for_project
}
"
description
=
"Label for issues that were imported from
j
ira on
#{
import_start_time
.
strftime
(
'%Y-%m-%d %H:%M:%S'
)
}
"
description
=
"Label for issues that were imported from
J
ira on
#{
import_start_time
.
strftime
(
'%Y-%m-%d %H:%M:%S'
)
}
"
color
=
"
#{
Label
.
color_for
(
title
)
}
"
color
=
"
#{
Label
.
color_for
(
title
)
}
"
{
title:
title
,
description:
description
,
color:
color
}
{
title:
title
,
description:
description
,
color:
color
}
end
end
...
...
lib/gitlab/jira_import/labels_importer.rb
View file @
31e89bc3
...
@@ -19,7 +19,7 @@ module Gitlab
...
@@ -19,7 +19,7 @@ module Gitlab
def
cache_import_label
(
project
)
def
cache_import_label
(
project
)
label
=
project
.
jira_imports
.
by_jira_project_key
(
jira_project_key
).
last
.
label
label
=
project
.
jira_imports
.
by_jira_project_key
(
jira_project_key
).
last
.
label
raise
Projects
::
ImportService
::
Error
,
_
(
'Failed to find import label for
j
ira import.'
)
unless
label
raise
Projects
::
ImportService
::
Error
,
_
(
'Failed to find import label for
J
ira import.'
)
unless
label
JiraImport
.
cache_import_label_id
(
project
.
id
,
label
.
id
)
JiraImport
.
cache_import_label_id
(
project
.
id
,
label
.
id
)
end
end
...
...
locale/gitlab.pot
View file @
31e89bc3
...
@@ -8759,7 +8759,7 @@ msgstr ""
...
@@ -8759,7 +8759,7 @@ msgstr ""
msgid "Failed to enqueue the rebase operation, possibly due to a long-lived transaction. Try again later."
msgid "Failed to enqueue the rebase operation, possibly due to a long-lived transaction. Try again later."
msgstr ""
msgstr ""
msgid "Failed to find import label for
j
ira import."
msgid "Failed to find import label for
J
ira import."
msgstr ""
msgstr ""
msgid "Failed to get ref."
msgid "Failed to get ref."
...
...
spec/controllers/projects/import/jira_controller_spec.rb
View file @
31e89bc3
...
@@ -152,7 +152,7 @@ describe Projects::Import::JiraController do
...
@@ -152,7 +152,7 @@ describe Projects::Import::JiraController do
post
:import
,
params:
{
namespace_id:
project
.
namespace
,
project_id:
project
,
jira_project_key:
''
}
post
:import
,
params:
{
namespace_id:
project
.
namespace
,
project_id:
project
,
jira_project_key:
''
}
expect
(
response
).
to
redirect_to
(
project_import_jira_path
(
project
))
expect
(
response
).
to
redirect_to
(
project_import_jira_path
(
project
))
expect
(
flash
[
:alert
]).
to
eq
(
'No
j
ira project key has been provided.'
)
expect
(
flash
[
:alert
]).
to
eq
(
'No
J
ira project key has been provided.'
)
end
end
end
end
...
...
spec/lib/gitlab/jira_import/labels_importer_spec.rb
View file @
31e89bc3
...
@@ -18,7 +18,7 @@ describe Gitlab::JiraImport::LabelsImporter do
...
@@ -18,7 +18,7 @@ describe Gitlab::JiraImport::LabelsImporter do
let_it_be
(
:no_label_jira_import
)
{
create
(
:jira_import_state
,
label:
nil
,
project:
project
)
}
let_it_be
(
:no_label_jira_import
)
{
create
(
:jira_import_state
,
label:
nil
,
project:
project
)
}
it
'raises error'
do
it
'raises error'
do
expect
{
subject
}.
to
raise_error
(
Projects
::
ImportService
::
Error
,
'Failed to find import label for
j
ira import.'
)
expect
{
subject
}.
to
raise_error
(
Projects
::
ImportService
::
Error
,
'Failed to find import label for
J
ira import.'
)
end
end
end
end
...
...
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