diff options
| author | gitlabhq <m@gitlabhq.com> | 2011-10-21 09:58:28 +0300 |
|---|---|---|
| committer | gitlabhq <m@gitlabhq.com> | 2011-10-22 14:08:02 +0300 |
| commit | 977fe7307320ccd7613ea97823b68ab356ebbe60 (patch) | |
| tree | b12d2219cd9da90d9efc0a309f2b43dfce5e3f33 | |
| parent | c66c30c821a77309302560667692854b2caabb8d (diff) | |
| download | gitlab-ce-977fe7307320ccd7613ea97823b68ab356ebbe60.tar.gz | |
prepare for 1.1
| -rw-r--r-- | CHANGELOG | 2 | ||||
| -rw-r--r-- | VERSION | 2 | ||||
| -rw-r--r-- | update.rb | 4 |
3 files changed, 5 insertions, 3 deletions
diff --git a/CHANGELOG b/CHANGELOG index aa8461661ec..96acfba1440 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 @@ -1 +1 @@ -1.0.2 +1.1.0 diff --git a/update.rb b/update.rb index dccb7df3699..b81a4088887 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 |