Vinnie Okada 742e6eeed2 Merge branch 'upstream-master' into markdown-preview ...

Conflicts:
	spec/routing/project_routing_spec.rb

2014-12-07 20:25:58 -07:00

..

admin

Merge pull request #8005 from cirosantilli/settings-to-gitlab-config

2014-10-27 19:18:48 +02:00

explore

Factor abilities methods

2014-10-19 11:12:39 +02:00

groups

Add tests for remove group member feature in admin area

2014-10-20 13:18:07 +03:00

profiles

Fix adminarea and emails for new membership logic

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

projects

Merge branch 'upstream-master' into markdown-preview

2014-12-07 20:25:58 -07:00

application_controller.rb

Merge pull request #8091 from cirosantilli/factor-ability-abilities

2014-10-28 12:09:55 +02: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

Supporting for multiple omniauth provider for the same user

2014-12-04 13:03:55 +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 'upstream-master' into markdown-preview

2014-12-07 20:25:58 -07: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

Use Hash syntax for LDAP server declaration

2014-10-14 13:13:59 +02:00

snippets_controller.rb

Fix raw view for public snippets

2014-10-27 11:51:31 +02:00

users_controller.rb

Feature: atom feed for user activity

2014-12-04 21:49:19 +02:00