Dmitriy Zaporozhets c84b14d2a1 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee ...

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

Conflicts:
	app/controllers/autocomplete_controller.rb
	app/controllers/omniauth_callbacks_controller.rb
	app/controllers/projects/services_controller.rb
	app/helpers/projects_helper.rb
	app/services/audit_event_service.rb
	db/schema.rb
	doc/api/users.md
	doc/update/6.x-or-7.x-to-7.13.md
	features/project/project.feature

2015-07-14 15:40:46 +02:00

..

admin

Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee

2015-07-14 15:40:46 +02:00

concerns

Enable 2FA for LDAP logins

2015-05-14 14:45:31 -04:00

dashboard

Add helpers for header title and sidebar, and move setting those from controllers to layouts.

2015-05-01 10:39:16 +02:00

explore

Add helpers for header title and sidebar, and move setting those from controllers to layouts.

2015-05-01 10:39:16 +02:00

groups

Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee

2015-06-05 11:40:36 +02:00

import

Show incompatible projects in Google Code import status

2015-04-30 06:56:49 -07:00

oauth

Correctly show anonymous authorized applications under Profile > Applications.

2015-07-02 11:53:31 +02:00

profiles

Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee

2015-07-14 15:40:46 +02:00

projects

Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee

2015-07-14 15:40:46 +02:00

application_controller.rb

Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee

2015-07-14 15:40:46 +02:00

audit_events_controller.rb

Rename before_filter to before_action

2015-04-24 12:53:33 +03:00

autocomplete_controller.rb

Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee

2015-07-14 15:40:46 +02:00

confirmations_controller.rb

Add invites controller.

2015-04-14 12:07:33 +02:00

dashboard_controller.rb

projects doesn't seem to be a valid action in this controller

2015-05-16 23:04:45 +10:00

groups_controller.rb

Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq

2015-07-02 17:07:02 +02:00

help_controller.rb

Add helpers for header title and sidebar, and move setting those from controllers to layouts.

2015-05-01 10:39:16 +02:00

invites_controller.rb

Add a page title to every page.

2015-04-30 19:12:15 +02:00

namespaces_controller.rb

Fixed the Rails/ActionFilter cop

2015-04-20 15:39:37 +02:00

omniauth_callbacks_controller.rb

Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee

2015-07-14 15:40:46 +02:00

passwords_controller.rb

Use User#two_factor_enabled instead of otp_required_for_login

2015-06-19 15:14:37 -04:00

profiles_controller.rb

Merge branch 'audit_log' into 'master'

2015-07-06 10:09:53 +00:00

projects_controller.rb

Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee

2015-07-14 15:40:46 +02:00

registrations_controller.rb

Fix error when deleting a user who has projects

2015-06-23 04:39:49 -07:00

root_controller.rb

Refactor RootController

2015-06-13 17:59:13 -04:00

search_controller.rb

Add helpers for header title and sidebar, and move setting those from controllers to layouts.

2015-05-01 10:39:16 +02:00

sessions_controller.rb

Audit log for user authentication

2015-07-06 12:36:08 +03:00

snippets_controller.rb

Update controller filters

2015-06-26 16:44:21 +02:00

unsubscribes_controller.rb

Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ce-to-ee

2015-05-05 10:18:27 +02:00

uploads_controller.rb

Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee

2015-05-13 14:10:14 +03:00

users_controller.rb

Fix title on user page.

2015-05-01 11:33:54 +02:00