diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-11-08 00:05:58 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-11-08 00:05:58 +0000 |
commit | 1adb4373ba840a9bc771a8c9196f7183fd98b2b8 (patch) | |
tree | 1d319351302054fb1ca2223ed4da467fb2078765 /app/controllers/concerns | |
parent | c324100967bbdd3f2f0ca3406c9261d35e69f148 (diff) | |
download | gitlab-ce-1adb4373ba840a9bc771a8c9196f7183fd98b2b8.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/controllers/concerns')
-rw-r--r-- | app/controllers/concerns/confirm_email_warning.rb | 9 | ||||
-rw-r--r-- | app/controllers/concerns/uploads_actions.rb | 17 |
2 files changed, 3 insertions, 23 deletions
diff --git a/app/controllers/concerns/confirm_email_warning.rb b/app/controllers/concerns/confirm_email_warning.rb index 874deeb4702..86df0010665 100644 --- a/app/controllers/concerns/confirm_email_warning.rb +++ b/app/controllers/concerns/confirm_email_warning.rb @@ -4,22 +4,19 @@ module ConfirmEmailWarning extend ActiveSupport::Concern included do - before_action :set_confirm_warning, if: :show_confirm_warning? + before_action :set_confirm_warning, if: -> { Feature.enabled?(:soft_email_confirmation) } end protected - def show_confirm_warning? - html_request? && request.get? && Feature.enabled?(:soft_email_confirmation) - end - def set_confirm_warning return unless current_user return if current_user.confirmed? + return if peek_request? || json_request? || !request.get? email = current_user.unconfirmed_email || current_user.email - flash.now[:warning] = _("Please check your email (%{email}) to verify that you own this address. Didn't receive it? %{resend_link}. Wrong email address? %{update_link}.").html_safe % { + flash.now[:warning] = _("Please check your email (%{email}) to verify that you own this address and unlock the power of CI/CD. Didn't receive it? %{resend_link}. Wrong email address? %{update_link}.").html_safe % { email: email, resend_link: view_context.link_to(_('Resend it'), user_confirmation_path(user: { email: email }), method: :post), update_link: view_context.link_to(_('Update it'), profile_path) diff --git a/app/controllers/concerns/uploads_actions.rb b/app/controllers/concerns/uploads_actions.rb index 023c41821da..b87779c22d3 100644 --- a/app/controllers/concerns/uploads_actions.rb +++ b/app/controllers/concerns/uploads_actions.rb @@ -1,16 +1,11 @@ # frozen_string_literal: true module UploadsActions - extend ActiveSupport::Concern include Gitlab::Utils::StrongMemoize include SendFileUpload UPLOAD_MOUNTS = %w(avatar attachment file logo header_logo favicon).freeze - included do - prepend_before_action :set_request_format_from_path_extension - end - def create uploader = UploadService.new(model, params[:file], uploader_class).execute @@ -69,18 +64,6 @@ module UploadsActions private - # From ActionDispatch::Http::MimeNegotiation. We have an initializer that - # monkey-patches this method out (so that repository paths don't guess a - # format based on extension), but we do want this behaviour when serving - # uploads. - def set_request_format_from_path_extension - path = request.headers['action_dispatch.original_path'] || request.headers['PATH_INFO'] - - if match = path&.match(/\.(\w+)\z/) - request.format = match.captures.first - end - end - def uploader_class raise NotImplementedError end |