From 47b5b3d5fad0bf9a0193e8d01e6c4d9656583a45 Mon Sep 17 00:00:00 2001 From: Sytse Sijbrandij Date: Fri, 22 Aug 2014 21:46:12 +0200 Subject: Tar before omnibus build, we all have master access on dev, don't forget to update installation.md --- doc/release/monthly.md | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/doc/release/monthly.md b/doc/release/monthly.md index 09bdde81dcc..e40fbbef70c 100644 --- a/doc/release/monthly.md +++ b/doc/release/monthly.md @@ -221,12 +221,7 @@ git checkout -b x-x-stable git push x-x-stable ``` -### **2. Build the Omnibus packages** - -Follow the [release doc in the Omnibus repository](https://gitlab.com/gitlab-org/omnibus-gitlab/blob/master/doc/release.md). -This can happen before tagging because Omnibus uses tags in its own repo and SHA1's to refer to the GitLab codebase. - -### **3. Set VERSION to x.x.x and push** +### **2. Set VERSION to x.x.x and push** Change the GITLAB_SHELL_VERSION file in `master` of the CE repository if the version changed. @@ -236,7 +231,7 @@ Change the VERSION file in `master` branch of the CE repository and commit. Cher Change the VERSION file in `master` branch of the EE repository and commit. Cherry-pick into the `x-x-stable-ee` branch of EE. -### **4. Create annotated tag vx.x.x** +### **3. Create annotated tag vx.x.x** In `x-x-stable` branch check for the SHA-1 of the commit with VERSION file changed. Tag that commit, @@ -246,12 +241,17 @@ git tag -a vx.x.0 -m 'Version x.x.0' xxxxx where `xxxxx` is SHA-1. -### **5. Push the tag** +### **4. Push the tag** ``` git push origin vx.x.0 ``` +### **5. Build the Omnibus packages** + +Follow the [release doc in the Omnibus repository](https://gitlab.com/gitlab-org/omnibus-gitlab/blob/master/doc/release.md). +This can happen before tagging because Omnibus uses tags in its own repo and SHA1's to refer to the GitLab codebase. + ### **6. Push to remotes** For GitLab CE, push to dev, GitLab.com and GitHub. @@ -260,8 +260,6 @@ For GitLab EE, push to the subscribers repo. Make sure the branch is marked 'protected' on each of the remotes you pushed to. -NOTE: You might not have the rights to push to master on dev. Ask Dmitriy. - ### **7. Publish blog for new release** Merge the [blog merge request](#1-prepare-the-blog-post) in `www-gitlab-com` repository. @@ -282,6 +280,10 @@ Include a link to the blog post and keep it short. Proposed email text: "We have released a new version of GitLab. See our blog post() for more information." +### **10. Update installation.md** + +Update [installation.md](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/install/installation.md) to the newest version. + # **23rd - Optional Patch Release** # **24th - Update GitLab.com** -- cgit v1.2.1 From 18ec2f93a6c8a1cb783af1522f198668481d2384 Mon Sep 17 00:00:00 2001 From: Sytse Sijbrandij Date: Fri, 22 Aug 2014 21:49:39 +0200 Subject: Don't forget to cherry pick into stable. --- doc/release/monthly.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/release/monthly.md b/doc/release/monthly.md index e40fbbef70c..dfde53fe3a0 100644 --- a/doc/release/monthly.md +++ b/doc/release/monthly.md @@ -282,7 +282,7 @@ Proposed email text: ### **10. Update installation.md** -Update [installation.md](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/install/installation.md) to the newest version. +Update [installation.md](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/install/installation.md) to the newest version in master and cherry-pick that commit into the stable branch. # **23rd - Optional Patch Release** -- cgit v1.2.1 From 075e5eeccb91b742c7209dd3668ec9d28e4d0ea1 Mon Sep 17 00:00:00 2001 From: Sytse Sijbrandij Date: Tue, 26 Aug 2014 10:04:57 +0200 Subject: Change the version before creating the stable branch. --- doc/release/monthly.md | 23 ++++++++++------------- 1 file changed, 10 insertions(+), 13 deletions(-) diff --git a/doc/release/monthly.md b/doc/release/monthly.md index 09bdde81dcc..7f8f3255e9b 100644 --- a/doc/release/monthly.md +++ b/doc/release/monthly.md @@ -210,9 +210,16 @@ For GitLab EE, append `-ee` to the branches and tags. `v.x.x.0-ee` -Merge CE into EE if needed. +Note: Merge CE into EE if needed. -### **1. Create x-x-stable branch and push to the repositories** +### **1. Set VERSION to x.x.x and push** + +- Change the GITLAB_SHELL_VERSION file in `master` of the CE repository if the version changed. +- Change the GITLAB_SHELL_VERSION file in `master` of the EE repository if the version changed. +- Change the VERSION file in `master` branch of the CE repository and commit and push. +- Change the VERSION file in `master` branch of the EE repository and commit and push. + +### **2. Create x-x-stable branch and push to the repositories** ``` git checkout master @@ -221,21 +228,11 @@ git checkout -b x-x-stable git push x-x-stable ``` -### **2. Build the Omnibus packages** +### **3. Build the Omnibus packages** Follow the [release doc in the Omnibus repository](https://gitlab.com/gitlab-org/omnibus-gitlab/blob/master/doc/release.md). This can happen before tagging because Omnibus uses tags in its own repo and SHA1's to refer to the GitLab codebase. -### **3. Set VERSION to x.x.x and push** - -Change the GITLAB_SHELL_VERSION file in `master` of the CE repository if the version changed. - -Change the GITLAB_SHELL_VERSION file in `master` of the EE repository if the version changed. - -Change the VERSION file in `master` branch of the CE repository and commit. Cherry-pick into the `x-x-stable` branch of CE. - -Change the VERSION file in `master` branch of the EE repository and commit. Cherry-pick into the `x-x-stable-ee` branch of EE. - ### **4. Create annotated tag vx.x.x** In `x-x-stable` branch check for the SHA-1 of the commit with VERSION file changed. Tag that commit, -- cgit v1.2.1 From 099e17038fb71739ec2c7d785cfccb069305b439 Mon Sep 17 00:00:00 2001 From: Sytse Sijbrandij Date: Tue, 26 Aug 2014 10:20:55 +0200 Subject: Add note about testing the migrations. --- doc/release/monthly.md | 1 + 1 file changed, 1 insertion(+) diff --git a/doc/release/monthly.md b/doc/release/monthly.md index 7f8f3255e9b..260b049fd74 100644 --- a/doc/release/monthly.md +++ b/doc/release/monthly.md @@ -153,6 +153,7 @@ git tag -a vx.x.0.rc1 -m 'Version x.x.0.rc1' Merge the RC1 EE code into GitLab.com. Once the build is green, create a package. +If there are big database migrations consider testing them with the production db on a VM. Try to deploy in the morning. It is important to do this as soon as possible, so we can catch any errors before we release the full version. -- cgit v1.2.1 From 99b81be88777fddfc497b50789f9e185b9c0cd71 Mon Sep 17 00:00:00 2001 From: Jacob Vosmaer Date: Tue, 26 Aug 2014 10:58:16 +0200 Subject: Expire Rack sessions after 1 week --- CHANGELOG | 1 + config/initializers/session_store.rb | 1 + 2 files changed, 2 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index b35e02268ec..0be2be76720 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,5 +1,6 @@ v 7.3.0 - Always set the 'origin' remote in satellite actions + - Expire Rack sessions after 1 week v 7.2.0 - Explore page diff --git a/config/initializers/session_store.rb b/config/initializers/session_store.rb index 5fe5270236b..b3fa648f2a6 100644 --- a/config/initializers/session_store.rb +++ b/config/initializers/session_store.rb @@ -6,5 +6,6 @@ Gitlab::Application.config.session_store( key: '_gitlab_session', secure: Gitlab.config.gitlab.https, httponly: true, + expire_after: 1.week, path: (Rails.application.config.relative_url_root.nil?) ? '/' : Rails.application.config.relative_url_root ) -- cgit v1.2.1