Douwe Maan 68ac20604b Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ce-to-ee ...

# Conflicts:
#	app/controllers/groups/application_controller.rb
#	app/services/test_hook_service.rb
#	app/views/admin/groups/show.html.haml
#	app/views/groups/_settings_nav.html.haml
#	app/views/groups/show.html.haml
#	app/views/layouts/_head.html.haml
#	app/views/projects/_settings_nav.html.haml
#	db/schema.rb
#	features/project/project.feature
#	features/steps/project/project.rb

2015-05-05 10:18:27 +02:00

..

concerns

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

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

hooks

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

2015-05-05 10:18:27 +02:00

members

Re-annotate models

2015-05-03 13:38:27 -07:00

project_services

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

2015-05-05 10:18:27 +02:00

appearance_spec.rb

Use last appearance settings. Show last edit date

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

application_setting_spec.rb

Re-annotate models

2015-05-03 13:38:27 -07:00

broadcast_message_spec.rb

Updated rspec to rspec 3.x syntax

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

commit_range_spec.rb

Rename CommitRange#inclusive? to #exclude_start?

2015-04-25 14:58:49 -04:00

commit_spec.rb

No longer needed to pass project argument to commit methods.

2015-04-24 12:29:36 +02:00

deploy_key_spec.rb

Re-annotate models

2015-05-03 13:38:27 -07: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

Re-annotate models

2015-05-03 13:38:27 -07: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

Correct usage of subject in specs

2015-04-16 16:30:16 -04:00

jira_issue_spec.rb

Update spec per rspec 2.99 requirements.

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

key_spec.rb

Re-annotate models

2015-05-03 13:38:27 -07: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

Re-annotate models

2015-05-03 13:38:27 -07:00

merge_request_spec.rb

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

2015-05-05 10:18:27 +02: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

Fix Note model spec

2015-04-28 16:01:34 -04: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

Improve/add specs for Project#get_issue and #issue_exists?

2015-05-01 13:29:36 -04: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 gitlab.com:gitlab-org/gitlab-ce into ce-to-ee

2015-05-05 10:18:27 +02: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 gitlab.com:gitlab-org/gitlab-ce into ce-to-ee

2015-05-05 10:18:27 +02:00

wiki_page_spec.rb

Fix dots in Wiki slug causing errors

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