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

..

api

Fix Error 500 when using closes_issues API with an external issue tracker

2016-06-11 19:50:08 -07:00

assets

move assets from lib directory to vendor

2012-05-29 17:56:48 +05:00

backup

Only create the backup directory if it is local

2016-06-10 10:17:54 -07:00

banzai

Merge branch '18019-fix-wiki-linking' into 'master'

2016-06-09 08:37:27 +00:00

ci

Fix expose of TriggerRequest

2016-06-10 13:58:33 +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

omni_auth

Fix signin with OmniAuth providers

2015-12-08 14:58:15 +01:00

rouge/formatters

Remove custom Lexer. #3945 [ci skip]

2016-01-08 15:20:48 -05:00

support

Revert "Fix merge conflicts - squashed commit"

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

tasks

Properly quote table name in Rake task for MySQL and PostgreSQL compatibility

2016-06-09 15:06:19 -07:00

banzai.rb

Add a PreProcessPipeline

2016-03-02 22:19:36 -05:00

disable_email_interceptor.rb

Add email interceptor to prevent mail sending if email sending is disabled.

2014-10-27 13:05:50 +01:00

event_filter.rb

Revert "Fix merge conflicts - squashed commit"

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

extracts_path.rb

Only render 404 page from /public

2015-10-13 20:12:34 +03:00

file_size_validator.rb

Get rid of more requires, which causes warnings when code is reloaded

2016-04-19 11:48:10 +02:00

file_streamer.rb

Implement Build Artifacts

2015-11-10 12:51:50 +01:00

gitlab.rb

Revert "Fix merge conflicts - squashed commit"

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

gt_one_coercion.rb

diff unfold

2014-08-14 15:48:14 +04:00

repository_cache.rb

Store commit count in project table

2015-07-17 15:22:56 +02:00

static_model.rb

Fixed styles, ProjectHook specs etc

2013-01-05 00:35:38 +02:00

unfold_form.rb

Gitlab Issue 707: Indent unfolded code 1 character

2015-07-22 09:58:17 -04:00

uploaded_file.rb

Implement Build Artifacts

2015-11-10 12:51:50 +01:00

version_check.rb

Update version check images to use SVG

2016-01-05 14:35:29 -05:00