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

..

backend

Remove include of grack_ldap

2013-09-02 23:52:58 +03:00

ldap

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

oauth

Removed private scope

2013-09-11 14:32:24 -04:00

satellite

Merge branch 'master' into karlhungus-mr-on-fork

2013-08-08 12:22:09 +03:00

access.rb

Improve admin user show page

2013-08-27 21:39:34 +03:00

app_logger.rb

Application logger

2012-09-11 23:24:53 +03:00

auth.rb

Remove code that was accidently added in 5dae40f579

2013-09-14 10:14:55 +03:00

blacklist.rb

Add 'notes' to path blacklist, fixes #4967

2013-09-03 07:25:39 +02:00

diff_parser.rb

Move diff parsing to own class. Correctly identify note diff line

2013-08-04 20:43:49 +03:00

git_logger.rb

Application logger

2012-09-11 23:24:53 +03:00

identifier.rb

fix wrong class name

2013-04-29 09:49:25 +03:00

inline_diff.rb

Improve commit diff

2013-09-04 18:15:42 +03:00

issues_labels.rb

Include default labels in issues autocomplete etc. Show colored labels on issues show page

2013-05-07 19:26:41 +03:00

logger.rb

show production.log, show only active milestone for issue filter

2012-12-19 07:14:05 +03:00

markdown.rb

Allow markdown tables

2013-08-26 14:27:19 +03:00

popen.rb

Replace old hashes with new 1.9 ruby hashes (rebase)

2013-05-05 18:01:10 +04:00

reference_extractor.rb

Link issues from comments and automatically close them

2013-08-25 18:58:41 -04:00

regex.rb

Allow project name, path etc start with number. Fixed specs

2013-08-13 12:24:10 +03:00

seeder.rb

Improved seeds for development env

2012-11-13 22:11:56 +02:00

theme.rb

Classic (mars) theme will be default for 6.0

2013-06-20 11:46:54 +03:00

version_info.rb

Fix abort gitlab:app:check

2013-06-06 10:10:51 +09:00