Merge branch 'master' into stable

Dmitriy Zaporozhets
2 parents fa1f8513 da854542
Showing 1268 changed files with 168339 additions and 2599 deletions Show diff stats
.travis.yml
CHANGELOG
CONTRIBUTING.md
Gemfile
Gemfile.lock
README.md
VERSION
app/assets/images/emoji/+1.png
app/assets/images/emoji/-1.png
app/assets/images/emoji/100.png
app/assets/images/emoji/109.png
app/assets/images/emoji/1234.png
app/assets/images/emoji/8ball.png
app/assets/images/emoji/a.png
app/assets/images/emoji/ab.png
app/assets/images/emoji/abc.png
app/assets/images/emoji/abcd.png
app/assets/images/emoji/accept.png
app/assets/images/emoji/aerial_tramway.png
app/assets/images/emoji/airplane.png
 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"
+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
@@ -9,7 +31,7 @@ v 2.9.0
   - restyled projects list on dashboard
   - ssh keys validation to prevent gitolite crash
   - send notifications if changed premission in project
-  - scss refactoring. gitlab_bootstrap/ dir 
+  - scss refactoring. gitlab_bootstrap/ dir
   - fix git push http body bigger than 112k problem
   - list of labels  page under issues tab
   - API for milestones, keys
@@ -113,7 +135,7 @@ v 2.1.0
 v 2.0.0
   - gitolite as main git host system
   - merge requests
-  - project/repo access 
+  - project/repo access
   - link to commit/issue feed
   - design tab
   - improved email notifications
@@ -147,7 +169,7 @@ v 1.1.0
   - bugfix & code cleaning
 v 1.0.2
-  - fixed bug with empty project 
+  - fixed bug with empty project
   - added adv validation for project path & code
   - feature: issues can be sortable
   - bugfix
@@ -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)
@@ -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 &#39;omniauth-github&#39;
 # 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 &quot;seed-fu&quot;
 # 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 &#39;settingslogic&#39;
 # 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
@@ -5,15 +5,6 @@ GIT
     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
   specs:
@@ -31,16 +22,6 @@ GIT
       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
   ref: f038dd852d7bd473a557e385d5d7c2fd5dc1dc2e
@@ -52,14 +33,6 @@ GIT
       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
   specs:
@@ -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)
@@ -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
-2.9.1
+3.0.0
1	env:	1	env:
		2	+ - DB=postgresql
2	- DB=mysql	3	- DB=mysql
3	before_install:	4	before_install:
4	- sudo apt-get install libicu-dev -y	5	- sudo apt-get install libicu-dev -y
	@@ -11,6 +12,7 @@ rvm:		@@ -11,6 +12,7 @@ rvm:
11	- 1.9.3	12	- 1.9.3
12	services:	13	services:
13	- mysql	14	- mysql
		15	+ - postgresql
14	before_script:	16	before_script:
15	- "cp config/database.yml.$DB config/database.yml"	17	- "cp config/database.yml.$DB config/database.yml"
16	- "cp config/gitlab.yml.example config/gitlab.yml"	18	- "cp config/gitlab.yml.example config/gitlab.yml"
	@@ -18,4 +20,4 @@ before_script:		@@ -18,4 +20,4 @@ before_script:
18	- "bundle exec rake db:migrate RAILS_ENV=test"	20	- "bundle exec rake db:migrate RAILS_ENV=test"
19	- "bundle exec rake db:seed_fu RAILS_ENV=test"	21	- "bundle exec rake db:seed_fu RAILS_ENV=test"
20	- "sh -e /etc/init.d/xvfb start"	22	- "sh -e /etc/init.d/xvfb start"
21	-script: "bundle exec rake travis"	23	+script: "bundle exec rake travis --trace"
		1	+v 3.0.0
		2	+ - Projects groups
		3	+ - Web Editor
		4	+ - Fixed bug with gitolite keys
		5	+ - UI improved
		6	+ - Increased perfomance of application
		7	+ - Show user avatar in last commit when browsing Files
		8	+ - Refactored Gitlab::Merge
		9	+ - Use Font Awsome for icons
		10	+ - Separate observing of Note and MergeRequestsa
		11	+ - Milestone "All Issues" filter
		12	+ - Fix issue close and reopen button text and styles
		13	+ - Fix forward/back while browsing Tree hierarchy
		14	+ - Show numer of notes for commits and merge requests
		15	+ - Added support pg from box and update installation doc
		16	+ - Reject ssh keys that break gitolite
		17	+ - [API] list one project hook
		18	+ - [API] edit project hook
		19	+ - [API] add project snippets list
		20	+ - [API] allow to authorize using private token in HTTP header
		21	+ - [API] add user creation
		22	+
