Dmitriy Zaporozhets 1c93d0df7a Merge branch 'master' into ce-changes ...

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	db/schema.rb

2014-12-11 18:12:45 +02:00

..

admin

Merge CE master into EE master

2014-11-13 17:05:12 +02:00

explore

Factor abilities methods

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

groups

Hide ldap group links if ldap is not enabled

2014-12-08 15:45:55 +02:00

profiles

Merge remote-tracking branch 'origin/master' into ee-7-4

2014-10-02 13:24:59 +03:00

projects

Merge branch 'master' into ce-changes

2014-12-11 18:12:45 +02:00

application_controller.rb

Hide ldap group links if ldap is not enabled

2014-12-08 15:45:55 +02:00

audit_events_controller.rb

Add audit events feature spec for project.

2014-11-20 11:54:05 +01: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

Merge remote-tracking branch 'origin/master' into ee-7-4

2014-10-02 13:24:59 +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

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 'master' into ce-changes

2014-12-11 18:12:45 +02: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-29 16:11:28 +02:00

unsubscribes_controller.rb

Send email notifying user he has been unsubscribed.

2014-08-26 17:15:43 +02:00

users_controller.rb

Feature: atom feed for user activity

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