Dmitriy Zaporozhets 1c93d0df7a Merge branch 'master' into ce-changes ...

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	db/schema.rb

2014-12-11 18:12:45 +02:00

..

1_settings.rb

Merge CE master into EE master

2014-11-13 17:05:12 +02:00

2_app.rb

…

3_grit_ext.rb

…

4_sidekiq.rb

Use the new SIDEKIQ_MEMORY_KILLER_MAX_RSS variable

2014-12-08 13:39:25 +01:00

5_backend.rb

…

6_rack_profiler.rb

…

7_omniauth.rb

Fix CE-EE LDAP merge conflicts

2014-10-21 09:55:13 +02:00

acts_as_taggable_on_patch.rb

…

backtrace_silencers.rb

…

carrierwave.rb

…

devise_async.rb

…

devise_password_length.rb.example

…

devise.rb

Only initialize if ldap is enabled

2014-10-16 10:32:54 +02: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

gitlab_shell_secret_token.rb

Revert "gitlab shell works if multiple rubies installed"

2014-11-18 17:14:36 +02:00

haml.rb

…

inflections.rb

…

kaminari_config.rb

…

mime_types.rb

…

postgresql_limit_fix.rb

…

rack_attack.rb.example

…

secret_token.rb

…

session_store.rb

Merge branch 'redis_settings'

2014-08-28 15:03:22 +03:00

smtp_settings.rb.sample

…

state_machine_patch.rb

…

time_zone.rb

Add timezone configuration to gitlab.yml

2014-10-21 11:27:16 +02:00

wrap_parameters.rb

…