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

Conflicts:
	app/helpers/oauth_helper.rb
	app/helpers/projects_helper.rb
	app/models/service.rb
	app/views/devise/shared/_signin_box.html.haml
	config/gitlab.yml.example
	db/schema.rb
	doc/integration/github.md
	features/project/service.feature
	lib/gitlab/github_import/client.rb

2015-03-02 16:10:12 -08:00

..

concerns

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

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

hooks

Updated rspec to rspec 3.x syntax

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

members

Updated rspec to rspec 3.x syntax

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

project_services

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

2015-03-02 16:10:12 -08:00

appearance_spec.rb

Use last appearance settings. Show last edit date

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

application_setting_spec.rb

Updated rspec to rspec 3.x syntax

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

asana_service_spec.rb

Updated rspec to rspec 3.x syntax

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

broadcast_message_spec.rb

Updated rspec to rspec 3.x syntax

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

commit_spec.rb

Updated rspec to rspec 3.x syntax

2015-02-12 19:17:35 +01: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

Updated rspec to rspec 3.x syntax

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

event_spec.rb

Updated rspec to rspec 3.x syntax

2015-02-12 19:17:35 +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

Updated rspec to rspec 3.x syntax

2015-02-12 19:17:35 +01: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

members_spec.rb

Updated rspec to rspec 3.x syntax

2015-02-12 19:17:35 +01: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

Updated rspec to rspec 3.x syntax

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

note_spec.rb

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

2015-02-16 11:50:30 -08: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

Updated rspec to rspec 3.x syntax

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

service_spec.rb

Add spec for jenkins and jira service name.

2015-02-21 17:41:55 -08:00

snippet_spec.rb

Updated rspec to rspec 3.x syntax

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

user_spec.rb

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

2015-03-02 16:10:12 -08:00

wiki_page_spec.rb

Updated rspec to rspec 3.x syntax

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