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

# Conflicts:
#	app/models/project.rb

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

..

admin

Fix merge conflicts - squashed commit

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

ci

Redirect to root path when visiting /ci

2016-03-29 08:04:17 +02:00

concerns

Fix merge conflicts - squashed commit

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

dashboard

Fix merge conflicts - squashed commit

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

explore

Merge branch 'master' into issue_12658

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

groups

Fix merge conflicts - squashed commit

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

import

Redirect to a default path if HTTP_REFERER is not set

2015-10-20 07:45:48 -07:00

oauth

Include GonHelper separately and remove created_at in factory

2016-04-14 07:25:27 -07:00

profiles

Fix merge conflicts - squashed commit

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

projects

Fix merge conflicts - squashed commit

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

sherlock

Added Sherlock, a custom profiling tool for GitLab

2015-11-09 14:29:10 +01:00

abuse_reports_controller.rb

Autofill abuse message text with user url. Closes #2838

2016-01-16 10:47:12 -05:00

application_controller.rb

Fix merge conflicts - squashed commit

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

autocomplete_controller.rb

Fix merge conflicts - squashed commit

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

confirmations_controller.rb

Improved confirmation UX

2016-04-21 20:20:09 -04:00

dashboard_controller.rb

Fix merge conflicts - squashed commit

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

emojis_controller.rb

Update award_emoji test

2016-02-23 19:37:15 -06:00

groups_controller.rb

Projects on group page should be sorted by last activity instead of id/created_at

2016-04-14 11:00:24 +02:00

health_check_controller.rb

Fix merge conflicts - squashed commit

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

help_controller.rb

Simplify random user generation.

2016-04-16 16:00:30 -04:00

invites_controller.rb

Redirect to a default path if HTTP_REFERER is not set

2015-10-20 07:45:48 -07:00

jwt_controller.rb

Fix merge conflicts - squashed commit

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

namespaces_controller.rb

Prevent projects to have higher visibility than groups

2016-03-10 10:38:36 -03:00

omniauth_callbacks_controller.rb

Fix merge conflicts - squashed commit

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

passwords_controller.rb

Allow the initial admin to set a password

2016-03-04 17:37:57 -05:00

profiles_controller.rb

Merge branch 'master' into issue_7959

2016-03-22 11:13:27 -05:00

projects_controller.rb

Fix merge conflicts - squashed commit

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

registrations_controller.rb

Fix merge conflicts - squashed commit

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

root_controller.rb

Implementing 'Groups View' and 'TODOs View' as options for dashboard preferences.

2016-03-24 19:59:54 +01:00

search_controller.rb

Updated based on feedback

2016-04-26 09:04:35 +01:00

sent_notifications_controller.rb

#can_unsubscribe? -> #?unsubscribable?

2016-01-11 14:23:45 +01:00

sessions_controller.rb

Fix merge conflicts - squashed commit

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

snippets_controller.rb

Fix merge conflicts - squashed commit

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

uploads_controller.rb

Branded login page also in CE

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

users_controller.rb

Fix merge conflicts - squashed commit

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