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

..

backend

Reduce Rack Attack false positives by clearing out auth failure count upon

2015-03-24 00:36:46 -07:00

bitbucket_import

Make sure user has access to namespace in import tests.

2015-04-15 16:58:43 +02:00

diff

Use project.commit convenience method.

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

github_import

Make sure user has access to namespace in import tests.

2015-04-15 16:58:43 +02:00

gitlab_import

Make sure user has access to namespace in import tests.

2015-04-15 16:58:43 +02:00

gitorious_import

Make sure user has access to namespace in import tests.

2015-04-15 16:58:43 +02:00

google_code_import

Show incompatible projects in Google Code import status

2015-04-30 06:56:49 -07:00

kerberos

Update spec per rspec 2.99 requirements.

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

ldap

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

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

markdown

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

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

o_auth

add common method to force utf8 and force oauth properties to be utf8

2015-05-03 00:43:46 +03:00

satellite

Update spec per rspec 2.99 requirements.

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

auth_spec.rb

Kerberos: specs

2014-12-15 18:06:17 +02:00

closing_issue_extractor_spec.rb

Update tests.

2015-04-03 18:03:34 +02:00

git_access_spec.rb

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

2015-03-25 09:16:09 -07:00

git_access_wiki_spec.rb

Refactor GitAccess to use instance variables.

2015-03-24 14:11:48 +01:00

gitlab_markdown_helper_spec.rb

Updated rspec to rspec 3.x syntax

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

key_fingerprint_spec.rb

Refactor key fingerprint generation.

2015-04-14 12:00:43 +02:00

note_data_builder_spec.rb

Added comment notification events to HipChat and Slack services.

2015-03-06 06:54:00 -08:00

popen_spec.rb

Updated rspec to rspec 3.x syntax

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

push_data_builder_spec.rb

Extend project web hooks with more data

2015-02-20 10:27:37 -08:00

reference_extractor_spec.rb

Add external issues to ReferenceExtractor

2015-04-27 15:28:03 -04:00

regex_spec.rb

Fix (project_)name_regex to accept non-ASCII letters and dash

2015-04-27 16:38:47 +02:00

upgrader_spec.rb

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

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

url_builder_spec.rb

Added comment notification events to HipChat and Slack services.

2015-03-06 06:54:00 -08:00

version_info_spec.rb

Updated rspec to rspec 3.x syntax

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