root
/
gitlab-ce
mirror of https://gitlab.com/free-releases/gitlab-ce.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity
gitlab-ce/db
History
Douwe Maan 0c0c2ecd99 Merge branch 'master' into digitalmoksha/gitlab-ce-feature/verify_secondary_emails 
# Conflicts:
#	app/controllers/admin/users_controller.rb
#	app/controllers/confirmations_controller.rb
#	app/controllers/profiles/emails_controller.rb
#	app/models/user.rb
#	app/services/emails/base_service.rb
#	app/services/emails/destroy_service.rb
#	app/views/devise/mailer/confirmation_instructions.html.haml
#	lib/api/users.rb
#	spec/services/emails/destroy_service_spec.rb
 		2017-10-05 12:48:22 +02:00
..
fixtures Remove depreceted and big projects 2017-09-20 07:42:47 +00:00
migrate Merge branch 'master' into digitalmoksha/gitlab-ce-feature/verify_secondary_emails 2017-10-05 12:48:22 +02:00
post_migrate Merge branch '36631-activerecord-statementinvalid-pg-querycanceled-error-canceling-statement-due-to-statement-timeout' into 'master' 2017-09-29 13:43:28 +00:00
schema.rb Merge branch 'master' into digitalmoksha/gitlab-ce-feature/verify_secondary_emails 2017-10-05 12:48:22 +02:00
seeds.rb
…