diff options
| author | Robert Speicher <robert@gitlab.com> | 2016-07-20 23:26:00 +0300 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2016-07-20 23:26:00 +0300 |
| commit | 22c8e21bf432a68f05bd81685d76acc0a3c9607f (patch) | |
| tree | 3d113695853db1348f31d1fbc1fbe17590aecefa /app/assets/javascripts | |
| parent | 5a77eb153669bfbac4ab1f05615d11965beb826d (diff) | |
| parent | 1a057d2b4013feb151e77aa71dd0b5a83412d2d6 (diff) | |
Merge branch 'email-domain-blacklist' into 'master'
Added the ability to block sign ups using a domain blacklist.
As part of this MR, I restructured the Application Settings form to separate **Sign up** related settings from **Sign in** related settings and make everything cleaner and easier to read.
Fixes #19749
Related to #5573
See merge request !5259
Diffstat (limited to 'app/assets/javascripts')
| -rw-r--r-- | app/assets/javascripts/admin.js.coffee | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/app/assets/javascripts/admin.js.coffee b/app/assets/javascripts/admin.js.coffee index b2b8e1b7ffb..90c09619f8c 100644 --- a/app/assets/javascripts/admin.js.coffee +++ b/app/assets/javascripts/admin.js.coffee @@ -38,3 +38,14 @@ class @Admin $('li.group_member').bind 'ajax:success', -> Turbolinks.visit(location.href) + + showBlacklistType = -> + if $("input[name='blacklist_type']:checked").val() == 'file' + $('.blacklist-file').show() + $('.blacklist-raw').hide() + else + $('.blacklist-file').hide() + $('.blacklist-raw').show() + + $("input[name='blacklist_type']").click showBlacklistType + showBlacklistType() |