Jan-Willem van der Meer 6373c84d5f Merge remote-tracking branch 'origin/master' into feature-multi-ldap-servers ...

Conflicts:
	app/models/user.rb
	config/gitlab.yml.example
	spec/lib/gitlab/ldap/access_spec.rb

2014-10-09 12:26:19 +02:00

..

admin

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

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

explore

Most starred projects page for Explore area

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

groups

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

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

profiles

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

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

projects

Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ee-7-4

2014-10-03 16:18:40 +03:00

application_controller.rb

Add parenthesis to function def with arguments.

2014-10-03 09:18:46 +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

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

Move allowed call to LDAP::User

2014-10-03 17:27:14 +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 '79190fe06b' into merge-79190fe06b-7.3.0-pre

2014-09-15 11:24:51 +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

Display multiple LDAP servers on login page

2014-09-11 16:14:54 +02:00

snippets_controller.rb

Set charset encoding to UTF-8 for snippets

2014-08-16 14:58:53 +02: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