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
8957029e
Commit
8957029e
authored
Feb 12, 2021
by
Tom Quirk
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove new_jira_connect_ui feature flag
- removes yaml file - removes all references in source code
parent
f1873c68
Changes
9
Hide whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
6 additions
and
58 deletions
+6
-58
app/assets/javascripts/jira_connect/components/app.vue
app/assets/javascripts/jira_connect/components/app.vue
+0
-4
app/controllers/jira_connect/subscriptions_controller.rb
app/controllers/jira_connect/subscriptions_controller.rb
+0
-3
app/helpers/jira_connect_helper.rb
app/helpers/jira_connect_helper.rb
+0
-6
app/views/jira_connect/subscriptions/index.html.haml
app/views/jira_connect/subscriptions/index.html.haml
+1
-12
app/views/layouts/jira_connect.html.haml
app/views/layouts/jira_connect.html.haml
+0
-3
changelogs/unreleased/remove-new_jira_connect_ui-feature-flag.yml
...gs/unreleased/remove-new_jira_connect_ui-feature-flag.yml
+5
-0
config/feature_flags/development/new_jira_connect_ui.yml
config/feature_flags/development/new_jira_connect_ui.yml
+0
-8
locale/gitlab.pot
locale/gitlab.pot
+0
-6
spec/frontend/jira_connect/components/app_spec.js
spec/frontend/jira_connect/components/app_spec.js
+0
-16
No files found.
app/assets/javascripts/jira_connect/components/app.vue
View file @
8957029e
...
...
@@ -31,9 +31,6 @@ export default {
},
computed
:
{
...
mapState
([
'
errorMessage
'
]),
showNewUI
()
{
return
this
.
glFeatures
.
newJiraConnectUi
;
},
usersPathWithReturnTo
()
{
if
(
this
.
location
)
{
return
`
${
this
.
usersPath
}
?return_to=
${
this
.
location
}
`
;
...
...
@@ -67,7 +64,6 @@ export default {
<h2
class=
"gl-text-center"
>
{{
s__
(
'
JiraService|GitLab for Jira Configuration
'
)
}}
</h2>
<div
v-if=
"showNewUI"
class=
"jira-connect-app-body gl-display-flex gl-justify-content-space-between gl-my-7 gl-pb-4 gl-border-b-solid gl-border-b-1 gl-border-b-gray-200"
>
<h5
class=
"gl-align-self-center gl-mb-0"
data-testid=
"new-jira-connect-ui-heading"
>
...
...
app/controllers/jira_connect/subscriptions_controller.rb
View file @
8957029e
...
...
@@ -19,9 +19,6 @@ class JiraConnect::SubscriptionsController < JiraConnect::ApplicationController
before_action
:allow_rendering_in_iframe
,
only: :index
before_action
:verify_qsh_claim!
,
only: :index
before_action
:authenticate_user!
,
only: :create
before_action
do
push_frontend_feature_flag
(
:new_jira_connect_ui
,
type: :development
,
default_enabled: :yaml
)
end
def
index
@subscriptions
=
current_jira_installation
.
subscriptions
.
preload_namespace_route
...
...
app/helpers/jira_connect_helper.rb
View file @
8957029e
# frozen_string_literal: true
module
JiraConnectHelper
def
new_jira_connect_ui?
Feature
.
enabled?
(
:new_jira_connect_ui
,
type: :development
,
default_enabled: :yaml
)
end
def
jira_connect_app_data
(
subscriptions
)
return
{}
unless
new_jira_connect_ui?
skip_groups
=
subscriptions
.
map
(
&
:namespace_id
)
{
...
...
app/views/jira_connect/subscriptions/index.html.haml
View file @
8957029e
...
...
@@ -15,8 +15,7 @@
%p
=
s_
(
'JiraService|Sign in to GitLab.com to get started.'
)
.gl-mt-7
-
sign_in_button_class
=
new_jira_connect_ui?
?
'btn gl-button btn-confirm'
:
'ak-button ak-button__appearance-primary'
=
external_link
_
(
'Sign in to GitLab'
),
jira_connect_users_path
,
class:
"
#{
sign_in_button_class
}
js-jira-connect-sign-in"
=
external_link
_
(
'Sign in to GitLab'
),
jira_connect_users_path
,
class:
"btn gl-button btn-confirm js-jira-connect-sign-in"
.gl-mt-7
%p
=
s_
(
'Integrations|Note: this integration only works with accounts on GitLab.com (SaaS).'
)
...
...
@@ -24,16 +23,6 @@
.js-jira-connect-app
{
data:
jira_connect_app_data
(
@subscriptions
)
}
.jira-connect-app-body
-
unless
new_jira_connect_ui?
%form
#add-subscription-form
.subscription-form.gl-mb-5
{
action:
jira_connect_subscriptions_path
}
.ak-field-group
%label
=
_
(
'GitLab namespace'
)
.ak-field-group.field-group-input
%input
#namespace-input
.ak-field-text
{
type:
'text'
,
required:
true
,
placeholder:
'e.g. "MyCompany" or "MyCompany/GroupName"'
}
%button
.ak-button.ak-button__appearance-primary
{
type:
'submit'
}
=
s_
(
'Integrations|Link namespace to Jira'
)
-
if
@subscriptions
.
present?
%table
.subscriptions.gl-w-full
%thead
...
...
app/views/layouts/jira_connect.html.haml
View file @
8957029e
...
...
@@ -3,9 +3,6 @@
%meta
{
content:
"text/html; charset=utf-8"
,
"http-equiv"
=>
"Content-Type"
}
%title
GitLab
-
unless
new_jira_connect_ui?
=
stylesheet_link_tag
'https://unpkg.com/@atlaskit/css-reset@3.0.6/dist/bundle.css'
=
stylesheet_link_tag
'https://unpkg.com/@atlaskit/reduced-ui-pack@10.5.5/dist/bundle.css'
=
yield
:page_specific_styles
=
javascript_include_tag
'https://connect-cdn.atl-paas.net/all.js'
...
...
changelogs/unreleased/remove-new_jira_connect_ui-feature-flag.yml
0 → 100644
View file @
8957029e
---
title
:
'
Jira
Connect
app:
add
ability
to
select
namespace
from
list
of
available
namespaces'
merge_request
:
54037
author
:
type
:
added
config/feature_flags/development/new_jira_connect_ui.yml
deleted
100644 → 0
View file @
f1873c68
---
name
:
new_jira_connect_ui
introduced_by_url
:
https://gitlab.com/gitlab-org/gitlab/-/merge_requests/50692
rollout_issue_url
:
https://gitlab.com/gitlab-org/gitlab/-/issues/295647
milestone
:
'
13.8'
type
:
development
group
:
group::ecosystem
default_enabled
:
true
locale/gitlab.pot
View file @
8957029e
...
...
@@ -13813,9 +13813,6 @@ msgstr ""
msgid "GitLab metadata URL"
msgstr ""
msgid "GitLab namespace"
msgstr ""
msgid "GitLab project export"
msgstr ""
...
...
@@ -16162,9 +16159,6 @@ msgstr ""
msgid "Integrations|Issues created in Jira are shown here once you have created the issues in project setup in Jira."
msgstr ""
msgid "Integrations|Link namespace to Jira"
msgstr ""
msgid "Integrations|Link namespaces"
msgstr ""
...
...
spec/frontend/jira_connect/components/app_spec.js
View file @
8957029e
...
...
@@ -24,9 +24,6 @@ describe('JiraConnectApp', () => {
wrapper
=
extendedWrapper
(
shallowMount
(
JiraConnectApp
,
{
store
,
provide
:
{
glFeatures
:
{
newJiraConnectUi
:
true
},
},
...
options
,
}),
);
...
...
@@ -49,7 +46,6 @@ describe('JiraConnectApp', () => {
beforeEach
(()
=>
{
createComponent
({
provide
:
{
glFeatures
:
{
newJiraConnectUi
:
true
},
usersPath
:
'
/users
'
,
},
});
...
...
@@ -72,18 +68,6 @@ describe('JiraConnectApp', () => {
});
});
describe
(
'
newJiraConnectUi is false
'
,
()
=>
{
it
(
'
does not render new UI
'
,
()
=>
{
createComponent
({
provide
:
{
glFeatures
:
{
newJiraConnectUi
:
false
},
},
});
expect
(
findHeader
().
exists
()).
toBe
(
false
);
});
});
it
.
each
`
errorMessage | errorShouldRender
${
'
Test error
'
}
|
${
true
}
...
...
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