James Lopez ad68bc63b5 Merge branches 'feature/project-export' and 'feature/project-import' of gitlab.com:gitlab-org/gitlab-ce into feature/project-import ...

# Conflicts:
#	app/models/project.rb
#	db/schema.rb
#	lib/gitlab/import_export/import_export_reader.rb

2016-06-13 12:43:25 +02:00

..

banzai

Fixing specs stubbed objects cannot access database

2016-06-10 15:41:56 +02:00

ci

Rename all [ci_]commit to [ci_]pipeline in specs and features

2016-06-03 16:22:26 +02:00

container_registry

Revert "Fix merge conflicts - squashed commit"

2016-06-03 11:10:17 +02:00

gitlab

Merge branches 'feature/project-export' and 'feature/project-import' of gitlab.com:gitlab-org/gitlab-ce into feature/project-import

2016-06-13 12:43:25 +02:00

json_web_token

Revert "Fix merge conflicts - squashed commit"

2016-06-03 11:10:17 +02:00

disable_email_interceptor_spec.rb

Fix failing EmailOnPush spec.

2016-06-10 14:11:02 +05:30

extracts_path_spec.rb

Added & use Gitlab::Routing for URL helpers

2016-04-01 11:13:48 +02:00

file_size_validator_spec.rb

Tag lib specs

2015-12-09 11:55:42 +01:00

git_ref_validator_spec.rb

Tag lib specs

2015-12-09 11:55:42 +01:00

gitlab_spec.rb

Add Gitlab.com? method

2016-04-12 17:30:11 -04:00

repository_cache_spec.rb

Tag lib specs

2015-12-09 11:55:42 +01:00