Robert Speicher 7d33fba7af Merge branch 'upgrade-devise-two-factor' into 'master' ... Upgrade devise, devise-two-factor, and attr_encrypted Devise 4 includes support for Rails 5, working towards #14286. devise-async doesn't support Devise 4.0 and in 4.1 the bug that was blocking using Devise's built-in ActiveJob integration was fixed. So devise-async is removed. devise-two-factor 3.0.0 is required for Devise 4 support. attr_encrypted and encryptor are optional but recommended upgrades for devise-two-factor 3.0.0. The mode and algorithm will need to be changed in order to update to attr_encrypted 4.x in the future. See merge request !4216		2016-06-02 00:44:41 +00:00
..
1_settings.rb	Enable Style/NegatedIf Rubocop cop	2016-05-30 13:53:25 +02:00
2_app.rb	Add release tracking for Sentry	2016-02-17 14:05:58 -05:00
4_ci_app.rb	Use new runners registration token to register CI runners	2015-12-11 10:39:39 +01:00
5_backend.rb	Fix a few places where autoloading would fail	2016-05-10 11:51:19 +02:00
active_record_query_trace.rb	Added active_record_query_trace	2015-10-15 12:05:01 +02:00
attr_encrypted_no_db_connection.rb	Fix.	2015-05-15 15:32:49 +02:00
backtrace_silencers.rb	init commit	2011-10-09 00:36:38 +03:00
bullet.rb	Added Bullet to the Gemfile	2015-10-15 12:05:01 +02:00
carrierwave.rb	Codestyle: make sure we have space around operators	2016-05-13 04:46:56 -03:00
connection_fix.rb	Groundwork for merging CI into CE	2015-08-25 18:42:46 -07:00
cookies_serializer.rb	Rails update to 4.2.4	2015-11-25 18:18:44 +02:00
date_time_formats.rb	Add two custom Date/Time conversion formats	2016-01-07 20:01:08 -05:00
default_url_options.rb	Rails update to 4.2.4	2015-11-25 18:18:44 +02:00
devise.rb	Codestyle: make sure we have space around operators	2016-05-13 04:46:56 -03:00
devise_password_length.rb.example	Add instructions for custom password length limits	2014-01-13 10:41:10 +01:00
disable_email_interceptor.rb	Revert "Allow to configure smtp and sendmail in gitlab.yml"	2015-05-06 17:39:18 +03:00
doorkeeper.rb	Add leading comment space cop	2016-05-31 19:33:46 -03:00
gitlab_shell_secret_token.rb	Allow to configure gitlab_shell_secret location	2015-05-16 21:46:06 +02:00
go_get.rb	Revert "Revert "Merge branch 'support-go-subpackages' into 'master' ""	2016-03-12 21:05:23 +00:00
gollum.rb	Support Wiki with UTF-8 page name	2016-03-16 02:17:07 +09:00
haml.rb	Revert "Revert "Remove the :coffee and :coffeescript Haml filters""	2016-01-28 14:29:09 -05:00
health_check.rb	Support token header for health check token, and general cleanup of the health_check feature.	2016-05-11 17:27:08 -07:00
inflections.rb	Remove inflector rule that makes commits uncountable	2015-11-03 11:36:20 +01:00
kaminari_config.rb	add kaminari config with default and max per_page values	2012-09-03 04:22:49 -07:00
metrics.rb	Rename metric to 'rails queue duration'	2016-05-26 17:53:21 +02:00
mime_types.rb	Add Markdown to Mime types	2015-04-15 12:25:24 -04:00
mysql_ignore_postgresql_options.rb	Patch MySQL to ignore PostgreSQL schema options	2016-03-11 15:25:22 -05:00
omniauth.rb	Add leading comment space cop	2016-05-31 19:33:46 -03:00
postgresql_limit_fix.rb	patch rails to ignore text limit	2012-10-10 13:17:48 +04:00
postgresql_opclasses_support.rb	Disable Rubocop for PostgreSQL patches	2016-03-11 15:25:23 -05:00
premailer.rb	Don't remove IDs via premailer	2016-05-25 16:56:06 -04:00
public_key.rb	Fix typo.	2015-03-20 16:13:03 -07:00
rack_attack.rb.example	Disable Rack Attack if admin disables it in config file	2016-04-27 07:22:02 -07:00
rack_attack_git_basic_auth.rb	Disable Rack Attack if admin disables it in config file	2016-04-27 07:22:02 -07:00
rack_lineprof.rb	Rails update to 4.2.4	2015-11-25 18:18:44 +02:00
relative_url.rb.sample	Use dedicated relative_url.rb initializer	2016-02-29 21:17:48 +01:00
secret_token.rb	Rails update to 4.2.4	2015-11-25 18:18:44 +02:00
sentry.rb	Prevent Rails filtered parameters from leaking to Sentry.	2016-04-28 15:08:23 -06:00
session_store.rb	Enable Style/RedundantParentheses rubocop cop	2016-05-30 15:07:18 +02:00
sherlock.rb	Rails update to 4.2.4	2015-11-25 18:18:44 +02:00
sidekiq.rb	Redis configuration consistency	2016-04-13 20:57:19 +03:00
smtp_settings.rb.sample	Change default smpt port to 465 (default smtps port)	2016-02-09 07:30:06 +03:00
static_files.rb	Migrate mailers to ActiveJob	2015-11-26 17:03:43 +02:00
time_zone.rb	Add timezone configuration to gitlab.yml	2014-10-21 11:27:16 +02:00
trusted_proxies.rb	Pass trusted_proxies to action_dispatch as IPAddrs instead of strings	2016-04-28 12:05:45 -07:00
wrap_parameters.rb	init commit	2011-10-09 00:36:38 +03:00