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

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

Conflicts:
	app/controllers/admin/application_settings_controller.rb
	app/controllers/groups/group_members_controller.rb
	app/controllers/projects/deploy_keys_controller.rb
	app/controllers/projects/project_members_controller.rb
	app/models/concerns/mentionable.rb
	app/models/project.rb
	app/models/project_team.rb
	app/models/service.rb
	app/views/admin/application_settings/_form.html.haml
	app/views/admin/groups/show.html.haml
	app/views/groups/group_members/_new_group_member.html.haml
	config/initializers/1_settings.rb
	db/schema.rb
	lib/gitlab/reference_extractor.rb
	spec/lib/gitlab/reference_extractor_spec.rb

2015-04-15 19:22:57 +03:00

..

concerns

Merge remote-tracking branch 'ce/master' into merge_ce

2015-02-16 11:50:30 -08:00

hooks

Group level web hooks: tests

2015-03-12 20:46:10 +02:00

members

Use group_member instead of users_group or membership.

2015-03-15 13:49:41 +01:00

project_services

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

2015-04-15 19:22:57 +03:00

appearance_spec.rb

Use last appearance settings. Show last edit date

2014-04-14 22:14:51 +03:00

application_setting_spec.rb

Move restricted visibility settings to the UI

2015-03-07 13:11:08 -07:00

broadcast_message_spec.rb

Updated rspec to rspec 3.x syntax

2015-02-12 19:17:35 +01:00

commit_spec.rb

Don't use HTML ellipsis in EmailsOnPush subject truncated commit message.

2015-04-14 16:32:11 +02:00

deploy_key_spec.rb

Updated rspec to rspec 3.x syntax

2015-02-12 19:17:35 +01:00

deploy_keys_project_spec.rb

Allow admin to create public deploy keys that are accessible to any project.

2015-04-03 12:23:20 +02:00

event_spec.rb

Updated rspec to rspec 3.x syntax

2015-02-12 19:17:35 +01:00

external_wiki_service_spec.rb

Add a service to support external wikis

2015-03-12 19:13:51 +01:00

forked_project_link_spec.rb

Updated rspec to rspec 3.x syntax

2015-02-12 19:17:35 +01:00

git_hook_spec.rb

Remove mass-assigment tests

2014-07-11 16:07:20 +03:00

group_spec.rb

Updated rspec to rspec 3.x syntax

2015-02-12 19:17:35 +01:00

issue_spec.rb

Updated rspec to rspec 3.x syntax

2015-02-12 19:17:35 +01:00

jira_issue_spec.rb

Update spec per rspec 2.99 requirements.

2015-02-16 13:11:39 -08:00

key_spec.rb

Remove the invalid key factories

2015-04-11 17:12:10 -04:00

label_link_spec.rb

Updated rspec to rspec 3.x syntax

2015-02-12 19:17:35 +01:00

label_spec.rb

Updated rspec to rspec 3.x syntax

2015-02-12 19:17:35 +01:00

ldap_group_link_spec.rb

Adapt frontend to LdapGroupLink with provider

2014-10-10 21:50:54 +02:00

member_spec.rb

Follow newline guidelines.

2015-04-14 15:16:00 +02:00

merge_request_spec.rb

Merge remote-tracking branch 'ce/master' into merge_ce

2015-02-16 11:50:30 -08:00

milestone_spec.rb

Updated rspec to rspec 3.x syntax

2015-02-12 19:17:35 +01:00

namespace_spec.rb

Move files for moved namespaces.

2015-03-31 09:30:34 +02:00

note_spec.rb

Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq

2015-03-19 23:21:50 -07:00

project_group_link_spec.rb

Remove mass-assigment tests

2014-07-11 16:07:20 +03:00

project_security_spec.rb

Updated rspec to rspec 3.x syntax

2015-02-12 19:17:35 +01:00

project_snippet_spec.rb

Updated rspec to rspec 3.x syntax

2015-02-12 19:17:35 +01:00

project_spec.rb

Expose avatar_url in projects API

2015-03-01 10:13:01 +09:00

project_team_spec.rb

Merge remote-tracking branch 'ce/master' into merge_ce

2015-02-16 11:50:30 -08:00

project_wiki_spec.rb

Updated rspec to rspec 3.x syntax

2015-02-12 19:17:35 +01:00

protected_branch_spec.rb

Updated rspec to rspec 3.x syntax

2015-02-12 19:17:35 +01:00

repository_spec.rb

Refactor repository specs

2015-03-22 11:01:45 -07:00

service_spec.rb

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

2015-03-11 18:41:41 -07:00

snippet_spec.rb

Updated rspec to rspec 3.x syntax

2015-02-12 19:17:35 +01:00

user_spec.rb

Merge branch 'ce-to-ee-2' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee

2015-04-14 15:08:19 +03:00

wiki_page_spec.rb

Fix dots in Wiki slug causing errors

2015-03-21 18:33:51 -07:00