summaryrefslogtreecommitdiff
path: root/bin/secpick
diff options
context:
space:
mode:
Diffstat (limited to 'bin/secpick')
-rwxr-xr-xbin/secpick8
1 files changed, 3 insertions, 5 deletions
diff --git a/bin/secpick b/bin/secpick
index 8f956d300a7..d01304285b6 100755
--- a/bin/secpick
+++ b/bin/secpick
@@ -45,9 +45,7 @@ module Secpick
def git_commands
["git fetch #{@options[:remote]} #{stable_branch}",
- "git checkout #{stable_branch}",
- "git pull #{@options[:remote]} #{stable_branch}",
- "git checkout -B #{source_branch}",
+ "git checkout -B #{source_branch} #{@options[:remote]}/#{stable_branch}",
"git cherry-pick #{@options[:sha]}",
"git push #{@options[:remote]} #{source_branch}",
"git checkout #{original_branch}"]
@@ -55,10 +53,10 @@ module Secpick
def gitlab_params
{
+ issuable_template: 'Security Release',
merge_request: {
source_branch: source_branch,
- target_branch: stable_branch,
- description: '/label ~security'
+ target_branch: stable_branch
}
}
end