James Lopez 3e99123095 Fix merge conflicts - squashed commit ...

# Conflicts:
#	app/models/project.rb

2016-06-03 10:57:49 +02:00

..

abuse_reports_controller.rb

Fix merge conflicts - squashed commit

2016-06-03 10:57:49 +02:00

appearances_controller.rb

Branded login page also in CE

2016-02-26 15:50:51 +01:00

application_controller.rb

Fix issue with impersonation

2016-04-22 23:21:56 +02:00

application_settings_controller.rb

Fix merge conflicts - squashed commit

2016-06-03 10:57:49 +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

Fix merge conflicts - squashed commit

2016-06-03 10:57:49 +02:00

builds_controller.rb

Show 'All' tab by default in the builds page

2016-01-04 10:21:10 -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

Remove show actions from Admin and Project DeployKeys

2015-06-03 18:03:04 -04:00

groups_controller.rb

Merge branch 'master' into issue_12658

2016-03-21 23:22:21 +01:00

health_check_controller.rb

Fix merge conflicts - squashed commit

2016-06-03 10:57:49 +02:00

hooks_controller.rb

Added UI to define secret_token for webhook and systemhook

2016-05-02 10:32:01 -03:00

identities_controller.rb

Code style fixes and some code simplified

2016-01-08 16:26:04 -02:00

impersonations_controller.rb

Log to application.log when an admin starts and stops impersonating a user

2016-05-04 09:21:34 -07:00

keys_controller.rb

Fix merge conflicts - squashed commit

2016-06-03 10:57:49 +02:00

labels_controller.rb

Use the configured Kaminari "per page" default

2016-03-19 17:37:54 -04: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

Clear repository check columns asynchronously

2016-04-13 15:56:05 +02:00

runner_projects_controller.rb

Remove ci_ prefix from all ci related things

2015-12-11 18:02:09 +01:00

runners_controller.rb

Fix merge conflicts - squashed commit

2016-06-03 10:57:49 +02:00

services_controller.rb

Improve invalidation of stored service password if the endpoint URL is changed

2015-10-15 12:07:59 +02:00

spam_logs_controller.rb

Fix merge conflicts - squashed commit

2016-06-03 10:57:49 +02:00

users_controller.rb

Fix merge conflicts - squashed commit

2016-06-03 10:57:49 +02:00