diff options
Diffstat (limited to 'app')
| -rw-r--r-- | app/assets/javascripts/lib/utils/forms.js | 6 | ||||
| -rw-r--r-- | app/assets/javascripts/monitoring/utils.js | 2 | ||||
| -rw-r--r-- | app/controllers/concerns/uploads_actions.rb | 2 | ||||
| -rw-r--r-- | app/models/user.rb | 2 | ||||
| -rw-r--r-- | app/views/dashboard/projects/_blank_state_admin_welcome.html.haml | 8 | ||||
| -rw-r--r-- | app/views/dashboard/projects/_blank_state_welcome.html.haml | 10 | ||||
| -rw-r--r-- | app/views/shared/_auto_devops_implicitly_enabled_banner.html.haml | 4 |
7 files changed, 21 insertions, 13 deletions
diff --git a/app/assets/javascripts/lib/utils/forms.js b/app/assets/javascripts/lib/utils/forms.js index 106209a2f3a..ced44ab9817 100644 --- a/app/assets/javascripts/lib/utils/forms.js +++ b/app/assets/javascripts/lib/utils/forms.js @@ -4,7 +4,11 @@ export const serializeFormEntries = entries => export const serializeForm = form => { const fdata = new FormData(form); const entries = Array.from(fdata.keys()).map(key => { - const val = fdata.getAll(key); + let val = fdata.getAll(key); + // Microsoft Edge has a bug in FormData.getAll() that returns an undefined + // value for each form element that does not match the given key: + // https://github.com/jimmywarting/FormData/issues/80 + val = val.filter(n => n); return { name: key, value: val.length === 1 ? val[0] : val }; }); diff --git a/app/assets/javascripts/monitoring/utils.js b/app/assets/javascripts/monitoring/utils.js index 4c72f5226b7..00f188c1d5a 100644 --- a/app/assets/javascripts/monitoring/utils.js +++ b/app/assets/javascripts/monitoring/utils.js @@ -41,7 +41,7 @@ export const isValidDate = dateString => { return true; } return false; - } catch { + } catch (e) { return false; } }; diff --git a/app/controllers/concerns/uploads_actions.rb b/app/controllers/concerns/uploads_actions.rb index 6d9ee39f841..b87779c22d3 100644 --- a/app/controllers/concerns/uploads_actions.rb +++ b/app/controllers/concerns/uploads_actions.rb @@ -34,7 +34,7 @@ module UploadsActions headers['Pragma'] = '' ttl, directives = *cache_settings - ttl ||= 6.months + ttl ||= 0 directives ||= { private: true, must_revalidate: true } expires_in ttl, directives diff --git a/app/models/user.rb b/app/models/user.rb index 321a4080484..eec8ad6edbb 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -59,7 +59,7 @@ class User < ApplicationRecord # Removed in GitLab 12.3. Keep until after 2019-09-22. self.ignored_columns += %i[support_bot] - MINIMUM_INACTIVE_DAYS = 14 + MINIMUM_INACTIVE_DAYS = 180 # Override Devise::Models::Trackable#update_tracked_fields! # to limit database writes to at most once every hour diff --git a/app/views/dashboard/projects/_blank_state_admin_welcome.html.haml b/app/views/dashboard/projects/_blank_state_admin_welcome.html.haml index 6e7ec1264ea..20bf7d232ce 100644 --- a/app/views/dashboard/projects/_blank_state_admin_welcome.html.haml +++ b/app/views/dashboard/projects/_blank_state_admin_welcome.html.haml @@ -4,7 +4,7 @@ = link_to new_project_path, class: "blank-state blank-state-link" do .blank-state-icon - = image_tag("illustrations/welcome/add_new_project") + = custom_icon("add_new_project", size: 50) .blank-state-body %h3.blank-state-title Create a project @@ -14,7 +14,7 @@ - if current_user.can_create_group? = link_to new_group_path, class: "blank-state blank-state-link" do .blank-state-icon - = image_tag("illustrations/welcome/add_new_group") + = custom_icon("add_new_group", size: 50) .blank-state-body %h3.blank-state-title Create a group @@ -23,7 +23,7 @@ = link_to new_admin_user_path, class: "blank-state blank-state-link" do .blank-state-icon - = image_tag("illustrations/welcome/add_new_user") + = custom_icon("add_new_user", size: 50) .blank-state-body %h3.blank-state-title Add people @@ -32,7 +32,7 @@ = link_to admin_root_path, class: "blank-state blank-state-link" do .blank-state-icon - = image_tag("illustrations/welcome/configure_server") + = custom_icon("configure_server", size: 50) .blank-state-body %h3.blank-state-title Configure GitLab diff --git a/app/views/dashboard/projects/_blank_state_welcome.html.haml b/app/views/dashboard/projects/_blank_state_welcome.html.haml index e3af3405b76..913f0e8cfae 100644 --- a/app/views/dashboard/projects/_blank_state_welcome.html.haml +++ b/app/views/dashboard/projects/_blank_state_welcome.html.haml @@ -4,7 +4,7 @@ - if current_user.can_create_project? = link_to new_project_path, class: "blank-state blank-state-link" do .blank-state-icon - = image_tag("illustrations/welcome/add_new_project") + = custom_icon("add_new_project", size: 50) .blank-state-body %h3.blank-state-title Create a project @@ -13,7 +13,7 @@ - else .blank-state .blank-state-icon - = image_tag("illustrations/welcome/add_new_project") + = custom_icon("add_new_project", size: 50) .blank-state-body %h3.blank-state-title Create a project @@ -23,7 +23,7 @@ - if current_user.can_create_group? = link_to new_group_path, class: "blank-state blank-state-link" do .blank-state-icon - = image_tag("illustrations/welcome/add_new_group") + = custom_icon("add_new_group", size: 50) .blank-state-body %h3.blank-state-title Create a group @@ -33,7 +33,7 @@ - if public_project_count > 0 = link_to trending_explore_projects_path, class: "blank-state blank-state-link" do .blank-state-icon - = image_tag("illustrations/welcome/globe") + = custom_icon("globe", size: 50) .blank-state-body %h3.blank-state-title Explore public projects @@ -46,7 +46,7 @@ = link_to "https://docs.gitlab.com/", class: "blank-state blank-state-link" do .blank-state-icon - = image_tag("illustrations/welcome/lightbulb") + = custom_icon("lightbulb", size: 50) .blank-state-body %h3.blank-state-title Learn more about GitLab diff --git a/app/views/shared/_auto_devops_implicitly_enabled_banner.html.haml b/app/views/shared/_auto_devops_implicitly_enabled_banner.html.haml index fb03e6e12e3..3670e19c240 100644 --- a/app/views/shared/_auto_devops_implicitly_enabled_banner.html.haml +++ b/app/views/shared/_auto_devops_implicitly_enabled_banner.html.haml @@ -7,3 +7,7 @@ = link_to _('Settings'), project_settings_ci_cd_path(project), class: 'alert-link' | = link_to _('Dismiss'), '#', class: 'hide-auto-devops-implicitly-enabled-banner alert-link', data: { project_id: project.id } + - unless Gitlab.config.registry.enabled + %div + = icon('exclamation-triangle') + = _('Container registry is not enabled on this GitLab instance. Ask an administrator to enable it in order for AutoDevOps to work.') |