diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-02-01 06:14:04 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-02-01 06:14:04 +0300 |
commit | 7be0c0133d5a2b11a346d8d2ec17a58028ad79ef (patch) | |
tree | 2df64a9d2ab129c129e7c465faeaf6f1e7ba5d4f /lib/gitlab/changelog | |
parent | cc2623bcc3040a8b9c9a302e3f660c0ca65a7699 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib/gitlab/changelog')
-rw-r--r-- | lib/gitlab/changelog/config.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/gitlab/changelog/config.rb b/lib/gitlab/changelog/config.rb index fd5d701b858..9cb3d71f5c3 100644 --- a/lib/gitlab/changelog/config.rb +++ b/lib/gitlab/changelog/config.rb @@ -37,7 +37,7 @@ module Gitlab attr_accessor :date_format, :categories, :template, :tag_regex, :always_credit_user_ids def self.from_git(project, user = nil) - if (yaml = project.repository.changelog_config) + if (yaml = project.repository.changelog_config.presence) from_hash(project, YAML.safe_load(yaml), user) else new(project) |