Dmitriy Zaporozhets 2df9a76042 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into 6_5_ce ...

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	CHANGELOG
	VERSION
	app/assets/stylesheets/generic/common.scss
	app/views/projects/edit.html.haml
	config.ru
	db/schema.rb
	doc/install/installation.md
	doc/update/6.0-to-6.1.md
	doc/update/6.1-to-6.2.md
	lib/gitlab/upgrader.rb

2014-01-21 18:15:49 +02:00

..

backend

Merge pull request #5760 from dermoth/master

2014-01-07 02:47:56 -08:00

ldap

Merge branch '6-4-stable' of dev.gitlab.org:gitlab/gitlabhq into 6-4-from-ce

2013-12-23 12:57:22 +02:00

oauth

Skip email confirmation with LDAP

2013-12-09 11:06:12 +01:00

satellite

Add support of base64 encoded content

2014-01-16 18:02:09 +02: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 . files to be created

2014-01-14 18:26:01 +01:00

seeder.rb

Improved seeds for development env

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

theme.rb

Respect default theme settings. Fixed sign-in button on publica page

2014-01-10 13:58:52 +02:00

upgrader.rb

Merge branch '6-4-stable' of dev.gitlab.org:gitlab/gitlabhq into 6-4-from-ce

2013-12-23 18:18:26 +02:00

version_info.rb

Fix abort gitlab:app:check

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

visibility_level.rb

Adding authenticated public mode (internal).

2013-11-26 22:22:07 -06:00