From aa923847b2ad2734d28b50546674d3264a7969bb Mon Sep 17 00:00:00 2001 From: Ben Bodenmiller Date: Tue, 21 Oct 2014 14:23:58 -0700 Subject: [PATCH 1/3] cleanup monthly release details --- doc/release/monthly.md | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/doc/release/monthly.md b/doc/release/monthly.md index a9253339e5a..5bb63037d6e 100644 --- a/doc/release/monthly.md +++ b/doc/release/monthly.md @@ -4,7 +4,7 @@ NOTE: This is a guide for GitLab developers. # **15th - Code Freeze & Release Manager** -### **1. Stop merging in code, except for important bugfixes** +### **1. Stop merging in code, except for important bug fixes** ### **2. Release Manager** @@ -52,7 +52,7 @@ Name it "Release x.x.x" for easier searching. * Deploy to GitLab.com (#LINK) ``` -### **4. Update Changelog** +### **4. Update changelog** Any changes not yet added to the changelog are added by lead developer and in that merge request the complete team is asked if there is anything missing. @@ -71,15 +71,15 @@ The RC1 release comes with the task to update the installation and upgrade docs. ### **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. Check the [GitLab Shell version](/lib/tasks/gitlab/check.rake#L782) +1. Check the [Git version](/lib/tasks/gitlab/check.rake#L794) 1. There might be other changes. Ask around. -### **2. Create an update guides** +### **2. Create update guides** -1. Create: CE update guide from previous version. Like `from-6-8-to-6.9` +1. Create: CE update guide from previous version. Like `7.3-to-7.4.md` 1. Create: CE to EE update guide in EE repository for latest version. -1. Update: https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/update/6.0-to-6.x.md to latest version. +1. Update: `6.x-or-7.x-to-7.x.md` to latest version. It's best to copy paste the previous guide and make changes where necessary. The typical steps are listed below with any points you should specifically look at. @@ -98,9 +98,9 @@ List any major changes here, so the user is aware of them before starting to upg #### 3. Do users need to update dependencies like `git`? -- Check if the [GitLab Shell version](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/lib/tasks/gitlab/check.rake#L782) changed since the last release. +- Check if the [GitLab Shell version](/lib/tasks/gitlab/check.rake#L782) changed since the last release. -- Check if the [Git version](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/lib/tasks/gitlab/check.rake#L794) changed since the last release. +- Check if the [Git version](/lib/tasks/gitlab/check.rake#L794) changed since the last release. #### 4. Get latest code @@ -112,19 +112,19 @@ List any major changes here, so the user is aware of them before starting to upg Check if any of these changed since last release: -- -- +- [lib/support/nginx/gitlab](/lib/support/nginx/gitlab) +- [lib/support/nginx/gitlab-ssl](/lib/support/nginx/gitlab-ssl) - -- -- -- -- -- -- +- [config/gitlab.yml.example](/config/gitlab.yml.example) +- [config/unicorn.rb.example](/config/unicorn.rb.example) +- [config/database.yml.mysql](/config/database.yml.mysql) +- [config/database.yml.postgresql](/config/database.yml.postgresql) +- [config/initializers/rack_attack.rb.example](/config/initializers/rack_attack.rb.example) +- [config/resque.yml.example](/config/resque.yml.example) #### 8. Need to update init script? -Check if the `init.d/gitlab` script changed since last release: +Check if the `init.d/gitlab` script changed since last release: [lib/support/init.d/gitlab](/lib/support/init.d/gitlab) #### 9. Start application @@ -252,7 +252,7 @@ Note: Merge CE into EE if needed. ### **2. Update installation.md** -Update [installation.md](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/install/installation.md) to the newest version in master. +Update [installation.md](/doc/install/installation.md) to the newest version in master. ### **3. Push latest changes from x-x-stable branch to dev.gitlab.org** From 9be12dd9ca171a4665e0efe4d26d44366302fc43 Mon Sep 17 00:00:00 2001 From: Ciro Santilli Date: Thu, 23 Oct 2014 23:10:54 +0200 Subject: [PATCH 2/3] Merge File basename and direname into split Faster because only does one split in that case. --- lib/tasks/gitlab/import.rake | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/lib/tasks/gitlab/import.rake b/lib/tasks/gitlab/import.rake index b6ed874e11a..296ad181963 100644 --- a/lib/tasks/gitlab/import.rake +++ b/lib/tasks/gitlab/import.rake @@ -22,8 +22,7 @@ namespace :gitlab do repo_path[0..git_base_path.length] = '' path = repo_path.sub(/\.git$/, '') - name = File.basename path - group_name = File.dirname path + group_name, name = File.split(path) group_name = nil if group_name == '.' # Skip if group or user From 706b6b5acb8e900e3d43e810d83829f9931bb9ec Mon Sep 17 00:00:00 2001 From: Ciro Santilli Date: Thu, 23 Oct 2014 23:39:48 +0200 Subject: [PATCH 3/3] Fix import.rake failed import if project name is also an existing namespace. E.g., when trying to import group/root.git, that would fail if there is an user called root. --- lib/tasks/gitlab/import.rake | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/lib/tasks/gitlab/import.rake b/lib/tasks/gitlab/import.rake index 159568f2883..e0297023bfc 100644 --- a/lib/tasks/gitlab/import.rake +++ b/lib/tasks/gitlab/import.rake @@ -15,8 +15,6 @@ namespace :gitlab do git_base_path = Gitlab.config.gitlab_shell.repos_path repos_to_import = Dir.glob(git_base_path + '/**/*.git') - namespaces = Namespace.pluck(:path) - repos_to_import.each do |repo_path| # strip repo base path repo_path[0..git_base_path.length] = '' @@ -26,12 +24,6 @@ namespace :gitlab do group_name = File.dirname path group_name = nil if group_name == '.' - # Skip if group or user - if namespaces.include?(name) - puts "Skipping #{project.name} due to namespace conflict with group or user".yellow - next - end - puts "Processing #{repo_path}".yellow if path =~ /\.wiki\Z/ @@ -53,9 +45,9 @@ namespace :gitlab do # find group namespace if group_name - group = Group.find_by(path: group_name) + group = Namespace.find_by(path: group_name) # create group namespace - if !group + unless group group = Group.new(:name => group_name) group.path = group_name group.owner = user