Valery Sizov 3fcd75a911 Merge CE master into EE master ...

Conflicts:
	Gemfile
	VERSION
	app/assets/javascripts/project.js.coffee
	app/assets/javascripts/users_select.js.coffee
	app/controllers/projects/services_controller.rb
	app/models/project.rb
	app/views/groups/edit.html.haml
	features/project/service.feature
	features/steps/project/services.rb
	spec/models/concerns/mentionable_spec.rb

2014-11-13 17:05:12 +02: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

ldap

Merge branch 'ee_master' into 7-4-stable-ee

2014-10-27 13:17:14 +02:00

oauth

Fix account existing blocking

2014-10-17 14:08:02 +03:00

satellite

Add parenthesis to function def with arguments.

2014-10-03 09:18:46 +02:00

auth_spec.rb

Session API: Use case-insensitive authentication like in UI

2014-10-30 18:29:18 +02:00

git_access_spec.rb

Merge CE master into EE master

2014-11-13 17:05:12 +02:00

git_access_wiki_spec.rb

Developers can push to wiki repo. Protected branches does not affect wiki repo any more

2014-10-07 16:05:24 +03: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