Dmitriy Zaporozhets e502d785f9 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into code-from-ce-6-7 ...

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

Conflicts:
	CHANGELOG
	VERSION
	app/controllers/application_controller.rb
	app/models/user.rb
	app/views/groups/members.html.haml
	app/views/groups/show.html.haml
	config/gitlab.yml.example
	db/schema.rb
	features/steps/project/project_browse_branches.rb
	lib/api/projects.rb
	lib/gitlab/ldap/access.rb
	lib/gitlab/ldap/adapter.rb
	lib/gitlab/ldap/person.rb
	lib/gitlab/upgrader.rb

2014-03-18 11:15:01 +02:00

..

backend

Use batch_add_keys in rake gitlab:shell:setup

2014-03-14 15:49:11 +01:00

ldap

Pass LDAP adapter to finders in update_permissions

2014-03-14 11:21:50 +01:00

oauth

Skip email confirmation with LDAP

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

satellite

Adapt use of Gitlab::Popen to new style

2014-02-25 12:00:33 +01: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_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

JIRA project identifiers may also contain dashes '-'

2014-03-14 18:08:05 +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 'master' of dev.gitlab.org:gitlab/gitlabhq into code-from-ce-6-7

2014-03-18 11:15:01 +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