summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CHANGELOG12
-rw-r--r--VERSION2
-rw-r--r--app/views/help/index.html.haml2
3 files changed, 14 insertions, 2 deletions
diff --git a/CHANGELOG b/CHANGELOG
index 588e70c4167..9676354fdc8 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,15 @@
+v 2.6.0
+ - UI polished
+ - Improved network graph + keyboard nav
+ - Handle huge commits
+ - Last Push widget
+ - Bugfix
+ - Better perfomance
+ - Email in resque
+ - Increased test coverage
+ - Ability to remove branch with MR accept
+ - a lot of code refactored
+
v 2.5.0
- UI polished
- Git blame for file
diff --git a/VERSION b/VERSION
index 437459cd94c..e70b4523ae7 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.5.0
+2.6.0
diff --git a/app/views/help/index.html.haml b/app/views/help/index.html.haml
index d12b192bff2..649811ea073 100644
--- a/app/views/help/index.html.haml
+++ b/app/views/help/index.html.haml
@@ -1,6 +1,6 @@
%h3.cgray
GITLAB
- %span.right v2.5
+ %span.right v2.6
%hr
%h4 Self Hosted Git Management
%h4 Fast, secure and stable solution based on Ruby on Rails & Gitolite.