Jan-Willem van der Meer 471054e1f5 Merge branch 'ce-upstream' into feature-multi-ldap-servers-merge-master ...

Conflicts:
	app/controllers/sessions_controller.rb
	app/models/user.rb
	app/views/devise/sessions/new.html.haml
	config/gitlab.yml.example
	config/initializers/1_settings.rb
	config/initializers/7_omniauth.rb
	config/initializers/devise.rb
	lib/api/ldap.rb
	lib/gitlab/ldap/authentication.rb
	lib/gitlab/ldap/config.rb
	lib/gitlab/ldap/person.rb
	lib/gitlab/ldap/user.rb

2014-10-15 08:19:13 +02:00

..

api

Fix merge conflicts

2014-10-14 23:41:07 +02:00

assets

move assets from lib directory to vendor

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

backup

Fail harder in the backup script

2014-10-01 15:43:27 +02:00

gitlab

Merge branch 'ce-upstream' into feature-multi-ldap-servers-merge-master

2014-10-15 08:19:13 +02:00

redcarpet/render

Add a comment why this is done.

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

support

Add a comment on why we are using backward compatible ciphers.

2014-10-10 09:44:08 +02:00

tasks

Update import.rake

2014-10-07 14:13:50 -04: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