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

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	app/controllers/autocomplete_controller.rb
	app/controllers/omniauth_callbacks_controller.rb
	app/controllers/projects/services_controller.rb
	app/helpers/projects_helper.rb
	app/services/audit_event_service.rb
	db/schema.rb
	doc/api/users.md
	doc/update/6.x-or-7.x-to-7.13.md
	features/project/project.feature

2015-07-14 15:40:46 +02:00

..

api

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

2015-07-14 15:40:46 +02:00

assets

move assets from lib directory to vendor

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

backup

Merge branch 'improve-postgres-restore-cleaning' into 'master'

2015-07-07 23:02:48 +00:00

gitlab

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

2015-07-14 15:40:46 +02:00

omni_auth

Add reset_session for the :reset_session strategy.

2015-04-24 20:10:32 +02:00

redcarpet/render

Fix typo.

2015-06-02 13:21:34 +02:00

support

Merge branch 'nginx_defaulthost_documentation' into 'master'

2015-06-22 13:22:58 +00:00

tasks

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

2015-07-14 15:40:46 +02: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

email_validator.rb

More rubocop rules enable

2015-02-02 21:31:03 -08:00

event_filter.rb

Add parenthesis to function def with arguments.

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

extracts_path.rb

Extract the longest-matching ref from a commit path when multiple matches occur

2015-07-01 07:01:59 -07:00

file_size_validator.rb

Support configurable attachment size via Application Settings

2015-04-02 00:04:08 -07:00

gitlab.rb

Add lib/gitlab.rb to autoload non-conventional paths

2015-04-09 14:19:25 -04:00

gt_one_coercion.rb

diff unfold

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

repository_cache.rb

Fix RepositoryCache backend attr_reader

2015-01-30 10:17:55 -05:00

static_model.rb

Fixed styles, ProjectHook specs etc

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

unfold_form.rb

diff unfold

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

version_check.rb

Replace host with real one

2015-05-11 18:21:45 +03:00