Dmitriy Zaporozhets 67d6a79ee9 Merge branch 'ce-ee-master' into ee-master ...

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

Conflicts:
	VERSION
	config/initializers/1_settings.rb
	config/initializers/7_omniauth.rb

2014-10-22 14:47:04 +03:00

..

1_settings.rb

Restore Settingslogic.new from 18d87dcf91

2014-10-21 11:27:41 +02: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

Log Sidekiq arguments

2014-07-28 16:46:36 +02:00

5_backend.rb

Update code to work with gitlab_git 3

2013-10-01 17:00:28 +03:00

6_rack_profiler.rb

Add default settings to test env. Removed wrong comment for rack_profiler

2014-02-26 12:44:29 +02:00

7_omniauth.rb

Fix CE-EE LDAP merge conflicts

2014-10-21 09:55:13 +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

init commit

2011-10-09 00:36:38 +03:00

carrierwave.rb

Make sure that tests pass when aws group is used.

2014-04-24 13:23:17 +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

devise.rb

Only initialize if ldap is enabled

2014-10-16 10:32:54 +02:00

gitlab_shell_secret_token.rb

add gitlab-shell identification

2014-10-15 20:03:25 +03:00

haml.rb

Enable HAML ugly mode by default for all environments

2013-05-14 22:17:46 +03:00

inflections.rb

Add an inflector to mark "commits" as uncountable

2012-09-26 16:32:23 -04:00

kaminari_config.rb

add kaminari config with default and max per_page values

2012-09-03 04:22:49 -07:00

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

wrap_parameters.rb

init commit

2011-10-09 00:36:38 +03:00