Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
1f32314f
Commit
1f32314f
authored
Oct 07, 2020
by
Justin Ho
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add post-login confirmation page for Jira app
Improves user flow when installing the GitLab for Jira app.
parent
fc0a90fa
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
41 additions
and
0 deletions
+41
-0
app/assets/stylesheets/page_bundles/jira_connect_users.scss
app/assets/stylesheets/page_bundles/jira_connect_users.scss
+13
-0
app/controllers/jira_connect/users_controller.rb
app/controllers/jira_connect/users_controller.rb
+16
-0
app/views/jira_connect/users/show.html.haml
app/views/jira_connect/users/show.html.haml
+10
-0
config/application.rb
config/application.rb
+1
-0
config/routes/jira_connect.rb
config/routes/jira_connect.rb
+1
-0
No files found.
app/assets/stylesheets/page_bundles/jira_connect_users.scss
0 → 100644
View file @
1f32314f
@import
'mixins_and_variables_and_functions'
;
.jira-connect-users-container
{
margin-left
:
auto
;
margin-right
:
auto
;
width
:
px-to-rem
(
350px
);
}
.devise-layout-html
body
.navless-container
{
@include
media-breakpoint-down
(
xs
)
{
padding-top
:
65px
;
}
}
app/controllers/jira_connect/users_controller.rb
0 → 100644
View file @
1f32314f
# frozen_string_literal: true
class
JiraConnect::UsersController
<
ApplicationController
before_action
:clear_flash
,
only: :show
layout
'devise_experimental_onboarding_issues'
def
show
end
private
def
clear_flash
flash
[
:alert
]
=
nil
end
end
app/views/jira_connect/users/show.html.haml
0 → 100644
View file @
1f32314f
.jira-connect-users-container.gl-text-center
%h2
=
_
(
'You are signed into GitLab.'
)
%p
=
_
(
'You can now close this window and return to the GitLab for Jira application.'
)
%p
=
external_link
_
(
'Return to GitLab for Jira'
),
'#'
,
class:
'btn btn-success'
%p
=
link_to
_
(
'Sign out'
),
'#'
-
add_page_specific_style
'page_bundles/jira_connect_users'
config/application.rb
View file @
1f32314f
...
...
@@ -182,6 +182,7 @@ module Gitlab
config
.
assets
.
precompile
<<
"page_bundles/ide.css"
config
.
assets
.
precompile
<<
"page_bundles/issues_list.css"
config
.
assets
.
precompile
<<
"page_bundles/jira_connect.css"
config
.
assets
.
precompile
<<
"page_bundles/jira_connect_users.css"
config
.
assets
.
precompile
<<
"page_bundles/merge_conflicts.css"
config
.
assets
.
precompile
<<
"page_bundles/merge_requests.css"
config
.
assets
.
precompile
<<
"page_bundles/milestone.css"
...
...
config/routes/jira_connect.rb
View file @
1f32314f
...
...
@@ -5,6 +5,7 @@ namespace :jira_connect do
root
to:
proc
{
[
404
,
{},
[
''
]]
},
as:
'base'
get
'app_descriptor'
=>
'app_descriptor#show'
get
:users
,
to:
'users#show'
namespace
:events
do
post
'installed'
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment