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
0f81e772
Commit
0f81e772
authored
Sep 28, 2020
by
Andrew Fontaine
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove deploy_from_footer Feature Flag
This has been enabled by default for a while now with no issues.
parent
168af001
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
4 additions
and
21 deletions
+4
-21
app/assets/javascripts/vue_merge_request_widget/components/deployment/deployment_actions.vue
...quest_widget/components/deployment/deployment_actions.vue
+2
-5
app/controllers/projects/merge_requests_controller.rb
app/controllers/projects/merge_requests_controller.rb
+0
-1
config/feature_flags/development/deploy_from_footer.yml
config/feature_flags/development/deploy_from_footer.yml
+0
-7
spec/frontend/vue_mr_widget/deployment/deployment_actions_spec.js
...ntend/vue_mr_widget/deployment/deployment_actions_spec.js
+1
-4
spec/frontend/vue_mr_widget/deployment/deployment_spec.js
spec/frontend/vue_mr_widget/deployment/deployment_spec.js
+1
-4
No files found.
app/assets/javascripts/vue_merge_request_widget/components/deployment/deployment_actions.vue
View file @
0f81e772
...
...
@@ -74,9 +74,6 @@ export default {
canBeManuallyRedeployed
()
{
return
this
.
computedDeploymentStatus
===
FAILED
&&
Boolean
(
this
.
redeployPath
);
},
shouldShowManualButtons
()
{
return
this
.
glFeatures
.
deployFromFooter
;
},
hasExternalUrls
()
{
return
Boolean
(
this
.
deployment
.
external_url
&&
this
.
deployment
.
external_url_formatted
);
},
...
...
@@ -154,7 +151,7 @@ export default {
<
template
>
<div>
<deployment-action-button
v-if=
"
shouldShowManualButtons &&
canBeManuallyDeployed"
v-if=
"canBeManuallyDeployed"
:action-in-progress=
"actionInProgress"
:actions-configuration=
"$options.actionsConfiguration[constants.DEPLOYING]"
:computed-deployment-status=
"computedDeploymentStatus"
...
...
@@ -165,7 +162,7 @@ export default {
<span>
{{
$options
.
actionsConfiguration
[
constants
.
DEPLOYING
].
buttonText
}}
</span>
</deployment-action-button>
<deployment-action-button
v-if=
"
shouldShowManualButtons &&
canBeManuallyRedeployed"
v-if=
"canBeManuallyRedeployed"
:action-in-progress=
"actionInProgress"
:actions-configuration=
"$options.actionsConfiguration[constants.REDEPLOYING]"
:computed-deployment-status=
"computedDeploymentStatus"
...
...
app/controllers/projects/merge_requests_controller.rb
View file @
0f81e772
...
...
@@ -27,7 +27,6 @@ class Projects::MergeRequestsController < Projects::MergeRequests::ApplicationCo
before_action
:authenticate_user!
,
only:
[
:assign_related_issues
]
before_action
:check_user_can_push_to_source_branch!
,
only:
[
:rebase
]
before_action
only:
[
:show
]
do
push_frontend_feature_flag
(
:deploy_from_footer
,
@project
,
default_enabled:
true
)
push_frontend_feature_flag
(
:suggest_pipeline
)
if
experiment_enabled?
(
:suggest_pipeline
)
push_frontend_feature_flag
(
:code_navigation
,
@project
,
default_enabled:
true
)
push_frontend_feature_flag
(
:widget_visibility_polling
,
@project
,
default_enabled:
true
)
...
...
config/feature_flags/development/deploy_from_footer.yml
deleted
100644 → 0
View file @
168af001
---
name
:
deploy_from_footer
introduced_by_url
:
https://gitlab.com/gitlab-org/gitlab/-/merge_requests/25427
rollout_issue_url
:
group
:
group::progressive delivery
type
:
development
default_enabled
:
true
spec/frontend/vue_mr_widget/deployment/deployment_actions_spec.js
View file @
0f81e772
...
...
@@ -31,10 +31,7 @@ describe('DeploymentAction component', () => {
wrapper
.
destroy
();
}
wrapper
=
mount
(
DeploymentActions
,
{
...
options
,
provide
:
{
glFeatures
:
{
deployFromFooter
:
true
}
},
});
wrapper
=
mount
(
DeploymentActions
,
options
);
};
const
findStopButton
=
()
=>
wrapper
.
find
(
'
.js-stop-env
'
);
...
...
spec/frontend/vue_mr_widget/deployment/deployment_spec.js
View file @
0f81e772
...
...
@@ -19,10 +19,7 @@ describe('Deployment component', () => {
if
(
wrapper
&&
wrapper
.
destroy
)
{
wrapper
.
destroy
();
}
wrapper
=
mount
(
DeploymentComponent
,
{
...
options
,
provide
:
{
glFeatures
:
{
deployFromFooter
:
true
}
},
});
wrapper
=
mount
(
DeploymentComponent
,
options
);
};
beforeEach
(()
=>
{
...
...
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