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

..

api

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

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

development

Update references to gitlab dot com.

2014-03-10 17:40:40 +01:00

install

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

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

integration

Need ! to embed.

2014-01-24 12:12:36 +01:00

legal

Fix numbering by indenting.

2013-10-30 17:27:40 -07:00

markdown

Update markdown documentation, fix wiki spec.

2014-03-17 13:23:04 +01:00

permissions

Moved all the help files to markdown files:

2014-02-28 19:30:13 +01:00

public_access

Moved all the help files to markdown files:

2014-02-28 19:30:13 +01:00

raketasks

fixed typo in user management help page

2014-02-27 15:02:57 +01:00

release

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

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

security

Explain where the default password validation is

2014-01-13 11:43:22 +01:00

ssh

Moved all the help files to markdown files:

2014-02-28 19:30:13 +01:00

system_hooks

Fixed some minor typos.

2014-03-16 03:45:00 +08:00

update

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

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

web_hooks

Correct typos in web_hooks help.

2014-03-07 09:43:14 +01:00

workflow

Moved all the help files to markdown files:

2014-02-28 19:30:13 +01:00