Jacob Vosmaer 90ce0be420 Merge branch 'master' of dev.gitlab.org:gitlab/gitlab-ee into feature-120-multiple-ldap-groups ...

Conflicts:
	app/models/group.rb
	app/views/groups/members.html.haml
	db/schema.rb

2014-08-29 14:43:20 +02:00

..

admin

Merge branch 'master' of dev.gitlab.org:gitlab/gitlab-ee into feature-120-multiple-ldap-groups

2014-08-29 14:43:20 +02:00

explore

Most starred projects page for Explore area

2014-07-25 22:05:23 +03:00

groups

Refactor group/edit LDAP sync page

2014-08-14 17:52:28 +02:00

profiles

Merge commit '27cf081e1b0b1df166' into merge_ce_27cf081e1b0b1df166

2014-08-15 10:25:23 +02:00

projects

Mockup of shared group memeber list at project member page.

2014-08-26 11:58:05 +02:00

application_controller.rb

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

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

dashboard_controller.rb

Replace project labels with tags to prevent name conflict with GitLab labels

2014-07-29 18:23:18 +03:00

files_controller.rb

Implements drag and drop upload in creating issues

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

groups_controller.rb

Remove traces from ldab_cn and ldap_access

2014-08-15 12:33:05 +02: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 commit '27cf081e1b0b1df166' into merge_ce_27cf081e1b0b1df166

2014-08-15 10:25:23 +02: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

Only redirect to referrer from public GitLab pages

2014-07-28 16:41:37 +02:00

snippets_controller.rb

Project hook, milestone, snippet strong params

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

unsubscribes_controller.rb

Send email notifying user he has been unsubscribed.

2014-08-26 17:15:43 +02: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