Valery Sizov 45ec0d255d Merge remote-tracking branch 'ee/master' into ce_non_conflict ...

Conflicts:
	app/helpers/oauth_helper.rb
	app/helpers/projects_helper.rb

2015-02-05 22:01:05 -08:00

..

api

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

2015-02-04 18:19:22 -08: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 remote-tracking branch 'ee/master' into ce_non_conflict

2015-02-05 22:01:05 -08:00

redcarpet/render

Replace highlight.js with rouge-fork rugments

2015-01-15 13:41:11 +01:00

support

Socket [::]:123 on Linux listens on IPv4 and IPv6

2014-11-26 00:31:50 +01:00

tasks

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

2015-02-04 18:19:22 -08: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

Explicitly set before_filter for ref-related controllers

2015-01-26 15:01:51 -08: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

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