summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2018-09-21 14:22:46 +0300
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2018-09-21 14:22:46 +0300
commit0c812544214af8fb29e416925f4f30b623eb7c5e (patch)
treedf698e8f9d87e2e5bdd4fb49b18a3f0db6b9df21
parentd304af4bb42ddc79035a5161954d1bfe5892d914 (diff)
downloadgitlab-ce-0c812544214af8fb29e416925f4f30b623eb7c5e.tar.gz
Add message about disabled oauth feature in user profile
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
-rw-r--r--app/views/doorkeeper/applications/index.html.haml3
-rw-r--r--locale/gitlab.pot3
2 files changed, 6 insertions, 0 deletions
diff --git a/app/views/doorkeeper/applications/index.html.haml b/app/views/doorkeeper/applications/index.html.haml
index b11f441b3ba..1f5c70a6c6e 100644
--- a/app/views/doorkeeper/applications/index.html.haml
+++ b/app/views/doorkeeper/applications/index.html.haml
@@ -16,6 +16,9 @@
= _('Add new application')
= render 'form', application: @application
%hr
+ - else
+ .bs-callout.bs-callout-disabled
+ = _('Adding new applications is disabled in your GitLab instance. Please contact your GitLab administrator to get the permission')
- if user_oauth_applications?
.oauth-applications
%h5
diff --git a/locale/gitlab.pot b/locale/gitlab.pot
index dc8fc1e53a0..c9c13b1b720 100644
--- a/locale/gitlab.pot
+++ b/locale/gitlab.pot
@@ -355,6 +355,9 @@ msgstr ""
msgid "Add users to group"
msgstr ""
+msgid "Adding new applications is disabled in your GitLab instance. Please contact your GitLab administrator to get the permission"
+msgstr ""
+
msgid "Admin Area"
msgstr ""