Dmitriy Zaporozhets f9ece12e87 Merge branch 'master' into oauth2_provider ... Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> Conflicts: app/views/layouts/nav/_profile.html.haml		2014-12-25 18:48:15 +02:00
..
1_settings.rb	Add settings to disable email sending from GitLab.	2014-10-27 13:02:12 +01:00
2_app.rb	Replace backticks with Gitlab::Popen	2014-03-03 08:40:29 +01:00
3_grit_ext.rb	Remove python from installation docs	2014-01-30 19:48:47 +02:00
4_sidekiq.rb	Use the new SIDEKIQ_MEMORY_KILLER_MAX_RSS variable	2014-12-08 13:39:25 +01:00
5_backend.rb	Update code to work with gitlab_git 3	2013-10-01 17:00:28 +03:00
6_rack_profiler.rb	Hide rack profiler by default	2014-12-24 15:43:45 +02:00
7_omniauth.rb	Prevent redeclaration of LDAP strategy	2014-10-17 18:03:34 +02:00
acts_as_taggable_on_patch.rb	Add acts-as-taggable-on-patch for gem version 2.4.1 and Rails 4.1.	2014-06-03 11:37:23 +02:00
backtrace_silencers.rb
carrierwave.rb	Make sure that tests pass when aws group is used.	2014-04-24 13:23:17 +02:00
devise.rb	Only enable LDAP providers if LDAP is enabled	2014-10-15 09:53:16 +02:00
devise_async.rb	Send devise emails async	2013-10-09 15:25:31 +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	Add email interceptor to prevent mail sending if email sending is disabled.	2014-10-27 13:05:50 +01:00
doorkeeper.rb	Doorkeeper integration	2014-12-24 15:38:07 +02:00
gitlab_shell_secret_token.rb	Revert "gitlab shell works if multiple rubies installed"	2014-11-18 17:14:36 +02:00
haml.rb	Enable HAML ugly mode by default for all environments	2013-05-14 22:17:46 +03:00
inflections.rb
kaminari_config.rb
mime_types.rb	Register diff mime type	2012-11-22 20:22:44 +01:00
postgresql_limit_fix.rb	patch rails to ignore text limit	2012-10-10 13:17:48 +04:00
rack_attack.rb.example	Create one big regular expresion for Rack::Attack	2014-08-22 09:56:39 +02:00
secret_token.rb	Allow to specify secret token via environment variable.	2014-04-15 19:27:25 +01:00
session_store.rb	Merge branch 'redis_settings'	2014-08-28 15:03:22 +03:00
smtp_settings.rb.sample	Fix typo in sample smtp settings	2013-10-22 17:38:11 +02:00
state_machine_patch.rb	Rename snippets scopes to plural names.	2014-06-04 08:37:19 +02:00
time_zone.rb	Add timezone configuration to gitlab.yml	2014-10-21 11:27:16 +02:00
wrap_parameters.rb