Eric Eastwood 3468ca835d Merge branch 'master' into ff_port_from_ee ... Conflicts: app/models/project.rb db/schema.rb		2017-09-28 16:59:49 -05:00
..
admin	refactor emails service	2017-09-28 08:46:39 +02:00
boards
ci
concerns
dashboard
explore
groups
import
oauth
profiles	refactor emails service	2017-09-28 08:46:39 +02:00
projects
sherlock
snippets
abuse_reports_controller.rb
application_controller.rb
autocomplete_controller.rb
confirmations_controller.rb
dashboard_controller.rb
groups_controller.rb
health_check_controller.rb
health_controller.rb
help_controller.rb
invites_controller.rb
jwt_controller.rb
koding_controller.rb
metrics_controller.rb
notification_settings_controller.rb
omniauth_callbacks_controller.rb
passwords_controller.rb
profiles_controller.rb	refactor users update service	2017-09-28 08:46:39 +02:00
projects_controller.rb
registrations_controller.rb
root_controller.rb
search_controller.rb
sent_notifications_controller.rb
sessions_controller.rb	refactor users update service	2017-09-28 08:46:39 +02:00
snippets_controller.rb
unicorn_test_controller.rb
uploads_controller.rb
users_controller.rb