diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-06-02 12:09:46 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-06-02 12:09:46 +0300 |
| commit | b2180a27bcf74e622df4d7fb173306d80b973a6c (patch) | |
| tree | b0966750894f10d6592a4c578d5687c169cd5e41 /lib | |
| parent | b3e13e0dfd7e26ed569aa9b46f4ec55b41a62411 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib')
3 files changed, 5 insertions, 2 deletions
diff --git a/lib/gitlab/ci/templates/Security/Container-Scanning.gitlab-ci.yml b/lib/gitlab/ci/templates/Security/Container-Scanning.gitlab-ci.yml index 424a4b3e397..bd163f9db94 100644 --- a/lib/gitlab/ci/templates/Security/Container-Scanning.gitlab-ci.yml +++ b/lib/gitlab/ci/templates/Security/Container-Scanning.gitlab-ci.yml @@ -40,4 +40,5 @@ container_scanning: rules: - if: $CONTAINER_SCANNING_DISABLED when: never - - if: $GITLAB_FEATURES =~ /\bcontainer_scanning\b/ + - if: $CI_COMMIT_BRANCH && + $GITLAB_FEATURES =~ /\bcontainer_scanning\b/ diff --git a/lib/gitlab/quick_actions/issue_and_merge_request_actions.rb b/lib/gitlab/quick_actions/issue_and_merge_request_actions.rb index b7d58e05651..b53fdd60606 100644 --- a/lib/gitlab/quick_actions/issue_and_merge_request_actions.rb +++ b/lib/gitlab/quick_actions/issue_and_merge_request_actions.rb @@ -155,6 +155,7 @@ module Gitlab params '<1w 3d 2h 14m>' types Issue, MergeRequest condition do + quick_action_target.supports_time_tracking? && current_user.can?(:"admin_#{quick_action_target.to_ability_name}", project) end parse_params do |raw_duration| @@ -177,6 +178,7 @@ module Gitlab params '<time(1h30m | -1h30m)> <date(YYYY-MM-DD)>' types Issue, MergeRequest condition do + quick_action_target.supports_time_tracking? && current_user.can?(:"admin_#{quick_action_target.to_ability_name}", quick_action_target) end parse_params do |raw_time_date| diff --git a/lib/system_check/incoming_email/imap_authentication_check.rb b/lib/system_check/incoming_email/imap_authentication_check.rb index 61719abc991..e02ae81dc98 100644 --- a/lib/system_check/incoming_email/imap_authentication_check.rb +++ b/lib/system_check/incoming_email/imap_authentication_check.rb @@ -52,7 +52,7 @@ module SystemCheck def load_config erb = ERB.new(File.read(mail_room_config_path)) erb.filename = mail_room_config_path - config_file = YAML.safe_load(erb.result) + config_file = YAML.safe_load(erb.result, permitted_classes: [Symbol]) config_file[:mailboxes] end |