Robert Speicher 9570495e75 Merge branch 'add_email_unlock' into 'master' ... Allow account unlock via email We see a lot of users get confused about what it means when your account gets locked. Many try to reset their password and are still faced with a lockout. With this change, users receive an email that allows them to unlock their account immediately. The previous behavior where the account is auto-unlocked after a time also still works. See merge request !2049		2015-12-21 17:53:20 +00:00
..
environments	Merge branch 'master' into reference-pipeline-and-caching	2015-12-03 13:34:25 +01:00
initializers	Merge branch 'add_email_unlock' into 'master'	2015-12-21 17:53:20 +00:00
locales	Use devise paranoid mode and ensure the same message is returned every time	2015-12-09 18:40:37 -06:00
application.rb	Migrate mailers to ActiveJob	2015-11-26 17:03:43 +02:00
aws.yml.example	Add a note that changing example configuration files requires changing omnibus-gitlab.	2015-06-11 15:11:37 +02:00
boot.rb
database.yml.mysql
database.yml.postgresql
environment.rb	Rails update to 4.2.4	2015-11-25 18:18:44 +02:00
gitlab.teatro.yml	Revert "Allow to configure smtp and sendmail in gitlab.yml"	2015-05-06 17:39:18 +03:00
gitlab.yml.example	add CAS authentication support	2015-12-14 21:43:41 -06:00
mail_room.yml	Make Reply by email easier to configure	2015-10-13 13:10:49 +02:00
newrelic.yml	Add dormant New Relic gem	2014-09-16 17:31:20 +02:00
resque.yml.example	Add a note that changing example configuration files requires changing omnibus-gitlab.	2015-06-11 15:11:37 +02:00
routes.rb	Fixed Rubocop offenses	2015-12-15 00:53:52 -02:00
schedule.rb	Groundwork for merging CI into CE	2015-08-25 18:42:46 -07:00
schedule.yml	Migrate from Sidetiq to Sidekiq-cron	2015-12-04 11:29:45 -02:00
secrets.yml.example	Groundwork for merging CI into CE	2015-08-25 18:42:46 -07:00
sidekiq.yml.example	Groundwork for merging CI into CE	2015-08-25 18:42:46 -07:00
unicorn.rb.example	Add a note that changing example configuration files requires changing omnibus-gitlab.	2015-06-11 15:11:37 +02:00
unicorn.rb.example.development	Increase unicorn timeout to 60 seconds	2014-09-23 17:11:16 +03:00