Dmitriy Zaporozhets 3a9682a3d7 Merge dev.gitlab.org:gitlab/gitlabhq into upstream-ce ...

Conflicts:
	VERSION
	app/helpers/selects_helper.rb
	app/models/project.rb
	app/views/devise/sessions/new.html.haml
	app/views/groups/_settings_nav.html.haml
	app/views/layouts/nav/_admin.html.haml
	app/views/profiles/keys/_key.html.haml
	app/views/profiles/keys/index.html.haml
	app/views/profiles/keys/show.html.haml
	app/views/projects/merge_requests/show/_mr_accept.html.haml
	config/routes.rb
	db/schema.rb
	doc/api/projects.md
	features/steps/shared/paths.rb

2015-01-08 20:37:35 -08:00

..

admin

Merge dev.gitlab.org:gitlab/gitlabhq into upstream-ce

2015-01-08 20:37:35 -08: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

oauth

Fix tests and add message if no oauth apps

2014-12-25 18:46:19 +02:00

profiles

Rework oauth2 feature

2014-12-25 18:35:04 +02:00

projects

Merge dev.gitlab.org:gitlab/gitlabhq into upstream-ce

2015-01-08 20:37:35 -08:00

application_controller.rb

Merge dev.gitlab.org:gitlab/gitlabhq into upstream-ce

2015-01-08 20:37:35 -08: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

Refactor issuable list pages

2014-12-24 11:04:33 +02:00

files_controller.rb

Implements drag and drop upload in creating issues

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

groups_controller.rb

Merge branch 'master' into ee-from-ce

2014-12-26 15:05:43 +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

Kerberos support

2014-12-15 18:06:17 +02:00

passwords_controller.rb

Do not allow password reset for ldap user.

2014-03-18 12:25:49 +01:00

profiles_controller.rb

Rework oauth2 feature

2014-12-25 18:35:04 +02:00

projects_controller.rb

Merge branch 'master' into ee-from-ce

2014-12-26 15:05:43 +02:00

registrations_controller.rb

Fix feature and tests

2015-01-08 13:21:00 -08:00

search_controller.rb

Merge pull request #7695 from coverer/search_wiki

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

sessions_controller.rb

Improve application settings and write tests

2015-01-08 09:53:35 -08:00

snippets_controller.rb

Sanitize snippet file name in raw headers

2014-12-12 13:28:48 +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