Commit f33e7317 authored by Robert Speicher's avatar Robert Speicher

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

Remove dup filter_milestones_by_project and regen locale.pot

See merge request gitlab-org/gitlab-ee!13924
parents 4d137421 f676ccf6
......@@ -146,12 +146,6 @@ module Gitlab
milestones.where(project_id: project.id) # rubocop: disable CodeReuse/ActiveRecord
end
def filter_milestones_by_project(milestones)
return Milestone.none unless Ability.allowed?(@current_user, :read_milestone, @project)
milestones.where(project_id: project.id) # rubocop: disable CodeReuse/ActiveRecord
end
def repository_project_ref
@repository_project_ref ||= repository_ref || project.default_branch
end
......
......@@ -6836,7 +6836,7 @@ msgstr ""
msgid "If you lose your recovery codes you can generate new ones, invalidating all previous codes."
msgstr ""
msgid "If your HTTP repository is not publicly accessible, add authentication information to the URL: <code>https://username:password@gitlab.company.com/group/project.git</code>."
msgid "If your HTTP repository is not publicly accessible, add your credentials."
msgstr ""
msgid "ImageDiffViewer|2-up"
......@@ -9138,6 +9138,9 @@ msgstr ""
msgid "Password"
msgstr ""
msgid "Password (optional)"
msgstr ""
msgid "Password authentication is unavailable."
msgstr ""
......@@ -14401,6 +14404,9 @@ msgstr ""
msgid "UserProfile|Your projects can be available publicly, internally, or privately, at your choice."
msgstr ""
msgid "Username (optional)"
msgstr ""
msgid "Username is already taken."
msgstr ""
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment