Dmitriy Zaporozhets fae2e540b6 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into upstream-ce-6-8 ...

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

Conflicts:
	CHANGELOG
	Gemfile.lock
	README.md
	VERSION
	app/assets/javascripts/application.js
	db/schema.rb
	doc/install/installation.md
	doc/update/4.2-to-5.0.md
	doc/update/5.0-to-5.1.md
	doc/update/5.1-to-5.2.md
	doc/update/5.2-to-5.3.md
	doc/update/5.4-to-6.0.md
	doc/update/6.0-to-6.1.md
	doc/update/6.0-to-6.7.md
	lib/gitlab/git_access.rb

2014-04-10 13:34:56 +03:00

..

backend

Fix gitlab-ci integration

2014-03-21 23:05:28 +02:00

ldap

Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into upstream-ce-6-8

2014-04-10 13:34:56 +03:00

oauth

Avoid false validation when create user

2014-04-07 16:47:37 +03:00

satellite

Dont raise an error with satellites, make sure it exists.

2014-04-09 17:13:44 +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 deprecated finders

2014-01-19 23:39:56 +04:00

blacklist.rb

Add files to path blacklist.

2014-01-24 20:06:44 -06:00

diff_parser.rb

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

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

git_access.rb

Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into upstream-ce-6-8

2014-04-10 13:34:56 +03:00

git_logger.rb

Application logger

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

identifier.rb

Remove deprecated finders

2014-01-19 23:39:56 +04: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

Replace backticks with Gitlab::Popen

2014-03-03 08:40:29 +01:00

markdown.rb

Add to changelog.

2014-03-25 18:53:09 +01:00

popen.rb

Make it possible to call Gitlab::Popen.popen

2014-02-25 11:58:58 +01:00

reference_extractor.rb

Link issues from comments and automatically close them

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

regex.rb

Allow underscore as the first char for project names.

2014-03-06 14:08:40 +01:00

seeder.rb

Improve developer seeds

2014-03-15 11:39:35 +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-7-stable' of dev.gitlab.org:gitlab/gitlabhq into 6-7-2-ce

2014-03-25 10:12:59 +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