Dmitriy Zaporozhets 935fc796d1 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee ...

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

Conflicts:
	VERSION
	app/controllers/admin/application_settings_controller.rb
	app/controllers/omniauth_callbacks_controller.rb
	app/controllers/projects/project_members_controller.rb
	app/helpers/application_settings_helper.rb
	app/models/user.rb
	app/services/files/base_service.rb
	app/views/profiles/accounts/show.html.haml
	db/schema.rb
	doc/install/installation.md
	doc/update/6.x-or-7.x-to-7.11.md
	doc/workflow/README.md
	lib/gitlab/markdown/external_issue_reference_filter.rb
	lib/gitlab/reference_extractor.rb
	lib/gitlab/upgrader.rb

2015-06-05 11:40:36 +02:00

..

1_settings.rb

Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee

2015-06-05 11:40:36 +02:00

2_app.rb

Revert "Preload lib/"

2015-04-09 12:21:59 -04:00

3_grit_ext.rb

Remove python from installation docs

2014-01-30 19:48:47 +02:00

4_sidekiq.rb

Remove sidekiq-limit_fetch because it require Redis 2.6.

2015-04-03 18:38:31 +02:00

5_backend.rb

Warn when gitlab-shell version doesn't match requirement.

2015-04-06 14:02:49 +02:00

6_rack_profiler.rb

Disable Rack::MiniProfiler for /teaspoon path

2015-05-28 18:22:33 -04:00

7_omniauth.rb

Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee

2015-06-05 11:40:36 +02:00

8_default_url_options.rb

Set default_url_options in test environments too

2015-04-25 19:46:05 -04: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

carrierwave.rb

Rubocop: comment indentation

2015-02-02 21:34:16 -08: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

Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee

2015-05-13 14:10:14 +03: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

Fix Resource Owner Password Authentication Flow

2015-04-17 11:47:02 -05:00

gitlab_shell_secret_token.rb

Allow to configure gitlab_shell_secret location

2015-05-16 21:46:06 +02: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

license.rb

Show prettier error message when license file is invalid.

2015-05-05 11:49:28 +02:00

mime_types.rb

Add Markdown to Mime types

2015-04-15 12:25:24 -04:00

postgresql_limit_fix.rb

patch rails to ignore text limit

2012-10-10 13:17:48 +04:00

public_key.rb

Fix typo.

2015-03-20 16:13:03 -07:00

rack_attack_git_basic_auth.rb

Add more comments explaining how we block IPs

2014-12-18 11:08:11 +01:00

rack_attack.rb.example

Create one big regular expresion for Rack::Attack

2014-08-22 09:56:39 +02:00

redis-store-fix-expiry.rb

Another comment fix

2014-12-16 12:46:55 +01: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

Revert "Allow to configure smtp and sendmail in gitlab.yml"

2015-05-06 17:39:18 +03:00

state_machine_patch.rb

Rename snippets scopes to plural names.

2014-06-04 08:37:19 +02:00

static_files.rb

Change check to only swap static middleware when it's enabled.

2015-02-21 15:09:17 +01:00

time_zone.rb

Add timezone configuration to gitlab.yml

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

wrap_parameters.rb

init commit

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