Dmitriy Zaporozhets 0c5a9f20b5 Merge branch '6-1-stable' of https://dev.gitlab.org/gitlab/gitlabhq into 6-1-stable-ee ...

Conflicts:
	VERSION
	app/controllers/application_controller.rb
	app/controllers/omniauth_callbacks_controller.rb
	app/models/merge_request.rb
	app/models/user.rb
	app/views/groups/_projects.html.haml
	config/routes.rb
	db/schema.rb
	doc/install/installation.md

2013-09-27 15:24:54 +03:00

..

api

Fix API::MergeRequest

2013-09-22 18:46:42 +09:00

assets

move assets from lib directory to vendor

2012-05-29 17:56:48 +05:00

backup

move backup logic to lib. Fixed removing outdated backups

2013-08-05 12:26:33 +03:00

gitlab

Merge branch '6-1-stable' of https://dev.gitlab.org/gitlab/gitlabhq into 6-1-stable-ee

2013-09-27 15:24:54 +03:00

redcarpet/render

Fix Pygments 500 error if lexer not found by name. Use first alias instead. fixes #4473, #4451

2013-07-07 19:00:07 +02:00

support

-i flag allows sudo to work for git users using rvm that is not being used by

2013-09-06 18:53:10 -04:00

tasks

Update check script

2013-09-24 15:32:56 +09:00

event_filter.rb

Constants in Events looks good now

2013-02-13 15:48:16 +04:00

extracts_path.rb

A little improvement

2013-08-21 19:20:29 +09:00

file_size_validator.rb

Fully embrace Ruby 1.9 hash syntax

2012-08-10 18:25:15 -04:00

static_model.rb

Fixed styles, ProjectHook specs etc

2013-01-05 00:35:38 +02:00