diff options
| author | Sytse Sijbrandij <sytses@gmail.com> | 2014-07-16 11:27:18 +0200 |
|---|---|---|
| committer | Sytse Sijbrandij <sytses@gmail.com> | 2014-07-16 11:27:18 +0200 |
| commit | 9e3694a6e300748fd14eaa19e442297a44b9f742 (patch) | |
| tree | 11c711893be80018a754b069eb8e138836e13882 | |
| parent | 332a3c6d48d5ef67e2aa8fe964a632136a282293 (diff) | |
| download | gitlab-ce-9e3694a6e300748fd14eaa19e442297a44b9f742.tar.gz | |
Seperate CE in EE merge.
| -rw-r--r-- | doc/release/monthly.md | 22 |
1 files changed, 13 insertions, 9 deletions
diff --git a/doc/release/monthly.md b/doc/release/monthly.md index a79a3c01863..97649564094 100644 --- a/doc/release/monthly.md +++ b/doc/release/monthly.md @@ -21,6 +21,10 @@ Any changes not yet added to the changelog are added by lead developer and in th * Update the changelog (#LINK) +16th: + +* Merge CE in to EE (#LINK) + 17th: * Create x.x.0.rc1 (#LINK) @@ -48,22 +52,22 @@ Any changes not yet added to the changelog are added by lead developer and in th * Deploy to GitLab.com (#LINK) ``` -# **17th - Create RC1** +# **16th - Merge the CE into EE** -The RC1 release comes with the task to update the installation and upgrade docs. Be mindful that there might already be merge requests for this on GitLab or GitHub. +Do this via a merge request. -### **1. Merge the CE code into EE** +# **17th - Create RC1** -Do this via a merge request. +The RC1 release comes with the task to update the installation and upgrade docs. Be mindful that there might already be merge requests for this on GitLab or GitHub. -### **2. Update the installation guide** +### **1. Update the installation guide** 1. Check if it references the correct branch `x-x-stable` (doesn't exist yet, but that is okay) 1. Check the [GitLab Shell version](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/lib/tasks/gitlab/check.rake#L782) 1. Check the [Git version](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/lib/tasks/gitlab/check.rake#L794) 1. There might be other changes. Ask around. -### **3. Create an update guides** +### **2. Create an update guides** 1. Create: CE update guide from previous version. Like `from-6-8-to-6.9` 1. Create: CE to EE update guide in EE repository for latest version. @@ -115,7 +119,7 @@ Check if the `init.d/gitlab` script changed since last release: <https://gitlab. #### 10. Check application status -### **4. Code quality indicators** +### **3. Code quality indicators** Make sure the code quality indicators are green / good. @@ -129,11 +133,11 @@ Make sure the code quality indicators are green / good. - [](https://coveralls.io/r/gitlabhq/gitlabhq) -### **5. Set VERSION** +### **4. Set VERSION** Change version in VERSION to `x.x.0.rc1`. -### **6. Tag** +### **5. Tag** Create an annotated tag that points to the version change commit: |