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
42ea303a
Commit
42ea303a
authored
Apr 14, 2021
by
Igor Drozdov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Allow cherry-picking to a fork's parent
parent
47d8b264
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
7 additions
and
2 deletions
+7
-2
app/controllers/projects/commit_controller.rb
app/controllers/projects/commit_controller.rb
+1
-1
changelogs/unreleased/id-enable-pick-into-project.yml
changelogs/unreleased/id-enable-pick-into-project.yml
+5
-0
config/feature_flags/development/pick_into_project.yml
config/feature_flags/development/pick_into_project.yml
+1
-1
No files found.
app/controllers/projects/commit_controller.rb
View file @
42ea303a
...
@@ -20,7 +20,7 @@ class Projects::CommitController < Projects::ApplicationController
...
@@ -20,7 +20,7 @@ class Projects::CommitController < Projects::ApplicationController
before_action
:define_note_vars
,
only:
[
:show
,
:diff_for_path
,
:diff_files
]
before_action
:define_note_vars
,
only:
[
:show
,
:diff_for_path
,
:diff_files
]
before_action
:authorize_edit_tree!
,
only:
[
:revert
,
:cherry_pick
]
before_action
:authorize_edit_tree!
,
only:
[
:revert
,
:cherry_pick
]
before_action
do
before_action
do
push_frontend_feature_flag
(
:pick_into_project
)
push_frontend_feature_flag
(
:pick_into_project
,
@project
,
default_enabled: :yaml
)
end
end
BRANCH_SEARCH_LIMIT
=
1000
BRANCH_SEARCH_LIMIT
=
1000
...
...
changelogs/unreleased/id-enable-pick-into-project.yml
0 → 100644
View file @
42ea303a
---
title
:
Allow cherry-picking to a fork's parent
merge_request
:
59399
author
:
type
:
added
config/feature_flags/development/pick_into_project.yml
View file @
42ea303a
...
@@ -5,4 +5,4 @@ rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/324154
...
@@ -5,4 +5,4 @@ rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/324154
milestone
:
'
13.10'
milestone
:
'
13.10'
type
:
development
type
:
development
group
:
group::source code
group
:
group::source code
default_enabled
:
fals
e
default_enabled
:
tru
e
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