Dmitriy Zaporozhets b165b097f5 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-7-to-ee ...

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

Conflicts:
	LICENSE
	VERSION
	app/controllers/omniauth_callbacks_controller.rb
	app/helpers/application_helper.rb
	app/helpers/merge_requests_helper.rb
	app/models/group.rb
	app/models/project.rb
	app/models/project_team.rb
	app/views/admin/groups/edit.html.haml
	app/views/groups/_projects.html.haml
	app/views/groups/edit.html.haml
	db/schema.rb
	doc/install/installation.md
	doc/integration/README.md
	lib/gitlab/git_access.rb
	lib/gitlab/markdown.rb
	spec/helpers/merge_requests_helper.rb
	spec/models/merge_request_spec.rb

2014-06-17 10:53:44 +03:00

..

application_helper_spec.rb

Change gravatar tests to identicon

2014-06-17 09:40:48 +03:00

broadcast_messages_helper_spec.rb

Customization and previewing of broadcast messages

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

gitlab_markdown_helper_spec.rb

links to issues on main dashboard

2014-05-26 13:24:21 +00: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

Determine label color based on lowercase name

2014-04-11 19:06:27 +02: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

tree_helper_spec.rb

fix broken spec

2012-09-20 22:11:15 +06:00