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

# Conflicts:
#	app/controllers/groups/application_controller.rb
#	app/services/test_hook_service.rb
#	app/views/admin/groups/show.html.haml
#	app/views/groups/_settings_nav.html.haml
#	app/views/groups/show.html.haml
#	app/views/layouts/_head.html.haml
#	app/views/projects/_settings_nav.html.haml
#	db/schema.rb
#	features/project/project.feature
#	features/steps/project/project.rb

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

..

admin

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

2015-05-05 10:18:27 +02: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 gitlab.com:gitlab-org/gitlab-ce into ce-to-ee

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

import

Show incompatible projects in Google Code import status

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

oauth

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

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

profiles

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

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

projects

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

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

application_controller.rb

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

2015-05-05 10:18:27 +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 'temp-ce-ee' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee

2015-04-14 13:05:39 +03:00

confirmations_controller.rb

Add invites controller.

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

dashboard_controller.rb

Add a page title to every page.

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

groups_controller.rb

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

2015-05-05 10:18:27 +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 remote-tracking branch 'ce/master' into merge_ce

2015-02-16 11:50:30 -08:00

passwords_controller.rb

Use ruby 1.9 hash syntax

2015-01-23 17:41:10 -08:00

profiles_controller.rb

Add a page title to every page.

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

projects_controller.rb

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

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

registrations_controller.rb

Fixed the Rails/ActionFilter cop

2015-04-20 15:39:37 +02: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

Upon successful login, clear reset_password_token field

2015-04-08 16:06:56 -04:00

snippets_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

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-04-24 11:22:54 +03:00

users_controller.rb

Fix title on user page.

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