summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSean McGivern <sean@mcgivern.me.uk>2018-08-28 10:25:07 +0000
committerJames Lopez <james@gitlab.com>2018-08-28 10:25:07 +0000
commit2e995901ab70b3df6b88f687aa2757a7cc019d1e (patch)
treea8bebfbcda049de708bc16e95a6c60305b0d5e59
parentc3e01c7b7b79b61752047454ae103bc23321615a (diff)
downloadgitlab-ce-2e995901ab70b3df6b88f687aa2757a7cc019d1e.tar.gz
Fix static analysis
-rw-r--r--.flayignore1
-rw-r--r--locale/gitlab.pot4
2 files changed, 3 insertions, 2 deletions
diff --git a/.flayignore b/.flayignore
index 4b6f7ba693a..87411516a2a 100644
--- a/.flayignore
+++ b/.flayignore
@@ -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
diff --git a/locale/gitlab.pot b/locale/gitlab.pot
index 8883857f914..ce5d82d479b 100644
--- a/locale/gitlab.pot
+++ b/locale/gitlab.pot
@@ -3632,10 +3632,10 @@ msgstr ""
msgid "Milestones"
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 ""
-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 ""
msgid "Milestones|Delete milestone"