Merge branch 'master' into stable

.travis.yml

@@ -1,4 +1,5 @@
 env:
+  - DB=postgresql
   - DB=mysql
 before_install:
   - sudo apt-get install libicu-dev -y
@@ -11,6 +12,7 @@ rvm:
   - 1.9.3
 services:
   - mysql
+  - postgresql
 before_script:
   - "cp config/database.yml.$DB config/database.yml"
   - "cp config/gitlab.yml.example config/gitlab.yml"
@@ -18,4 +20,4 @@ before_script:
   - "bundle exec rake db:migrate RAILS_ENV=test"
   - "bundle exec rake db:seed_fu RAILS_ENV=test"
   - "sh -e /etc/init.d/xvfb start"
-script: "bundle exec rake travis"
+script: "bundle exec rake travis --trace"

CHANGELOG

@@ -1,3 +1,25 @@
+v 3.0.0
+  - Projects groups
+  - Web Editor
+  - Fixed bug with gitolite keys
+  - UI improved
+  - Increased perfomance of application
+  - Show user avatar in last commit when browsing Files 
+  - Refactored Gitlab::Merge
+  - Use Font Awsome for icons
+  - Separate observing of Note and MergeRequestsa
+  - Milestone "All Issues" filter
+  - Fix issue close and reopen button text and styles
+  - Fix forward/back while browsing Tree hierarchy
+  - Show numer of notes for commits and merge requests
+  - Added support pg from box and update installation doc
+  - Reject ssh keys that break gitolite
+  - [API] list one project hook
+  - [API] edit project hook
+  - [API] add project snippets list
+  - [API] allow to authorize using private token in HTTP header
+  - [API] add user creation
+
 v 2.9.1
   - Fixed resque custom config init
 

CONTRIBUTING.md

@@ -7,12 +7,12 @@ If you want to contribute to GitLab, follow this process:
 3. Code
 4. Create a pull request
 
-We only accept pull requests if: 
+We will only accept pull requests if: 
 
 * Your code has proper tests and all tests pass
 * Your code can be merged w/o problems 
-* It wont broke existing functionality
-* Its a quality code
+* It won't break existing functionality
+* It's quality code
 * We like it :)
 
 ## [You may need a developer VM](https://github.com/gitlabhq/developer-vm)

Gemfile

@@ -11,8 +11,9 @@ end
 gem "rails", "3.2.8"
 
 # Supported DBs
-gem "sqlite3"
-gem "mysql2"
+gem "sqlite3", :group => :sqlite
+gem "mysql2", :group => :mysql
+gem "pg", :group => :postgres
 
 # Auth
 gem "devise", "~> 2.1.0"
@@ -23,12 +24,18 @@ gem 'omniauth-github'
 
 # GITLAB patched libs
 gem "grit",          :git => "https://github.com/gitlabhq/grit.git",            :ref => "7f35cb98ff17d534a07e3ce6ec3d580f67402837"
-gem "gitolite",      :git => "https://github.com/gitlabhq/gitolite-client.git", :ref => "9b715ca8bab6529f6c92204a25f84d12f25a6eb0"
-gem "pygments.rb",   :git => "https://github.com/gitlabhq/pygments.rb.git",     :ref => "2cada028da5054616634a1d9ca6941b65b3ce188"
 gem "omniauth-ldap", :git => "https://github.com/gitlabhq/omniauth-ldap.git",   :ref => "f038dd852d7bd473a557e385d5d7c2fd5dc1dc2e"
 gem 'yaml_db',       :git => "https://github.com/gitlabhq/yaml_db.git"
 gem 'grack',         :git => "https://github.com/gitlabhq/grack.git"
-gem "linguist", "~> 1.0.0", :git => "https://github.com/gitlabhq/linguist.git"
+
+# Gitolite client (for work with gitolite-admin repo)
+gem "gitolite", '1.1.0'
+
+# Syntax highlighter
+gem "pygments.rb", "0.3.1"
+
+# Language detection
+gem "github-linguist", "~> 2.3.4" , :require => "linguist"
 
 # API
 gem "grape", "~> 0.2.1"
@@ -57,7 +64,7 @@ gem "seed-fu"
 
 # Markdown to HTML
 gem "redcarpet",     "~> 2.1.1"
-gem "github-markup", "~> 0.7.4"
+gem "github-markup", "~> 0.7.4", require: 'github/markup'
 
 # Servers
 gem "thin"
