Jan-Willem van der Meer 6c0994a3b3 Merge remote-tracking branch 'origin/master' into feature-multiple-ldap-servers ...

Conflicts:
	app/controllers/omniauth_callbacks_controller.rb

2014-10-13 17:07:53 +02:00

..

admin

Admin: user sorting

2014-10-13 16:07:57 +03:00

explore

Most starred projects page for Explore area

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

groups

Fix STI+polymorphic for Group <-> GroupMember

2014-09-14 21:52:54 +03:00

profiles

Fix adminarea and emails for new membership logic

2014-09-15 10:57:02 +03:00

projects

Snippets: public/internal/private

2014-10-09 17:09:53 +03:00

application_controller.rb

Protect from forgery with exception

2014-10-06 16:18:25 +03:00

confirmations_controller.rb

Try signing in the user after user confirmation is correct and redirect to dashboard, otherwise redirect to signin page

2014-10-02 14:38:26 +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

Huge replace of old users_project and users_group references

2014-09-14 19:32:51 +03:00

help_controller.rb

Remove garbage and apply wiki style

2014-06-14 15:51:07 +03:00

namespaces_controller.rb

Add users to /:id route

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

omniauth_callbacks_controller.rb

Add refactoring for multiple LDAP server support

2014-10-13 13:39:54 +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

Incorporating Dmitriy's referrer-based routing suggestion

2014-09-05 22:35:46 +00:00

registrations_controller.rb

Add parenthesis to function def with arguments.

2014-10-03 09:18:46 +02:00

search_controller.rb

Merge pull request #7695 from coverer/search_wiki

2014-09-09 16:50:43 +03:00

sessions_controller.rb

Add refactoring for multiple LDAP server support

2014-10-13 13:39:54 +02:00

snippets_controller.rb

Snippets: public/internal/private

2014-10-09 17:09:53 +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