Add latest changes from gitlab-org/gitlab@master

lib/gitlab/query_limiting/middleware.rb

@@ -37,10 +37,10 @@ module Gitlab
         controller = env[CONTROLLER_KEY]
         action = "#{controller.class.name}##{controller.action_name}"
-        if controller.content_type == 'text/html'
+        if controller.media_type == 'text/html'
           action
         else
-          "#{action} (#{controller.content_type})"
+          "#{action} (#{controller.media_type})"
         end
       end

locale/ar_SA/gitlab.po

@@ -20432,9 +20432,6 @@ msgstr ""
 msgid "Unstaged %{type}"
 msgstr ""
-msgid "Unstaged and staged %{type}"
-msgstr ""
-
 msgid "Unstar"
 msgstr ""

locale/bg/gitlab.po

@@ -20020,9 +20020,6 @@ msgstr ""
 msgid "Unstaged %{type}"
 msgstr ""
-msgid "Unstaged and staged %{type}"
-msgstr ""
-
 msgid "Unstar"
 msgstr "Без звезда"

locale/bn_BD/gitlab.po

@@ -20020,9 +20020,6 @@ msgstr ""
 msgid "Unstaged %{type}"
 msgstr ""
-msgid "Unstaged and staged %{type}"
-msgstr ""
-
 msgid "Unstar"
 msgstr ""

locale/bn_IN/gitlab.po

@@ -20020,9 +20020,6 @@ msgstr ""
 msgid "Unstaged %{type}"
 msgstr ""
-msgid "Unstaged and staged %{type}"
-msgstr ""
-
 msgid "Unstar"
 msgstr ""

locale/ca_ES/gitlab.po

@@ -20020,9 +20020,6 @@ msgstr ""
 msgid "Unstaged %{type}"
 msgstr ""
-msgid "Unstaged and staged %{type}"
-msgstr ""
-
 msgid "Unstar"
 msgstr ""

locale/cs_CZ/gitlab.po

@@ -20226,9 +20226,6 @@ msgstr ""
 msgid "Unstaged %{type}"
 msgstr ""
-msgid "Unstaged and staged %{type}"
-msgstr ""
-
 msgid "Unstar"
 msgstr ""

locale/cy_GB/gitlab.po

@@ -20432,9 +20432,6 @@ msgstr ""
 msgid "Unstaged %{type}"
 msgstr ""
-msgid "Unstaged and staged %{type}"
-msgstr ""
-
 msgid "Unstar"
 msgstr ""

locale/da_DK/gitlab.po

@@ -20020,9 +20020,6 @@ msgstr ""
 msgid "Unstaged %{type}"
 msgstr ""
-msgid "Unstaged and staged %{type}"
-msgstr ""
-
 msgid "Unstar"
 msgstr ""

locale/de/gitlab.po

@@ -20020,9 +20020,6 @@ msgstr "Nicht vorgemerkt"
 msgid "Unstaged %{type}"
 msgstr "Nicht vorgemerkt %{type}"
-msgid "Unstaged and staged %{type}"
-msgstr "Nicht vorgemerkt und vorgemerkt %{type}"
-
 msgid "Unstar"
 msgstr "Entfavorisieren"

locale/el_GR/gitlab.po

@@ -20020,9 +20020,6 @@ msgstr ""
 msgid "Unstaged %{type}"
 msgstr ""
-msgid "Unstaged and staged %{type}"
-msgstr ""
-
 msgid "Unstar"
 msgstr ""

locale/eo/gitlab.po

@@ -20020,9 +20020,6 @@ msgstr ""
 msgid "Unstaged %{type}"
 msgstr ""
-msgid "Unstaged and staged %{type}"
-msgstr ""
-
 msgid "Unstar"
 msgstr "Malsteligi"

locale/es/gitlab.po

@@ -20020,9 +20020,6 @@ msgstr ""
 msgid "Unstaged %{type}"
 msgstr ""
-msgid "Unstaged and staged %{type}"
-msgstr ""
-
 msgid "Unstar"
 msgstr "No Destacar"

locale/et_EE/gitlab.po

@@ -20020,9 +20020,6 @@ msgstr ""
 msgid "Unstaged %{type}"
 msgstr ""
-msgid "Unstaged and staged %{type}"
-msgstr ""
-
 msgid "Unstar"
 msgstr ""

locale/fa_IR/gitlab.po

@@ -20020,9 +20020,6 @@ msgstr ""
 msgid "Unstaged %{type}"
 msgstr ""
-msgid "Unstaged and staged %{type}"
-msgstr ""
-
 msgid "Unstar"
 msgstr ""

locale/fil_PH/gitlab.po

@@ -20020,9 +20020,6 @@ msgstr ""
 msgid "Unstaged %{type}"
 msgstr ""
-msgid "Unstaged and staged %{type}"
-msgstr ""
-
 msgid "Unstar"
 msgstr ""

locale/fr/gitlab.po

@@ -20020,9 +20020,6 @@ msgstr "Désindexé"
 msgid "Unstaged %{type}"
 msgstr "Désindexation de %{type}"
-msgid "Unstaged and staged %{type}"
-msgstr "%{type} non-indéxés et indexés"
-
 msgid "Unstar"
 msgstr "Supprimer des favoris"

locale/gitlab.pot

@@ -20259,9 +20259,6 @@ msgstr ""
 msgid "Unstaged %{type}"
 msgstr ""
-msgid "Unstaged and staged %{type}"
-msgstr ""
-
 msgid "Unstar"
 msgstr ""
@@ -21553,9 +21550,6 @@ msgstr ""
 msgid "You can create a new one or check them in your Personal Access Tokens settings %{pat_link}"
 msgstr ""
-msgid "You can create files directly in GitLab using one of the following options."
-msgstr ""
-
 msgid "You can create new ones at your %{pat_link_start}Personal Access Tokens%{pat_link_end} settings"
 msgstr ""
@@ -21571,6 +21565,9 @@ msgstr ""
 msgid "You can filter by 'days to merge' by clicking on the columns in the chart."
 msgstr ""
+msgid "You can get started by cloning the repository or start adding files to it with one of the following options."
+msgstr ""
+
 msgid "You can invite a new member to <strong>%{project_name}</strong> or invite another group."
 msgstr ""

locale/gl_ES/gitlab.po

@@ -20020,9 +20020,6 @@ msgstr ""
 msgid "Unstaged %{type}"
 msgstr ""
-msgid "Unstaged and staged %{type}"
-msgstr ""
-
 msgid "Unstar"
 msgstr ""

locale/he_IL/gitlab.po

@@ -20226,9 +20226,6 @@ msgstr ""
 msgid "Unstaged %{type}"
 msgstr ""
-msgid "Unstaged and staged %{type}"
-msgstr ""
-
 msgid "Unstar"
 msgstr ""