Merge branch 'fix-static-analysis' into 'master'
Fix static analysis See merge request gitlab-org/gitlab-ce!21402
This commit is contained in:
commit
270c7b6f78
|
@ -6,6 +6,7 @@ app/controllers/projects/approvers_controller.rb
|
||||||
app/controllers/projects/protected_branches/merge_access_levels_controller.rb
|
app/controllers/projects/protected_branches/merge_access_levels_controller.rb
|
||||||
app/controllers/projects/protected_branches/push_access_levels_controller.rb
|
app/controllers/projects/protected_branches/push_access_levels_controller.rb
|
||||||
app/controllers/projects/protected_tags/create_access_levels_controller.rb
|
app/controllers/projects/protected_tags/create_access_levels_controller.rb
|
||||||
|
app/helpers/system_note_helper.rb
|
||||||
app/policies/project_policy.rb
|
app/policies/project_policy.rb
|
||||||
app/models/concerns/relative_positioning.rb
|
app/models/concerns/relative_positioning.rb
|
||||||
app/workers/stuck_merge_jobs_worker.rb
|
app/workers/stuck_merge_jobs_worker.rb
|
||||||
|
|
|
@ -3632,10 +3632,10 @@ msgstr ""
|
||||||
msgid "Milestones"
|
msgid "Milestones"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
msgid "Milestones| You’re about to permanently delete the milestone %{milestoneTitle} from this project and remove it from %{issuesWithCount} and %{mergeRequestsWithCount}. Once deleted, it cannot be undone or recovered."
|
msgid "Milestones| You’re about to permanently delete the milestone %{milestoneTitle} and remove it from %{issuesWithCount} and %{mergeRequestsWithCount}. Once deleted, it cannot be undone or recovered."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
msgid "Milestones| You’re about to permanently delete the milestone %{milestoneTitle} from this project. %{milestoneTitle} is not currently used in any issues or merge requests."
|
msgid "Milestones| You’re about to permanently delete the milestone %{milestoneTitle}. This milestone is not currently used in any issues or merge requests."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
msgid "Milestones|Delete milestone"
|
msgid "Milestones|Delete milestone"
|
||||||
|
|
Loading…
Reference in New Issue