1	v 2.9.1	23	v 2.9.1
2	- Fixed resque custom config init	24	- Fixed resque custom config init
3		25
	@@ -9,7 +31,7 @@ v 2.9.0		@@ -9,7 +31,7 @@ v 2.9.0
9	- restyled projects list on dashboard	31	- restyled projects list on dashboard
10	- ssh keys validation to prevent gitolite crash	32	- ssh keys validation to prevent gitolite crash
11	- send notifications if changed premission in project	33	- send notifications if changed premission in project
12	- - scss refactoring. gitlab_bootstrap/ dir	34	+ - scss refactoring. gitlab_bootstrap/ dir
13	- fix git push http body bigger than 112k problem	35	- fix git push http body bigger than 112k problem
14	- list of labels page under issues tab	36	- list of labels page under issues tab
15	- API for milestones, keys	37	- API for milestones, keys
	@@ -113,7 +135,7 @@ v 2.1.0		@@ -113,7 +135,7 @@ v 2.1.0
113	v 2.0.0	135	v 2.0.0
114	- gitolite as main git host system	136	- gitolite as main git host system
115	- merge requests	137	- merge requests
116	- - project/repo access	138	+ - project/repo access
117	- link to commit/issue feed	139	- link to commit/issue feed
118	- design tab	140	- design tab
119	- improved email notifications	141	- improved email notifications
	@@ -147,7 +169,7 @@ v 1.1.0		@@ -147,7 +169,7 @@ v 1.1.0
147	- bugfix & code cleaning	169	- bugfix & code cleaning
148		170
149	v 1.0.2	171	v 1.0.2
150	- - fixed bug with empty project	172	+ - fixed bug with empty project
151	- added adv validation for project path & code	173	- added adv validation for project path & code
152	- feature: issues can be sortable	174	- feature: issues can be sortable
153	- bugfix	175	- bugfix
	@@ -11,8 +11,9 @@ end		@@ -11,8 +11,9 @@ end
11	gem "rails", "3.2.8"	11	gem "rails", "3.2.8"
12		12
13	# Supported DBs	13	# Supported DBs
14	-gem "sqlite3"
15	-gem "mysql2"	14	+gem "sqlite3", :group => :sqlite
		15	+gem "mysql2", :group => :mysql
		16	+gem "pg", :group => :postgres
16		17
17	# Auth	18	# Auth
18	gem "devise", "~> 2.1.0"	19	gem "devise", "~> 2.1.0"
	@@ -23,12 +24,18 @@ gem 'omniauth-github'		@@ -23,12 +24,18 @@ gem 'omniauth-github'
23		24
24	# GITLAB patched libs	25	# GITLAB patched libs
25	gem "grit", :git => "https://github.com/gitlabhq/grit.git", :ref => "7f35cb98ff17d534a07e3ce6ec3d580f67402837"	26	gem "grit", :git => "https://github.com/gitlabhq/grit.git", :ref => "7f35cb98ff17d534a07e3ce6ec3d580f67402837"
26	-gem "gitolite", :git => "https://github.com/gitlabhq/gitolite-client.git", :ref => "9b715ca8bab6529f6c92204a25f84d12f25a6eb0"
27	-gem "pygments.rb", :git => "https://github.com/gitlabhq/pygments.rb.git", :ref => "2cada028da5054616634a1d9ca6941b65b3ce188"
28	gem "omniauth-ldap", :git => "https://github.com/gitlabhq/omniauth-ldap.git", :ref => "f038dd852d7bd473a557e385d5d7c2fd5dc1dc2e"	27	gem "omniauth-ldap", :git => "https://github.com/gitlabhq/omniauth-ldap.git", :ref => "f038dd852d7bd473a557e385d5d7c2fd5dc1dc2e"
29	gem 'yaml_db', :git => "https://github.com/gitlabhq/yaml_db.git"	28	gem 'yaml_db', :git => "https://github.com/gitlabhq/yaml_db.git"
30	gem 'grack', :git => "https://github.com/gitlabhq/grack.git"	29	gem 'grack', :git => "https://github.com/gitlabhq/grack.git"
31	-gem "linguist", "~> 1.0.0", :git => "https://github.com/gitlabhq/linguist.git"	30	+
		31	+# Gitolite client (for work with gitolite-admin repo)
		32	+gem "gitolite", '1.1.0'
		33	+
		34	+# Syntax highlighter
		35	+gem "pygments.rb", "0.3.1"
		36	+
		37	+# Language detection
		38	+gem "github-linguist", "~> 2.3.4" , :require => "linguist"
