kotovalexarian-likes-gitlab
/
gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Merge branch '43427-generate-ee-changelog-items-in-ee-changelogs' into 'master' 

Resolve "Change `bin/changelog` to generate EE changelog items in `ee/changelogs`"

Closes #43427

See merge request gitlab-org/gitlab-ce!17238
This commit is contained in:
Robert Speicher 2018-02-20 16:20:22 +00:00
parent 644566041c 91f03a7ab2
commit 94811ee1b6
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
bin/changelog
View File

@ -214,9 +214,10 @@ class ChangelogEntry
end
def unreleased_path
File.join('changelogs', 'unreleased').tap do |path|
path << '-ee' if ee?
end
path = File.join('changelogs', 'unreleased')
path = File.join('ee', path) if ee?
path
end
def ee?

2
doc/development/changelog.md
View File

@ -125,7 +125,7 @@ author:
type:
```
If you're working on the GitLab EE repository, the entry will be added to
`changelogs/unreleased-ee/` instead.
`ee/changelogs/unreleased/` instead.
### Arguments