@@ -87,6 +94,7 @@ gem 'settingslogic'
 
 # Misc
 gem "foreman"
+gem 'gemoji', require: 'emoji/railtie'
 gem "git"
 
 group :assets do
@@ -96,11 +104,13 @@ group :assets do
   gem "therubyracer"
 
   gem 'chosen-rails'
+  gem 'jquery-atwho-rails', '0.1.6'
   gem "jquery-rails",     "2.0.2"
   gem "jquery-ui-rails",  "0.5.0"
   gem "modernizr",        "2.5.3"
   gem "raphael-rails",    "1.5.2"
   gem 'bootstrap-sass',   "2.0.4"
+  gem "font-awesome-sass-rails", "~> 2.0.0"
 end
 
 group :development do
@@ -110,6 +120,7 @@ group :development do
 end
 
 group :development, :test do
+  gem 'rails-dev-tweaks'
   gem 'spinach-rails'
   gem "rspec-rails"
   gem "capybara"
@@ -137,8 +148,9 @@ group :test do
   gem 'email_spec'
   gem 'resque_spec'
   gem "webmock"
+  gem 'test_after_commit'
 end
 
 group :production do
-  gem "gitlab_meta", '2.9'
+  gem "gitlab_meta", '3.0'
 end

Gemfile.lock

@@ -4,15 +4,6 @@ GIT
   specs:
     annotate (2.4.1.beta1)
 
-GIT
-  remote: https://github.com/gitlabhq/gitolite-client.git
-  revision: 9b715ca8bab6529f6c92204a25f84d12f25a6eb0
-  ref: 9b715ca8bab6529f6c92204a25f84d12f25a6eb0
-  specs:
-    gitolite (0.0.4.alpha)
-      grit (>= 2.4.1)
-      hashery (~> 1.4.0)
-
 GIT
   remote: https://github.com/gitlabhq/grack.git
   revision: ba46f3b0845c6a09d488ae6abdce6ede37e227e8
@@ -30,16 +21,6 @@ GIT
       mime-types (~> 1.15)
       posix-spawn (~> 0.3.6)
 
-GIT
-  remote: https://github.com/gitlabhq/linguist.git
-  revision: c3d6fc5af8cf9d67afa572bba363bf0db256a900
-  specs:
-    linguist (1.0.0)
-      charlock_holmes (~> 0.6.6)
-      escape_utils (~> 0.2.3)
-      mime-types (~> 1.18)
-      pygments.rb (~> 0.2.11)
-
 GIT
   remote: https://github.com/gitlabhq/omniauth-ldap.git
   revision: f038dd852d7bd473a557e385d5d7c2fd5dc1dc2e
@@ -51,14 +32,6 @@ GIT
       pyu-ruby-sasl (~> 0.0.3.1)
       rubyntlm (~> 0.1.1)
 
-GIT
-  remote: https://github.com/gitlabhq/pygments.rb.git
-  revision: 2cada028da5054616634a1d9ca6941b65b3ce188
-  ref: 2cada028da5054616634a1d9ca6941b65b3ce188
-  specs:
-    pygments.rb (0.2.13)
-      rubypython (~> 0.6.1)
-
 GIT
   remote: https://github.com/gitlabhq/yaml_db.git
   revision: 98e9a5dca43e3fedd3268c76a73af40d1bdf1dfd
@@ -162,18 +135,32 @@ GEM
       multipart-post (~> 1.1)
     ffaker (1.14.0)
     ffi (1.0.11)
+    font-awesome-sass-rails (2.0.0.0)
+      railties (>= 3.1.1)
+      sass-rails (>= 3.1.1)
     foreman (0.47.0)
       thor (>= 0.13.6)
+    gemoji (1.1.1)
     gherkin-ruby (0.2.1)
     git (1.2.5)
+    github-linguist (2.3.4)
+      charlock_holmes (~> 0.6.6)
+      escape_utils (~> 0.2.3)
+      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)
+      hashery (~> 1.5.0)
     grape (0.2.1)
       hashie (~> 1.2)
       multi_json
       multi_xml
       rack
       rack-mount
+    gratr19 (0.4.4.1)
     growl (1.0.3)
     guard (1.3.2)
       listen (>= 0.4.2)
@@ -189,7 +176,8 @@ GEM
       activesupport (~> 3.0)
       haml (~> 3.0)
       railties (~> 3.0)