32		39
33	# API	40	# API
34	gem "grape", "~> 0.2.1"	41	gem "grape", "~> 0.2.1"
	@@ -57,7 +64,7 @@ gem "seed-fu"		@@ -57,7 +64,7 @@ gem "seed-fu"
57		64
58	# Markdown to HTML	65	# Markdown to HTML
59	gem "redcarpet", "~> 2.1.1"	66	gem "redcarpet", "~> 2.1.1"
60	-gem "github-markup", "~> 0.7.4"	67	+gem "github-markup", "~> 0.7.4", require: 'github/markup'
61		68
62	# Servers	69	# Servers
63	gem "thin"	70	gem "thin"
	@@ -87,6 +94,7 @@ gem 'settingslogic'		@@ -87,6 +94,7 @@ gem 'settingslogic'
87		94
88	# Misc	95	# Misc
89	gem "foreman"	96	gem "foreman"
		97	+gem 'gemoji', require: 'emoji/railtie'
90	gem "git"	98	gem "git"
91		99
92	group :assets do	100	group :assets do
	@@ -96,11 +104,13 @@ group :assets do		@@ -96,11 +104,13 @@ group :assets do
96	gem "therubyracer"	104	gem "therubyracer"
97		105
98	gem 'chosen-rails'	106	gem 'chosen-rails'
		107	+ gem 'jquery-atwho-rails', '0.1.6'
99	gem "jquery-rails", "2.0.2"	108	gem "jquery-rails", "2.0.2"
100	gem "jquery-ui-rails", "0.5.0"	109	gem "jquery-ui-rails", "0.5.0"
101	gem "modernizr", "2.5.3"	110	gem "modernizr", "2.5.3"
102	gem "raphael-rails", "1.5.2"	111	gem "raphael-rails", "1.5.2"
103	gem 'bootstrap-sass', "2.0.4"	112	gem 'bootstrap-sass', "2.0.4"
		113	+ gem "font-awesome-sass-rails", "~> 2.0.0"
104	end	114	end
105		115
106	group :development do	116	group :development do
	@@ -110,6 +120,7 @@ group :development do		@@ -110,6 +120,7 @@ group :development do
110	end	120	end
111		121
112	group :development, :test do	122	group :development, :test do
		123	+ gem 'rails-dev-tweaks'
113	gem 'spinach-rails'	124	gem 'spinach-rails'
114	gem "rspec-rails"	125	gem "rspec-rails"
115	gem "capybara"	126	gem "capybara"
	@@ -137,8 +148,9 @@ group :test do		@@ -137,8 +148,9 @@ group :test do
137	gem 'email_spec'	148	gem 'email_spec'
138	gem 'resque_spec'	149	gem 'resque_spec'
139	gem "webmock"	150	gem "webmock"
		151	+ gem 'test_after_commit'
140	end	152	end
141		153
142	group :production do	154	group :production do
143	- gem "gitlab_meta", '2.9'	155	+ gem "gitlab_meta", '3.0'
144	end	156	end
	@@ -5,15 +5,6 @@ GIT		@@ -5,15 +5,6 @@ GIT
