Commit 422f14b4 authored by Douglas Barbosa Alexandre's avatar Douglas Barbosa Alexandre

Merge branch 'id-enable-pick-into-project' into 'master'

Allow cherry-picking to a fork's parent

See merge request gitlab-org/gitlab!59399
parents 887e7b54 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
......
---
title: Allow cherry-picking to a fork's parent
merge_request: 59399
author:
type: added
...@@ -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: false default_enabled: true
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