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

..

application_helper_spec.rb

Force of markup output to be the input encoding

2014-08-11 12:18:07 +02:00

broadcast_messages_helper_spec.rb

Customization and previewing of broadcast messages

2013-12-18 17:43:45 -05:00

diff_helper_spec.rb

Fix diff_helper spec.

2014-09-12 21:02:50 +02:00

events_helper_spec.rb

Improve dashboard note view and add tests

2014-10-12 23:56:56 -05:00

gitlab_markdown_helper_spec.rb

Merge branch 'master' into ce-upstream

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

issues_helper_spec.rb

Fallback to internal issue tracker if config is invalid.

2013-10-17 10:42:39 +02:00

labels_helper_spec.rb

Fix old api compatibility and tests

2014-07-30 17:17:29 +03:00

merge_request_helper_spec.rb

removes api credentials from link to build_page

2014-06-11 12:41:14 +02:00

merge_requests_helper.rb

Add a test for issue sentence generation

2014-06-13 18:10:28 +02:00

notifications_helper_spec.rb

Upgrade to Font Awesome v4.2

2014-10-03 12:19:24 +02:00

projects_helper_spec.rb

Remove some deprecations and fir project helper specs

2013-12-10 12:11:29 +02:00

search_helper_spec.rb

Make changes to tests

2014-01-22 21:03:52 +02:00

submodule_helper_spec.rb

Fix failing submodule test.

2014-06-03 11:37:23 +02:00

tab_helper_spec.rb

fix most of warnings

2013-12-15 00:05:10 +04:00