-    hashery (1.4.0)
+    hashery (1.5.0)
+      blankslate
     hashie (1.2.0)
     headless (0.3.1)
     hike (1.2.1)
@@ -199,6 +187,7 @@ GEM
     httpauth (0.1)
     i18n (0.6.1)
     journey (1.0.4)
+    jquery-atwho-rails (0.1.6)
     jquery-rails (2.0.2)
       railties (>= 3.2.0, < 5.0)
       thor (~> 0.14)
@@ -260,12 +249,16 @@ GEM
       multi_json (~> 1.3)
       omniauth-oauth (~> 1.0)
     orm_adapter (0.3.0)
+    pg (0.14.0)
     polyglot (0.3.3)
     posix-spawn (0.3.6)
     pry (0.9.9.6)
       coderay (~> 1.0.5)
       method_source (~> 0.7.1)
       slop (>= 2.4.4, < 3)
+    pygments.rb (0.3.1)
+      posix-spawn (~> 0.3.6)
+      yajl-ruby (~> 1.1.0)
     pyu-ruby-sasl (0.0.3.3)
     rack (1.4.1)
     rack-cache (1.2)
@@ -288,6 +281,9 @@ GEM
       activesupport (= 3.2.8)
       bundler (~> 1.0)
       railties (= 3.2.8)
+    rails-dev-tweaks (0.6.1)
+      actionpack (~> 3.1)
+      railties (~> 3.1)
     railties (3.2.8)
       actionpack (= 3.2.8)
       activesupport (= 3.2.8)
@@ -332,9 +328,6 @@ GEM
       railties (>= 3.0)
       rspec (~> 2.10.0)
     rubyntlm (0.1.1)
-    rubypython (0.6.2)
-      blankslate (>= 2.1.2.3)
-      ffi (~> 1.0.7)
     rubyzip (0.9.8)
     sass (3.1.19)
     sass-rails (3.2.5)
@@ -376,6 +369,7 @@ GEM
       tilt (~> 1.1, != 1.3.0)
     sqlite3 (1.3.6)
     stamp (0.1.6)
+    test_after_commit (0.0.1)
     therubyracer (0.10.1)
       libv8 (~> 3.3.10)
     thin (1.3.1)
@@ -404,6 +398,7 @@ GEM
       crack (>= 0.1.7)
     xpath (0.1.4)
       nokogiri (~> 1.3)
+    yajl-ruby (1.1.0)
 
 PLATFORMS
   ruby
@@ -426,11 +421,14 @@ DEPENDENCIES
   email_spec
   factory_girl_rails
   ffaker
+  font-awesome-sass-rails (~> 2.0.0)
   foreman
+  gemoji
   git
+  github-linguist (~> 2.3.4)
   github-markup (~> 0.7.4)
-  gitlab_meta (= 2.9)
-  gitolite!
+  gitlab_meta (= 3.0)
+  gitolite (= 1.1.0)
   grack!
   grape (~> 0.2.1)
   grit!
@@ -440,12 +438,12 @@ DEPENDENCIES
   haml-rails
   headless
   httparty
+  jquery-atwho-rails (= 0.1.6)
   jquery-rails (= 2.0.2)
   jquery-ui-rails (= 0.5.0)
   kaminari
   launchy
   letter_opener
-  linguist (~> 1.0.0)!
   modernizr (= 2.5.3)
   mysql2
   omniauth
@@ -453,10 +451,12 @@ DEPENDENCIES
   omniauth-google-oauth2
   omniauth-ldap!
   omniauth-twitter
+  pg
   pry
-  pygments.rb!
+  pygments.rb (= 0.3.1)
   rack-mini-profiler
   rails (= 3.2.8)
+  rails-dev-tweaks
   raphael-rails (= 1.5.2)
   rb-fsevent
   rb-inotify
@@ -474,6 +474,7 @@ DEPENDENCIES
   spinach-rails
   sqlite3
   stamp
+  test_after_commit
   therubyracer
   thin
   uglifier (= 1.0.3)

README.md

@@ -12,7 +12,7 @@ GitLab is a free project and repository management application
 ## Requirements
 
 * Ubuntu/Debian
-* ruby 1.9.2+
+* ruby 1.9.3+
 * mysql or sqlite
 * git
 * gitolite

VERSION

@@ -1 +1 @@
-2.9.1
+3.0.0