Dmitriy Zaporozhets 67d6a79ee9 Merge branch 'ce-ee-master' into ee-master ...

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

Conflicts:
	VERSION
	config/initializers/1_settings.rb
	config/initializers/7_omniauth.rb

2014-10-22 14:47:04 +03:00

..

api

Merge branch 'ce-ee-master' into ee-master

2014-10-22 14:47:04 +03:00

assets

move assets from lib directory to vendor

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

backup

Ask the wiki repo, not Gollum, if it's empty

2014-10-20 16:37:20 +03:00

gitlab

Merge branch '7-4-stable-ee' into 'master'

2014-10-22 11:43:09 +00:00

redcarpet/render

Add a comment why this is done.

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

support

simplify DHE parameter generation

2014-10-16 14:34:03 -07:00

tasks

Make gitlab ldap check work for old and new syntax

2014-10-22 13:15:28 +03: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