5	annotate (2.4.1.beta1)	5	annotate (2.4.1.beta1)
6		6
7	GIT	7	GIT
8	- remote: https://github.com/gitlabhq/gitolite-client.git
9	- revision: 9b715ca8bab6529f6c92204a25f84d12f25a6eb0
10	- ref: 9b715ca8bab6529f6c92204a25f84d12f25a6eb0
11	- specs:
12	- gitolite (0.0.4.alpha)
13	- grit (>= 2.4.1)
14	- hashery (~> 1.4.0)
15	-
16	-GIT
17	remote: https://github.com/gitlabhq/grack.git	8	remote: https://github.com/gitlabhq/grack.git
18	revision: ba46f3b0845c6a09d488ae6abdce6ede37e227e8	9	revision: ba46f3b0845c6a09d488ae6abdce6ede37e227e8
19	specs:	10	specs:
	@@ -31,16 +22,6 @@ GIT		@@ -31,16 +22,6 @@ GIT
31	posix-spawn (~> 0.3.6)	22	posix-spawn (~> 0.3.6)
32		23
33	GIT	24	GIT
34	- remote: https://github.com/gitlabhq/linguist.git
35	- revision: c3d6fc5af8cf9d67afa572bba363bf0db256a900
36	- specs:
37	- linguist (1.0.0)
38	- charlock_holmes (~> 0.6.6)
39	- escape_utils (~> 0.2.3)
40	- mime-types (~> 1.18)
41	- pygments.rb (~> 0.2.11)
42	-
43	-GIT
44	remote: https://github.com/gitlabhq/omniauth-ldap.git	25	remote: https://github.com/gitlabhq/omniauth-ldap.git
45	revision: f038dd852d7bd473a557e385d5d7c2fd5dc1dc2e	26	revision: f038dd852d7bd473a557e385d5d7c2fd5dc1dc2e
46	ref: f038dd852d7bd473a557e385d5d7c2fd5dc1dc2e	27	ref: f038dd852d7bd473a557e385d5d7c2fd5dc1dc2e
	@@ -52,14 +33,6 @@ GIT		@@ -52,14 +33,6 @@ GIT
52	rubyntlm (~> 0.1.1)	33	rubyntlm (~> 0.1.1)
53		34
54	GIT	35	GIT
55	- remote: https://github.com/gitlabhq/pygments.rb.git
56	- revision: 2cada028da5054616634a1d9ca6941b65b3ce188
57	- ref: 2cada028da5054616634a1d9ca6941b65b3ce188
58	- specs:
59	- pygments.rb (0.2.13)
60	- rubypython (~> 0.6.1)
61	-
62	-GIT
63	remote: https://github.com/gitlabhq/yaml_db.git	36	remote: https://github.com/gitlabhq/yaml_db.git
64	revision: 98e9a5dca43e3fedd3268c76a73af40d1bdf1dfd	37	revision: 98e9a5dca43e3fedd3268c76a73af40d1bdf1dfd
65	specs:	38	specs:
	@@ -162,18 +135,32 @@ GEM		@@ -162,18 +135,32 @@ GEM
162	multipart-post (~> 1.1)	135	multipart-post (~> 1.1)
163	ffaker (1.14.0)	136	ffaker (1.14.0)
164	ffi (1.0.11)	137	ffi (1.0.11)
		138	+ font-awesome-sass-rails (2.0.0.0)
		139	+ railties (>= 3.1.1)
		140	+ sass-rails (>= 3.1.1)
165	foreman (0.47.0)	141	foreman (0.47.0)
166	thor (>= 0.13.6)	142	thor (>= 0.13.6)
		143	+ gemoji (1.1.1)
167	gherkin-ruby (0.2.1)	144	gherkin-ruby (0.2.1)
168	git (1.2.5)	145	git (1.2.5)
		146	+ github-linguist (2.3.4)
		147	+ charlock_holmes (~> 0.6.6)
		148	+ escape_utils (~> 0.2.3)
		149	+ mime-types (~> 1.19)
		150	+ pygments.rb (>= 0.2.13)
169	github-markup (0.7.4)	151	github-markup (0.7.4)
170	- gitlab_meta (2.9)	152	+ gitlab_meta (3.0)
		153	+ gitolite (1.1.0)
		154	+ gratr19 (~> 0.4.4.1)
		155	+ grit (~> 2.5.0)
		156	+ hashery (~> 1.5.0)
171	grape (0.2.1)	157	grape (0.2.1)
172	hashie (~> 1.2)	158	hashie (~> 1.2)
173	multi_json	159	multi_json
174	multi_xml	160	multi_xml
175	rack	161	rack
176	rack-mount	162	rack-mount
		163	+ gratr19 (0.4.4.1)
