Dmitriy Zaporozhets a5972170ad Merge remote-tracking branch 'origin/master' into ee-7-4 ...

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

Conflicts:
	app/controllers/projects/team_members_controller.rb
	app/finders/projects_finder.rb
	app/models/group.rb
	app/models/project_team.rb
	app/models/users_group.rb
	config/gitlab.yml.example
	config/initializers/1_settings.rb
	config/routes.rb
	db/schema.rb
	doc/integration/ldap.md
	features/steps/group.rb
	features/steps/project/project.rb

2014-10-02 13:24:59 +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

gitlab_markdown_helper_spec.rb

Merge remote-tracking branch 'origin/master' into ee-7-4

2014-10-02 13:24:59 +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

Fixed some broken specs

2014-06-08 23:27:57 +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