Dmitriy Zaporozhets f4d43ed3b1 Merge branch 'master' into ce-upstream ...

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

Conflicts:
	app/controllers/projects/services_controller.rb
	app/models/concerns/mentionable.rb
	app/models/project.rb
	app/models/user.rb
	app/views/admin/users/index.html.haml
	app/views/projects/services/_form.html.haml
	config/gitlab.yml.example
	config/initializers/1_settings.rb
	lib/gitlab/git_access.rb
	lib/gitlab/ldap/access.rb
	lib/gitlab/ldap/person.rb
	lib/gitlab/reference_extractor.rb
	spec/lib/gitlab/ldap/access_spec.rb

2014-10-14 18:23:51 +03:00

..

branded_login_page

Move the branded login page documentation to customization directory.

2014-06-18 11:51:44 +02:00

branded_login_page.md

Move the branded login page documentation to customization directory.

2014-06-18 11:51:44 +02:00

issue_closing.md

Add docs for the issue closing pattern.

2014-10-02 10:53:33 +02:00

libravatar.md

Add libravatar documentation.

2014-10-14 11:23:33 +02:00

welcome_message.md

Add docs for the issue closing pattern.

2014-10-02 10:53:33 +02:00