177	growl (1.0.3)	164	growl (1.0.3)
178	guard (1.3.2)	165	guard (1.3.2)
179	listen (>= 0.4.2)	166	listen (>= 0.4.2)
	@@ -189,7 +176,8 @@ GEM		@@ -189,7 +176,8 @@ GEM
189	activesupport (~> 3.0)	176	activesupport (~> 3.0)
190	haml (~> 3.0)	177	haml (~> 3.0)
191	railties (~> 3.0)	178	railties (~> 3.0)
192	- hashery (1.4.0)	179	+ hashery (1.5.0)
		180	+ blankslate
193	hashie (1.2.0)	181	hashie (1.2.0)
194	headless (0.3.1)	182	headless (0.3.1)
195	hike (1.2.1)	183	hike (1.2.1)
	@@ -199,6 +187,7 @@ GEM		@@ -199,6 +187,7 @@ GEM
199	httpauth (0.1)	187	httpauth (0.1)
200	i18n (0.6.1)	188	i18n (0.6.1)
201	journey (1.0.4)	189	journey (1.0.4)
		190	+ jquery-atwho-rails (0.1.6)
202	jquery-rails (2.0.2)	191	jquery-rails (2.0.2)
203	railties (>= 3.2.0, < 5.0)	192	railties (>= 3.2.0, < 5.0)
204	thor (~> 0.14)	193	thor (~> 0.14)
	@@ -260,12 +249,16 @@ GEM		@@ -260,12 +249,16 @@ GEM
260	multi_json (~> 1.3)	249	multi_json (~> 1.3)
261	omniauth-oauth (~> 1.0)	250	omniauth-oauth (~> 1.0)
262	orm_adapter (0.3.0)	251	orm_adapter (0.3.0)
		252	+ pg (0.14.0)
263	polyglot (0.3.3)	253	polyglot (0.3.3)
264	posix-spawn (0.3.6)	254	posix-spawn (0.3.6)
265	pry (0.9.9.6)	255	pry (0.9.9.6)
266	coderay (~> 1.0.5)	256	coderay (~> 1.0.5)
267	method_source (~> 0.7.1)	257	method_source (~> 0.7.1)
268	slop (>= 2.4.4, < 3)	258	slop (>= 2.4.4, < 3)
		259	+ pygments.rb (0.3.1)
		260	+ posix-spawn (~> 0.3.6)
		261	+ yajl-ruby (~> 1.1.0)
269	pyu-ruby-sasl (0.0.3.3)	262	pyu-ruby-sasl (0.0.3.3)
270	rack (1.4.1)	263	rack (1.4.1)
271	rack-cache (1.2)	264	rack-cache (1.2)
	@@ -288,6 +281,9 @@ GEM		@@ -288,6 +281,9 @@ GEM
288	activesupport (= 3.2.8)	281	activesupport (= 3.2.8)
289	bundler (~> 1.0)	282	bundler (~> 1.0)
290	railties (= 3.2.8)	283	railties (= 3.2.8)
		284	+ rails-dev-tweaks (0.6.1)
		285	+ actionpack (~> 3.1)
		286	+ railties (~> 3.1)
291	railties (3.2.8)	287	railties (3.2.8)
292	actionpack (= 3.2.8)	288	actionpack (= 3.2.8)
293	activesupport (= 3.2.8)	289	activesupport (= 3.2.8)
	@@ -332,9 +328,6 @@ GEM		@@ -332,9 +328,6 @@ GEM
332	railties (>= 3.0)	328	railties (>= 3.0)
333	rspec (~> 2.10.0)	329	rspec (~> 2.10.0)
334	rubyntlm (0.1.1)	330	rubyntlm (0.1.1)
335	- rubypython (0.6.2)
336	- blankslate (>= 2.1.2.3)
337	- ffi (~> 1.0.7)
338	rubyzip (0.9.8)	331	rubyzip (0.9.8)
339	sass (3.1.19)	332	sass (3.1.19)
340	sass-rails (3.2.5)	333	sass-rails (3.2.5)
	@@ -376,6 +369,7 @@ GEM		@@ -376,6 +369,7 @@ GEM
