Jacob Vosmaer 5629546794 Merge remote-tracking branch 'origin/master' into ldap/cache_check ...

Conflicts:
	app/controllers/application_controller.rb
	app/controllers/omniauth_callbacks_controller.rb

2014-08-06 18:09:07 +02:00

..

admin

Fix bug: edit LDAP group settings from admin panel

2014-07-28 16:28:09 +02:00

groups

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

2014-07-10 23:43:42 +03:00

profiles

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

2014-07-10 23:43:42 +03:00

projects

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

2014-07-16 12:39:45 +03:00

public

Allow access to groups with public projects.

2014-02-20 09:26:38 -06:00

application_controller.rb

Move LDAP timeout code to Gitlab::LDAP::Access

2014-08-06 18:03:01 +02:00

dashboard_controller.rb

Show link to public projects for new users.

2014-03-17 13:02:04 +01:00

files_controller.rb

Implements drag and drop upload in creating issues

2014-05-23 16:22:42 +08:00

groups_controller.rb

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

2014-07-10 23:43:42 +03:00

help_controller.rb

Render images in help pages.

2014-07-15 11:28:46 +02:00

namespaces_controller.rb

Add users to /:id route

2014-06-07 15:06:55 +03:00

omniauth_callbacks_controller.rb

Move LDAP timeout code to Gitlab::LDAP::Access

2014-08-06 18:03:01 +02:00

passwords_controller.rb

Do not allow password reset for ldap user.

2014-03-18 12:25:49 +01:00

profiles_controller.rb

Make app works with strong params

2014-06-26 23:24:17 +03:00

projects_controller.rb

Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-7-1-0

2014-07-22 09:54:24 +03:00

registrations_controller.rb

Override strong params for sign up.

2014-07-10 19:31:05 +02:00

search_controller.rb

Fix global search

2014-03-14 14:41:28 +02:00

sessions_controller.rb

Call store_location_for once.

2014-07-22 08:34:16 +02:00

snippets_controller.rb

Project hook, milestone, snippet strong params

2014-06-26 18:51:11 +03:00

users_controller.rb

Refactor some search scopes to prevent wierd behaviour and PG::Error issues

2014-06-05 20:37:35 +03:00

users_groups_controller.rb

Use strong params for 5 more models

2014-06-26 15:00:09 +03:00