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

..

concerns

fix most of warnings

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

assembla_service_spec.rb

Add Gemnasium Service for Gitlab

2014-02-21 16:25:22 +01:00

broadcast_message_spec.rb

Customization and previewing of broadcast messages

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

commit_spec.rb

Make changes to tests

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

deploy_key_spec.rb

Reannotate

2013-08-21 12:34:02 +03:00

deploy_keys_project_spec.rb

Annotated

2013-06-19 15:40:33 +03:00

event_spec.rb

fix most of warnings

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

flowdock_service_spec.rb

Add Gemnasium Service for Gitlab

2014-02-21 16:25:22 +01:00

forked_project_link_spec.rb

Replace context with service in specs

2014-01-16 20:29:18 +02:00

gemnasium_service_spec.rb

Add Gemnasium Service for Gitlab

2014-02-21 16:25:22 +01:00

gitlab_ci_service_spec.rb

Add Gemnasium Service for Gitlab

2014-02-21 16:25:22 +01:00

gollum_wiki_spec.rb

Remove duplicate code

2014-03-03 08:40:29 +01:00

group_spec.rb

added group avatars

2014-01-28 08:38:00 +01:00

issue_spec.rb

Link issues from comments and automatically close them

2013-08-25 18:58:41 -04:00

key_spec.rb

Reannotate

2013-08-21 12:34:02 +03:00

merge_request_spec.rb

Fix mr specs

2014-01-23 13:24:25 +02:00

milestone_spec.rb

Reannotate

2013-08-21 12:34:02 +03:00

namespace_spec.rb

Annotate!

2013-10-01 15:15:28 +03:00

note_spec.rb

Fix bug with cross-reference note on commit

2014-02-07 12:34:30 +02:00

project_group_link_spec.rb

Add group_access validation to ProjectGroupLink

2013-10-03 10:04:07 +03:00

project_hook_spec.rb

Added tag_push_events to the web_hooks

2014-03-05 20:44:01 +01:00

project_security_spec.rb

Project has now correct owner and creator. Increased test coverage

2013-01-02 19:00:00 +02:00

project_snippet_spec.rb

Reannotate

2013-08-21 12:34:02 +03:00

project_spec.rb

Fix broken test in spec/models/project_spec.rb

2014-01-24 21:14:05 -06:00

project_team_spec.rb

remove tests for unexisting methods

2013-02-26 11:17:02 +02:00

protected_branch_spec.rb

Fixed: post-receive, project remove, tests

2013-02-05 12:47:50 +02:00

service_hook_spec.rb

Annotate web_hooks table

2013-12-04 13:37:17 +02:00

service_spec.rb

Add Gemnasium Service for Gitlab

2014-02-21 16:25:22 +01:00

snippet_spec.rb

Reannotate

2013-08-21 12:34:02 +03:00

system_hook_spec.rb

Annotate web_hooks table

2013-12-04 13:37:17 +02:00

user_spec.rb

remove unwanted spaces, reduce diff, clean before merge

2014-02-11 21:12:27 +05:30

users_group_spec.rb

Reannotate

2013-08-21 12:34:02 +03:00

users_project_spec.rb

Reannotate

2013-08-21 12:34:02 +03:00

web_hook_spec.rb

Annotate web_hooks table

2013-12-04 13:37:17 +02:00

wiki_page_spec.rb

Remove duplicate code

2014-03-03 08:40:29 +01:00