Douwe Maan 2bb2ade50d Merge branch 'master' into license ...

# Conflicts:
#	db/schema.rb

2015-05-05 13:03:33 +02:00

..

appearances_controller.rb

Rename before_filter to before_action

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

application_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

application_settings_controller.rb

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

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

applications_controller.rb

Small improvements to CI

2015-01-17 16:17:34 -08:00

background_jobs_controller.rb

Use Gitlab.config instead of Settings everywhere

2014-10-15 23:01:31 +02:00

broadcast_messages_controller.rb

Fixed the Rails/ActionFilter cop

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

dashboard_controller.rb

Explicitly define ordering in models using default_scope

2015-02-05 14:20:55 -08:00

deploy_keys_controller.rb

Fixed the Rails/ActionFilter cop

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

emails_controller.rb

Fix typo

2014-08-12 17:25:04 +02:00

git_hooks_controller.rb

Rename before_filter to before_action

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

groups_controller.rb

Fixed the Rails/ActionFilter cop

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

hooks_controller.rb

Revert "Added X-GitLab-Event header for web hooks"

2015-04-27 16:29:31 +03:00

keys_controller.rb

Fixed the Rails/ActionFilter cop

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

licenses_controller.rb

Tweak flash messages around license upload/removal.

2015-05-05 12:19:47 +02:00

logs_controller.rb

Added the correct hierarchy of controllers for the administrative part

2013-01-24 22:31:24 +02:00

projects_controller.rb

Fixed the Rails/ActionFilter cop

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

services_controller.rb

Fix bug where Slack service channel was not saved in admin template settings.

2015-04-24 08:33:24 -07:00

users_controller.rb

Allow primary email to be set to an email that you've already added.

2015-04-30 16:17:03 +02:00