From 977fe7307320ccd7613ea97823b68ab356ebbe60 Mon Sep 17 00:00:00 2001
From: gitlabhq <m@gitlabhq.com>
Date: Fri, 21 Oct 2011 09:58:28 +0300
Subject: [PATCH] prepare for 1.1

---
 CHANGELOG | 2 ++
 VERSION   | 2 +-
 update.rb | 4 ++--
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index aa846166..96acfba1 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,4 +1,6 @@
 v 1.1.0
+  - project dashboard
+  - wall redesigned
   - feature: code snippets
   - fixed horizontal scroll on file preview
   - fixed app crash if commit message has invalid chars
diff --git a/VERSION b/VERSION
index 6d7de6e6..9084fa2f 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.0.2
+1.1.0
diff --git a/update.rb b/update.rb
index dccb7df3..b81a4088 100644
--- a/update.rb
+++ b/update.rb
@@ -19,8 +19,8 @@ env = if envs.include?(ARGV[0])
 puts yellow "== RAILS ENV | #{env}"
 current_version = version
 puts yellow "Your version is #{current_version}"
-puts yellow "Check for new version: $ git pull origin"
-`git pull origin` # pull from origin
+puts yellow "Check for new version: $ git pull origin 1x"
+`git pull origin 1x` # pull from origin
 
 # latest version
 if version == current_version