From e33aa2329936b38568d8621ba427373035a75a6b Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Mon, 21 Jan 2013 15:51:46 +0200
Subject: [PATCH 1/9] Update docs to use 4-1-stable
---
doc/install/installation.md | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/doc/install/installation.md b/doc/install/installation.md
index 27c87ec825f..7107d84617b 100644
--- a/doc/install/installation.md
+++ b/doc/install/installation.md
@@ -190,10 +190,10 @@ See `doc/install/databases.md`
cd /home/gitlab/gitlab
# Checkout to stable release
- sudo -u gitlab -H git checkout 4-0-stable
+ sudo -u gitlab -H git checkout 4-1-stable
**Note:**
-You can change `4-0-stable` to `master` if you want the *bleeding edge* version, but
+You can change `4-1-stable` to `master` if you want the *bleeding edge* version, but
do so with caution!
## Configure it
@@ -267,7 +267,7 @@ used for the `email.from` setting in `config/gitlab.yml`)
Download the init script (will be /etc/init.d/gitlab):
- sudo curl --output /etc/init.d/gitlab https://raw.github.com/gitlabhq/gitlab-recipes/master/init.d/gitlab
+ sudo curl --output /etc/init.d/gitlab https://raw.github.com/gitlabhq/gitlab-recipes/4-1-stable/init.d/gitlab
sudo chmod +x /etc/init.d/gitlab
Make GitLab start on boot:
@@ -308,7 +308,7 @@ If you can't or don't want to use Nginx as your web server, have a look at the
Download an example site config:
- sudo curl --output /etc/nginx/sites-available/gitlab https://raw.github.com/gitlabhq/gitlab-recipes/master/nginx/gitlab
+ sudo curl --output /etc/nginx/sites-available/gitlab https://raw.github.com/gitlabhq/gitlab-recipes/4-1-stable/nginx/gitlab
sudo ln -s /etc/nginx/sites-available/gitlab /etc/nginx/sites-enabled/gitlab
Make sure to edit the config file to match your setup:
--
GitLab
From 7014c8782bfabf5bc9fadb34d51a57df999fae1d Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Mon, 21 Jan 2013 15:53:00 +0200
Subject: [PATCH 2/9] Up to 4.1.0
---
VERSION | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/VERSION b/VERSION
index 87db9036a82..ee74734aa22 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-4.1.0rc1
+4.1.0
--
GitLab
From 970f86077adf2857ac3b3c1d7b0dc366a39f41f3 Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Fri, 8 Feb 2013 09:02:30 +0200
Subject: [PATCH 3/9] Up to 4.2
---
CHANGELOG | 7 +++++++
VERSION | 2 +-
doc/install/installation.md | 8 ++++----
3 files changed, 12 insertions(+), 5 deletions(-)
diff --git a/CHANGELOG b/CHANGELOG
index 4510b6d5cd9..5bc174a077b 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,4 +1,11 @@
v 4.2.0
+ - Async gitolite calls
+ - Teams
+ - Project listing page
+ - Improved search
+ - Groups API
+ - Improved Network Graph
+ - Edit page for group
- User show page. Via /u/username
- Show help contents on pages for better navigation
diff --git a/VERSION b/VERSION
index b5d76fb80d8..6aba2b245a8 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-4.2.0pre
+4.2.0
diff --git a/doc/install/installation.md b/doc/install/installation.md
index e42176370ba..f56d1c715f2 100644
--- a/doc/install/installation.md
+++ b/doc/install/installation.md
@@ -191,10 +191,10 @@ To setup the MySQL/PostgreSQL database and dependencies please see [`doc/install
cd /home/gitlab/gitlab
# Checkout to stable release
- sudo -u gitlab -H git checkout 4-1-stable
+ sudo -u gitlab -H git checkout 4-2-stable
**Note:**
-You can change `4-1-stable` to `master` if you want the *bleeding edge* version, but
+You can change `4-2-stable` to `master` if you want the *bleeding edge* version, but
do so with caution!
## Configure it
@@ -268,7 +268,7 @@ used for the `email.from` setting in `config/gitlab.yml`)
Download the init script (will be /etc/init.d/gitlab):
- sudo curl --output /etc/init.d/gitlab https://raw.github.com/gitlabhq/gitlab-recipes/master/init.d/gitlab
+ sudo curl --output /etc/init.d/gitlab https://raw.github.com/gitlabhq/gitlab-recipes/4-2-stable/init.d/gitlab
sudo chmod +x /etc/init.d/gitlab
Make GitLab start on boot:
@@ -309,7 +309,7 @@ If you can't or don't want to use Nginx as your web server, have a look at the
Download an example site config:
- sudo curl --output /etc/nginx/sites-available/gitlab https://raw.github.com/gitlabhq/gitlab-recipes/master/nginx/gitlab
+ sudo curl --output /etc/nginx/sites-available/gitlab https://raw.github.com/gitlabhq/gitlab-recipes/4-2-stable/nginx/gitlab
sudo ln -s /etc/nginx/sites-available/gitlab /etc/nginx/sites-enabled/gitlab
Make sure to edit the config file to match your setup:
--
GitLab
From 6ce2ff66974eeeb88f3ea523eaa38355be8d27c2 Mon Sep 17 00:00:00 2001
From: Fumiya Nakamura <nakamurafumiya003@gmail.com>
Date: Fri, 8 Feb 2013 09:58:27 -0800
Subject: [PATCH 4/9] Update command to execute as git user
---
doc/install/installation.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/doc/install/installation.md b/doc/install/installation.md
index f56d1c715f2..4ca5f2de7c6 100644
--- a/doc/install/installation.md
+++ b/doc/install/installation.md
@@ -147,7 +147,7 @@ Fix the directory permissions for the repositories:
# Make sure the repositories dir is owned by git and it stays that way
sudo chmod -R ug+rwX,o-rwx /home/git/repositories/
sudo chown -R git:git /home/git/repositories/
- find /home/git/repositories -type d -print0 | sudo xargs -0 chmod g+s
+ sudo -u git -H find /home/git/repositories -type d -print0 | sudo xargs -0 chmod g+s
## Add domains to list to the list of known hosts
--
GitLab
From 4d2660777bcc2894feafd700ee18e2254e20ae4c Mon Sep 17 00:00:00 2001
From: Donny Kurnia <donnykurnia@gmail.com>
Date: Tue, 12 Feb 2013 12:23:18 +0700
Subject: [PATCH 5/9] Update recipe_content url to same branch
When checking the init.d/gitlab file, it should be using the same branch with the gitlabhq
---
lib/tasks/gitlab/check.rake | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/lib/tasks/gitlab/check.rake b/lib/tasks/gitlab/check.rake
index b54e63acfbc..1a828c425d3 100644
--- a/lib/tasks/gitlab/check.rake
+++ b/lib/tasks/gitlab/check.rake
@@ -142,7 +142,7 @@ namespace :gitlab do
return
end
- recipe_content = `curl https://raw.github.com/gitlabhq/gitlab-recipes/master/init.d/gitlab 2>/dev/null`
+ recipe_content = `curl https://raw.github.com/gitlabhq/gitlab-recipes/4-2-stable/init.d/gitlab 2>/dev/null`
script_content = File.read(script_path)
if recipe_content == script_content
--
GitLab
From 24a7c0f63d892483c02ff98374f4fb2e03fc0654 Mon Sep 17 00:00:00 2001
From: Fumiya Nakamura <nakamurafumiya003@gmail.com>
Date: Fri, 15 Feb 2013 04:51:01 -0800
Subject: [PATCH 6/9] Fix file_name for archive
---
app/models/repository.rb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app/models/repository.rb b/app/models/repository.rb
index 6bfdf2255f2..9032905ce9a 100644
--- a/app/models/repository.rb
+++ b/app/models/repository.rb
@@ -151,7 +151,7 @@ class Repository
return nil unless commit
# Build file path
- file_name = self.path_with_namespace + "-" + commit.id.to_s + ".tar.gz"
+ file_name = self.path_with_namespace.gsub("/","_") + "-" + commit.id.to_s + ".tar.gz"
storage_path = Rails.root.join("tmp", "repositories")
file_path = File.join(storage_path, file_name)
--
GitLab
From dc1d4eab22658b276214912bdab4155111299355 Mon Sep 17 00:00:00 2001
From: Fumiya Nakamura <nakamurafumiya003@gmail.com>
Date: Fri, 15 Feb 2013 06:03:22 -0800
Subject: [PATCH 7/9] Fix repository.rb archive
---
app/models/repository.rb | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/app/models/repository.rb b/app/models/repository.rb
index 9032905ce9a..f9db6342603 100644
--- a/app/models/repository.rb
+++ b/app/models/repository.rb
@@ -153,14 +153,14 @@ class Repository
# Build file path
file_name = self.path_with_namespace.gsub("/","_") + "-" + commit.id.to_s + ".tar.gz"
storage_path = Rails.root.join("tmp", "repositories")
- file_path = File.join(storage_path, file_name)
+ file_path = File.join(storage_path, self.path_with_namespace, file_name)
# Put files into a directory before archiving
prefix = self.path_with_namespace + "/"
# Create file if not exists
unless File.exists?(file_path)
- FileUtils.mkdir_p storage_path
+ FileUtils.mkdir_p File.dirname(file_path)
file = self.repo.archive_to_file(ref, prefix, file_path)
end
--
GitLab
From d67117b5a185cfb15a1d7e749588ff981ffbf779 Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Thu, 21 Feb 2013 09:01:46 +0200
Subject: [PATCH 8/9] fix team events show up
---
app/views/teams/show.js.haml | 2 ++
1 file changed, 2 insertions(+)
create mode 100644 app/views/teams/show.js.haml
diff --git a/app/views/teams/show.js.haml b/app/views/teams/show.js.haml
new file mode 100644
index 00000000000..7e5a148e5ef
--- /dev/null
+++ b/app/views/teams/show.js.haml
@@ -0,0 +1,2 @@
+:plain
+ Pager.append(#{@events.count}, "#{escape_javascript(render(@events))}");
--
GitLab
From 33baf7ac6ff196c01c0af825940c6ca575da2fa5 Mon Sep 17 00:00:00 2001
From: Peter Schultz <schultz.peter@hotmail.com>
Date: Mon, 18 Mar 2013 16:42:44 +0100
Subject: [PATCH 9/9] make sure the correct version of bundler is installed
---
doc/install/installation.md | 1 +
1 file changed, 1 insertion(+)
diff --git a/doc/install/installation.md b/doc/install/installation.md
index 4ca5f2de7c6..8374a4e3816 100644
--- a/doc/install/installation.md
+++ b/doc/install/installation.md
@@ -237,6 +237,7 @@ Make sure to update username/password in config/database.yml.
cd /home/gitlab/gitlab
+ sudo gem install bundler
sudo gem install charlock_holmes --version '0.6.9'
# For MySQL (note, the option says "without")
--
GitLab