Douwe Maan c7d9e7806a Merge branch 'fix/reference_filter_uri_decode_error_for_master' into 'master' ...

Fix #9963 reference_filter "Encoding::CompatibilityError" bug with some complex URL;

https://github.com/gitlabhq/gitlabhq/pull/9964

@DouweM

See merge request !2383

2016-01-13 14:21:32 +00:00

..

environments

Merge branch 'master' into reference-pipeline-and-caching

2015-12-03 13:34:25 +01:00

initializers

Merge branch 'fix/reference_filter_uri_decode_error_for_master' into 'master'

2016-01-13 14:21:32 +00:00

locales

Use devise paranoid mode and ensure the same message is returned every time

2015-12-09 18:40:37 -06:00

application.rb

Migrate mailers to ActiveJob

2015-11-26 17:03:43 +02:00

aws.yml.example

Add a note that changing example configuration files requires changing omnibus-gitlab.

2015-06-11 15:11:37 +02:00

boot.rb

init commit

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

database.yml.env

Thanks Robert for the corrections in the environment variables docs.

2015-12-28 09:37:59 +01:00

database.yml.mysql

set the collation to utf8_general_ci

2014-08-13 14:45:23 +01:00

database.yml.postgresql

Remove 'socket' example PostgreSQL parameter

2014-07-01 18:27:50 +02:00

environment.rb

Rails update to 4.2.4

2015-11-25 18:18:44 +02:00

gitlab.teatro.yml

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

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

gitlab.yml.example

Optimize LDAP and add a search timeout

2016-01-11 08:17:32 -06:00

mail_room.yml

Make Reply by email easier to configure

2015-10-13 13:10:49 +02:00

newrelic.yml

Add dormant New Relic gem

2014-09-16 17:31:20 +02:00

resque.yml.example

Add a note that changing example configuration files requires changing omnibus-gitlab.

2015-06-11 15:11:37 +02:00

routes.rb

Merge gitlab.com:gitlab-org/gitlab-ce

2016-01-08 17:25:09 +01:00

secrets.yml.example

Groundwork for merging CI into CE

2015-08-25 18:42:46 -07:00

sidekiq.yml.example

Groundwork for merging CI into CE

2015-08-25 18:42:46 -07:00

unicorn.rb.example

Add a note that changing example configuration files requires changing omnibus-gitlab.

2015-06-11 15:11:37 +02:00

unicorn.rb.example.development

Increase unicorn timeout to 60 seconds

2014-09-23 17:11:16 +03:00