Dmitriy Zaporozhets fd1f54b8ab Merge branch 'master' into ee-from-ce ...

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

Conflicts:
	Gemfile
	app/controllers/application_controller.rb
	app/views/admin/groups/_form.html.haml
	app/views/groups/edit.html.haml
	app/views/groups/show.html.haml
	app/views/layouts/nav/_admin.html.haml
	app/views/projects/_settings_nav.html.haml
	db/schema.rb
	doc/install/installation.md
	doc/update/6.x-or-7.x-to-7.6.md

2014-12-26 15:05:43 +02:00

..

api

Merge branch 'master' into ee-from-ce

2014-12-26 15:05:43 +02:00

assets

move assets from lib directory to vendor

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

backup

Properly fix wiki restore.

2014-11-30 18:24:05 +02:00

gitlab

Merge branch 'master' into ee-from-ce

2014-12-26 15:05:43 +02:00

redcarpet/render

Add a comment why this is done.

2014-10-10 08:32:05 +02:00

support

Merge pull request #8273 from bbodenmiller/nginx-updates

2014-11-10 10:20:44 +01:00

tasks

Merge branch 'master' into ee-from-ce

2014-12-26 15:05:43 +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

Test for the apostrophe in the email

2014-06-11 13:36:30 +02:00

event_filter.rb

Add parenthesis to function def with arguments.

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

extracts_path.rb

Improve code according to new gitlab_git

2014-02-04 14:46:15 +02:00

file_size_validator.rb

Fully embrace Ruby 1.9 hash syntax

2012-08-10 18:25:15 -04:00

gt_one_coercion.rb

diff unfold

2014-08-14 15:48:14 +04: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