376	tilt (~> 1.1, != 1.3.0)	369	tilt (~> 1.1, != 1.3.0)
377	sqlite3 (1.3.6)	370	sqlite3 (1.3.6)
378	stamp (0.1.6)	371	stamp (0.1.6)
		372	+ test_after_commit (0.0.1)
379	therubyracer (0.10.1)	373	therubyracer (0.10.1)
380	libv8 (~> 3.3.10)	374	libv8 (~> 3.3.10)
381	thin (1.3.1)	375	thin (1.3.1)
	@@ -404,6 +398,7 @@ GEM		@@ -404,6 +398,7 @@ GEM
404	crack (>= 0.1.7)	398	crack (>= 0.1.7)
405	xpath (0.1.4)	399	xpath (0.1.4)
406	nokogiri (~> 1.3)	400	nokogiri (~> 1.3)
		401	+ yajl-ruby (1.1.0)
407		402
408	PLATFORMS	403	PLATFORMS
409	ruby	404	ruby
	@@ -426,11 +421,14 @@ DEPENDENCIES		@@ -426,11 +421,14 @@ DEPENDENCIES
426	email_spec	421	email_spec
427	factory_girl_rails	422	factory_girl_rails
428	ffaker	423	ffaker
		424	+ font-awesome-sass-rails (~> 2.0.0)
429	foreman	425	foreman
		426	+ gemoji
430	git	427	git
		428	+ github-linguist (~> 2.3.4)
431	github-markup (~> 0.7.4)	429	github-markup (~> 0.7.4)
432	- gitlab_meta (= 2.9)
433	- gitolite!	430	+ gitlab_meta (= 3.0)
		431	+ gitolite (= 1.1.0)
434	grack!	432	grack!
435	grape (~> 0.2.1)	433	grape (~> 0.2.1)
436	grit!	434	grit!
	@@ -440,12 +438,12 @@ DEPENDENCIES		@@ -440,12 +438,12 @@ DEPENDENCIES
440	haml-rails	438	haml-rails
441	headless	439	headless
442	httparty	440	httparty
		441	+ jquery-atwho-rails (= 0.1.6)
443	jquery-rails (= 2.0.2)	442	jquery-rails (= 2.0.2)
444	jquery-ui-rails (= 0.5.0)	443	jquery-ui-rails (= 0.5.0)
445	kaminari	444	kaminari
446	launchy	445	launchy
447	letter_opener	446	letter_opener
448	- linguist (~> 1.0.0)!
449	modernizr (= 2.5.3)	447	modernizr (= 2.5.3)
450	mysql2	448	mysql2
451	omniauth	449	omniauth
	@@ -453,10 +451,12 @@ DEPENDENCIES		@@ -453,10 +451,12 @@ DEPENDENCIES
453	omniauth-google-oauth2	451	omniauth-google-oauth2
454	omniauth-ldap!	452	omniauth-ldap!
455	omniauth-twitter	453	omniauth-twitter
		454	+ pg
456	pry	455	pry
457	- pygments.rb!	456	+ pygments.rb (= 0.3.1)
458	rack-mini-profiler	457	rack-mini-profiler
459	rails (= 3.2.8)	458	rails (= 3.2.8)
		459	+ rails-dev-tweaks
460	raphael-rails (= 1.5.2)	460	raphael-rails (= 1.5.2)
461	rb-fsevent	461	rb-fsevent
462	rb-inotify	462	rb-inotify
	@@ -474,6 +474,7 @@ DEPENDENCIES		@@ -474,6 +474,7 @@ DEPENDENCIES
474	spinach-rails	474	spinach-rails
475	sqlite3	475	sqlite3
476	stamp	476	stamp
		477	+ test_after_commit
477	therubyracer	478	therubyracer
478	thin	479	thin
479	uglifier (= 1.0.3)	480	uglifier (= 1.0.3)
	@@ -12,7 +12,7 @@ GitLab is a free project and repository management application		@@ -12,7 +12,7 @@ GitLab is a free project and repository management application
12	## Requirements	12	## Requirements
13		13
14	* Ubuntu/Debian	14	* Ubuntu/Debian
15	-* ruby 1.9.2+	15	+* ruby 1.9.3+
16	* mysql or sqlite	16	* mysql or sqlite
17	* git	17	* git
18	* gitolite	18	* gitolite