Commit 5d7da3c1 authored by Justin Ho's avatar Justin Ho

Remove unused controller code

And update translations
parent 5d846918
# frozen_string_literal: true # frozen_string_literal: true
class JiraConnect::UsersController < ApplicationController class JiraConnect::UsersController < ApplicationController
before_action :clear_flash, only: :show feature_category :integrations
layout 'devise_experimental_onboarding_issues' layout 'devise_experimental_onboarding_issues'
def show def show
end end
private
def clear_flash
flash[:alert] = nil
end
end end
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
- user_link_start = '<a href="%{url}" target="_blank" rel="noopener noreferrer">'.html_safe % { url: user_path(current_user) } - user_link_start = '<a href="%{url}" target="_blank" rel="noopener noreferrer">'.html_safe % { url: user_path(current_user) }
%h2= _('You are signed into GitLab as %{user_link_start}%{username}%{user_link_end}.').html_safe % { user_link_start: user_link_start, username: current_user.to_reference, user_link_end: '</a>'.html_safe } %h2= _('You are signed into GitLab as %{user_link_start}%{username}%{user_link_end}.').html_safe % { user_link_start: user_link_start, username: current_user.to_reference, user_link_end: '</a>'.html_safe }
%p= _('You can now close this window and return to the GitLab for Jira application.') %p= s_('Integrations|You can now close this window and return to the GitLab for Jira application.')
%p= link_to _('Sign out'), destroy_user_session_path, method: :post %p= link_to _('Sign out'), destroy_user_session_path, method: :post
......
---
title: Add user sign in indicator to Jira connect app
merge_request: 42628
author:
type: changed
...@@ -14096,6 +14096,9 @@ msgstr "" ...@@ -14096,6 +14096,9 @@ msgstr ""
msgid "Integrations|When a Jira issue is mentioned in a commit or merge request a remote link and comment (if enabled) will be created." msgid "Integrations|When a Jira issue is mentioned in a commit or merge request a remote link and comment (if enabled) will be created."
msgstr "" msgstr ""
msgid "Integrations|You can now close this window and return to the GitLab for Jira application."
msgstr ""
msgid "Interested parties can even contribute by pushing commits if they want to." msgid "Interested parties can even contribute by pushing commits if they want to."
msgstr "" msgstr ""
...@@ -29728,6 +29731,9 @@ msgstr "" ...@@ -29728,6 +29731,9 @@ msgstr ""
msgid "You are receiving this message because you are a GitLab administrator for %{url}." msgid "You are receiving this message because you are a GitLab administrator for %{url}."
msgstr "" msgstr ""
msgid "You are signed into GitLab as %{user_link_start}%{username}%{user_link_end}."
msgstr ""
msgid "You are trying to upload something other than an image. Please upload a .png, .jpg, .jpeg, .gif, .bmp, .tiff or .ico." msgid "You are trying to upload something other than an image. Please upload a .png, .jpg, .jpeg, .gif, .bmp, .tiff or .ico."
msgstr "" msgstr ""
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment