Dmitriy Zaporozhets 3a9682a3d7 Merge dev.gitlab.org:gitlab/gitlabhq into upstream-ce ...

Conflicts:
	VERSION
	app/helpers/selects_helper.rb
	app/models/project.rb
	app/views/devise/sessions/new.html.haml
	app/views/groups/_settings_nav.html.haml
	app/views/layouts/nav/_admin.html.haml
	app/views/profiles/keys/_key.html.haml
	app/views/profiles/keys/index.html.haml
	app/views/profiles/keys/show.html.haml
	app/views/projects/merge_requests/show/_mr_accept.html.haml
	config/routes.rb
	db/schema.rb
	doc/api/projects.md
	features/steps/shared/paths.rb

2015-01-08 20:37:35 -08:00

..

backend

updated fork feature to use gitlab-shell for v5 of gitlab

2013-04-15 01:54:52 -04:00

diff

Refactoring inside refactoring. We need to go deeper

2014-09-08 21:54:52 +03:00

kerberos

Kerberos: username as identifier

2014-12-15 18:07:03 +02:00

ldap

fix specs after merge CE -> EE

2014-12-08 13:11:33 +02:00

oauth

Supporting for multiple omniauth provider for the same user

2014-12-04 13:03:55 +02:00

satellite

Add a spec for rebase option.

2014-11-28 13:23:04 +01:00

auth_spec.rb

Kerberos: specs

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

git_access_spec.rb

Merge dev.gitlab.org:gitlab/gitlabhq into upstream-ce

2015-01-08 20:37:35 -08:00

git_access_wiki_spec.rb

Git hook messages: wiki access fix

2014-11-24 16:25:58 +02:00

gitlab_markdown_helper_spec.rb

Use readme we support to render if there are multiple readmes

2014-08-11 08:50:56 +02:00

popen_spec.rb

Make the Gitlab::Popen path argument optional

2014-02-25 11:58:22 +01:00

reference_extractor_spec.rb

Fix JIRA issue parsing

2014-10-15 07:49:35 +02:00

regex_spec.rb

Dont allow ? in project path

2014-07-08 18:15:23 +03:00

upgrader_spec.rb

Fix upgrader

2013-12-23 13:49:21 +02:00

url_builder_spec.rb

Fixed the spec

2014-06-14 09:27:11 +02:00

version_info_spec.rb

Add Gitlab::VersionInfo class to fix and simplify version check.

2013-05-08 17:36:48 +09:00