From 4cd3c330241150c1fe235cafb655707316db3d8a Mon Sep 17 00:00:00 2001 From: Darby Date: Tue, 23 Jun 2015 14:39:04 -0700 Subject: Updated the categories of Application Settings Form --- Gemfile.lock | 3 + .../admin/application_settings/_form.html.haml | 108 +++++++++++---------- .../admin/application_settings/show.html.haml | 2 +- 3 files changed, 59 insertions(+), 54 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index b719dd4ab06..8d09fe9bf88 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -859,3 +859,6 @@ DEPENDENCIES virtus webmock (~> 1.21.0) wikicloth (= 0.8.1) + +BUNDLED WITH + 1.10.3 diff --git a/app/views/admin/application_settings/_form.html.haml b/app/views/admin/application_settings/_form.html.haml index d5a49fc41f4..6259176894f 100644 --- a/app/views/admin/application_settings/_form.html.haml +++ b/app/views/admin/application_settings/_form.html.haml @@ -6,19 +6,41 @@ %p= msg %fieldset - %legend Features + %legend Visibility and Access Controls .form-group - .col-sm-offset-2.col-sm-10 - .checkbox - = f.label :signup_enabled do - = f.check_box :signup_enabled - Signup enabled + = f.label :default_branch_protection, class: 'control-label col-sm-2' + .col-sm-10 + = f.select :default_branch_protection, options_for_select(Gitlab::Access.protection_options, @application_setting.default_branch_protection), {}, class: 'form-control' + .form-group.project-visibility-level-holder + = f.label :default_project_visibility, class: 'control-label col-sm-2' + .col-sm-10 + = render('shared/visibility_radios', model_method: :default_project_visibility, form: f, selected_level: @application_setting.default_project_visibility, form_model: 'Project') + .form-group.project-visibility-level-holder + = f.label :default_snippet_visibility, class: 'control-label col-sm-2' + .col-sm-10 + = render('shared/visibility_radios', model_method: :default_snippet_visibility, form: f, selected_level: @application_setting.default_snippet_visibility, form_model: 'Snippet') + .form-group + = f.label :restricted_visibility_levels, class: 'control-label col-sm-2' + .col-sm-10 + - data_attrs = { toggle: 'buttons' } + .btn-group{ data: data_attrs } + - restricted_level_checkboxes('restricted-visibility-help').each do |level| + = level + %span.help-block#restricted-visibility-help Selected levels cannot be used by non-admin users for projects or snippets + .form-group + = f.label :restricted_signup_domains, 'Restricted domains for sign-ups', class: 'control-label col-sm-2' + .col-sm-10 + = f.text_area :restricted_signup_domains_raw, placeholder: 'domain.com', class: 'form-control' + .help-block Only users with e-mail addresses that match these domain(s) will be able to sign-up. Wildcards allowed. Use separate lines for multiple entries. Ex: domain.com, *.domain.com .form-group .col-sm-offset-2.col-sm-10 .checkbox - = f.label :signin_enabled do - = f.check_box :signin_enabled - Signin enabled + = f.label :version_check_enabled do + = f.check_box :version_check_enabled + Version check enabled + + %fieldset + %legend Account and Limit Settings .form-group .col-sm-offset-2.col-sm-10 .checkbox @@ -32,38 +54,39 @@ = f.check_box :twitter_sharing_enabled, :'aria-describedby' => 'twitter_help_block' Twitter enabled %span.help-block#twitter_help_block Show users a button to share their newly created public or internal projects on twitter - .form-group - .col-sm-offset-2.col-sm-10 - .checkbox - = f.label :version_check_enabled do - = f.check_box :version_check_enabled - Version check enabled - %fieldset - %legend Misc .form-group = f.label :default_projects_limit, class: 'control-label col-sm-2' .col-sm-10 = f.number_field :default_projects_limit, class: 'form-control' .form-group - = f.label :default_branch_protection, class: 'control-label col-sm-2' - .col-sm-10 - = f.select :default_branch_protection, options_for_select(Gitlab::Access.protection_options, @application_setting.default_branch_protection), {}, class: 'form-control' - .form-group.project-visibility-level-holder - = f.label :default_project_visibility, class: 'control-label col-sm-2' + = f.label :max_attachment_size, 'Maximum attachment size (MB)', class: 'control-label col-sm-2' .col-sm-10 - = render('shared/visibility_radios', model_method: :default_project_visibility, form: f, selected_level: @application_setting.default_project_visibility, form_model: 'Project') - .form-group.project-visibility-level-holder - = f.label :default_snippet_visibility, class: 'control-label col-sm-2' + = f.number_field :max_attachment_size, class: 'form-control' + .form-group + = f.label :session_expire_delay, 'Session duration (minutes)', class: 'control-label col-sm-2' .col-sm-10 - = render('shared/visibility_radios', model_method: :default_snippet_visibility, form: f, selected_level: @application_setting.default_snippet_visibility, form_model: 'Snippet') + = f.number_field :session_expire_delay, class: 'form-control' + %span.help-block#session_expire_delay_help_block GitLab restart is required to apply changes .form-group - = f.label :restricted_visibility_levels, class: 'control-label col-sm-2' + = f.label :user_oauth_applications, 'User OAuth applications', class: 'control-label col-sm-2' .col-sm-10 - - data_attrs = { toggle: 'buttons' } - .btn-group{ data: data_attrs } - - restricted_level_checkboxes('restricted-visibility-help').each do |level| - = level - %span.help-block#restricted-visibility-help Selected levels cannot be used by non-admin users for projects or snippets + .checkbox + = f.label :user_oauth_applications do + = f.check_box :user_oauth_applications + Allow users to register any application to use GitLab as an OAuth provider + + %fieldset + %legend Sign-in Restrictions + .form-group + .col-sm-offset-2.col-sm-10 + .checkbox + + .form-group + .col-sm-offset-2.col-sm-10 + .checkbox + = f.label :signin_enabled do + = f.check_box :signin_enabled + Sign-in enabled .form-group = f.label :home_page_url, class: 'control-label col-sm-2' .col-sm-10 @@ -79,27 +102,6 @@ .col-sm-10 = f.text_area :sign_in_text, class: 'form-control', rows: 4 .help-block Markdown enabled - .form-group - = f.label :max_attachment_size, 'Maximum attachment size (MB)', class: 'control-label col-sm-2' - .col-sm-10 - = f.number_field :max_attachment_size, class: 'form-control' - .form-group - = f.label :session_expire_delay, 'Session duration (minutes)', class: 'control-label col-sm-2' - .col-sm-10 - = f.number_field :session_expire_delay, class: 'form-control' - %span.help-block#session_expire_delay_help_block GitLab restart is required to apply changes - .form-group - = f.label :restricted_signup_domains, 'Restricted domains for sign-ups', class: 'control-label col-sm-2' - .col-sm-10 - = f.text_area :restricted_signup_domains_raw, placeholder: 'domain.com', class: 'form-control' - .help-block Only users with e-mail addresses that match these domain(s) will be able to sign-up. Wildcards allowed. Use separate lines for multiple entries. Ex: domain.com, *.domain.com - .form_group - = f.label :user_oauth_applications, 'User OAuth applications', class: 'control-label col-sm-2' - .col-sm-10 - .checkbox - = f.label :user_oauth_applications do - = f.check_box :user_oauth_applications - Allow users to register any application to use GitLab as an OAuth provider .form-actions = f.submit 'Save', class: 'btn btn-primary' diff --git a/app/views/admin/application_settings/show.html.haml b/app/views/admin/application_settings/show.html.haml index 1632dd8affa..e9c7ca9d5aa 100644 --- a/app/views/admin/application_settings/show.html.haml +++ b/app/views/admin/application_settings/show.html.haml @@ -1,4 +1,4 @@ - page_title "Settings" -%h3.page-title Application settings +%h3.page-title Settings %hr = render 'form' -- cgit v1.2.1 From f0c4f0a5d4186be63037a09d681de137f274b119 Mon Sep 17 00:00:00 2001 From: Darby Date: Tue, 23 Jun 2015 15:54:33 -0700 Subject: Changed the placement of Restricted Domains --- app/views/admin/application_settings/_form.html.haml | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/app/views/admin/application_settings/_form.html.haml b/app/views/admin/application_settings/_form.html.haml index 6259176894f..6bef33c6d7a 100644 --- a/app/views/admin/application_settings/_form.html.haml +++ b/app/views/admin/application_settings/_form.html.haml @@ -27,11 +27,6 @@ - restricted_level_checkboxes('restricted-visibility-help').each do |level| = level %span.help-block#restricted-visibility-help Selected levels cannot be used by non-admin users for projects or snippets - .form-group - = f.label :restricted_signup_domains, 'Restricted domains for sign-ups', class: 'control-label col-sm-2' - .col-sm-10 - = f.text_area :restricted_signup_domains_raw, placeholder: 'domain.com', class: 'form-control' - .help-block Only users with e-mail addresses that match these domain(s) will be able to sign-up. Wildcards allowed. Use separate lines for multiple entries. Ex: domain.com, *.domain.com .form-group .col-sm-offset-2.col-sm-10 .checkbox @@ -80,13 +75,20 @@ .form-group .col-sm-offset-2.col-sm-10 .checkbox - + = f.label :signup_enabled do + = f.check_box :signup_enabled + Sign-up enabled .form-group .col-sm-offset-2.col-sm-10 .checkbox = f.label :signin_enabled do = f.check_box :signin_enabled Sign-in enabled + .form-group + = f.label :restricted_signup_domains, 'Restricted domains for sign-ups', class: 'control-label col-sm-2' + .col-sm-10 + = f.text_area :restricted_signup_domains_raw, placeholder: 'domain.com', class: 'form-control' + .help-block Only users with e-mail addresses that match these domain(s) will be able to sign-up. Wildcards allowed. Use separate lines for multiple entries. Ex: domain.com, *.domain.com .form-group = f.label :home_page_url, class: 'control-label col-sm-2' .col-sm-10 -- cgit v1.2.1 From 7e4829c3e94fa3bdeee50d0b96785f0aa833829e Mon Sep 17 00:00:00 2001 From: Robert Speicher Date: Tue, 23 Jun 2015 21:22:00 -0400 Subject: Allow user to remove public email address --- app/models/user.rb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/app/models/user.rb b/app/models/user.rb index 22cd15bf971..f1bcecc13b3 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -351,6 +351,8 @@ class User < ActiveRecord::Base end def owns_public_email + return if self.public_email.blank? + self.errors.add(:public_email, "is not an email you own") unless self.all_emails.include?(self.public_email) end @@ -531,7 +533,7 @@ class User < ActiveRecord::Base def set_public_email if self.public_email.blank? || !self.all_emails.include?(self.public_email) - self.public_email = nil + self.public_email = '' end end -- cgit v1.2.1