Merge branch 'fix-static-analysis' into 'master'

Fix static analysis

See merge request gitlab-org/gitlab-ce!21402
This commit is contained in:
James Lopez 2018-08-28 10:25:07 +00:00
commit 270c7b6f78
2 changed files with 3 additions and 2 deletions

View File

@ -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/push_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/models/concerns/relative_positioning.rb
app/workers/stuck_merge_jobs_worker.rb

View File

@ -3632,10 +3632,10 @@ msgstr ""
msgid "Milestones"
msgstr ""
msgid "Milestones| Youre 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| Youre about to permanently delete the milestone %{milestoneTitle} and remove it from %{issuesWithCount} and %{mergeRequestsWithCount}. Once deleted, it cannot be undone or recovered."
msgstr ""
msgid "Milestones| Youre about to permanently delete the milestone %{milestoneTitle} from this project. %{milestoneTitle} is not currently used in any issues or merge requests."
msgid "Milestones| Youre about to permanently delete the milestone %{milestoneTitle}. This milestone is not currently used in any issues or merge requests."
msgstr ""
msgid "Milestones|Delete milestone"