summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorrandx <dmitriy.zaporozhets@gmail.com>2012-10-17 22:01:27 +0300
committerrandx <dmitriy.zaporozhets@gmail.com>2012-10-17 22:01:27 +0300
commita9a3480de97296234fad349fe25aac6f11cf9285 (patch)
treeb7aa347a34e5d4185103e670de5cf4bd9481ccee
parent8e989d4863d6425f87e3a7230ff86823b6b2e551 (diff)
downloadgitlab-ce-a9a3480de97296234fad349fe25aac6f11cf9285.tar.gz
v3.0.0pre. Updated gitlab_meta to 3.0. Extended changelog
-rw-r--r--CHANGELOG3
-rw-r--r--Gemfile2
-rw-r--r--Gemfile.lock4
-rw-r--r--VERSION2
4 files changed, 7 insertions, 4 deletions
diff --git a/CHANGELOG b/CHANGELOG
index f626f49d3c1..696837564e0 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,4 +1,7 @@
master
+ - Projects groups
+ - Web Editor
+ - Fixed bug with gitolite keys
- [API] list one project hook
- [API] edit project hook
- [API] add project snippets list
diff --git a/Gemfile b/Gemfile
index 8de51690c19..d026aa07321 100644
--- a/Gemfile
+++ b/Gemfile
@@ -151,5 +151,5 @@ group :test do
end
group :production do
- gem "gitlab_meta", '2.9'
+ gem "gitlab_meta", '3.0'
end
diff --git a/Gemfile.lock b/Gemfile.lock
index 968a8baf7ca..22842867182 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -148,7 +148,7 @@ GEM
mime-types (~> 1.19)
pygments.rb (>= 0.2.13)
github-markup (0.7.4)
- gitlab_meta (2.9)
+ gitlab_meta (3.0)
gitolite (1.1.0)
gratr19 (~> 0.4.4.1)
grit (~> 2.5.0)
@@ -425,7 +425,7 @@ DEPENDENCIES
git
github-linguist (~> 2.3.4)
github-markup (~> 0.7.4)
- gitlab_meta (= 2.9)
+ gitlab_meta (= 3.0)
gitolite (= 1.1.0)
grack!
grape (~> 0.2.1)
diff --git a/VERSION b/VERSION
index dedcc7d4335..e72e128f415 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.9.1
+3.0.0pre