Douwe MaanandRémy Coutable 58e247d83b Merge branch 'rel-url-fix' into 'master' ...

Fix relative URL

See https://github.com/gitlabhq/gitlabhq/issues/10053

 1. Same configuration way for relative URL like with Omnibus
 2. Loading the relative configuration from Rakefile as Rails do not load initializers for `asset:precompile`

First point has another positive side effect: no collisions (due to git controlled `application.rb`) any more during the upgrades of source based installations and relative url configuration

 - [x] tests on the source based installation
 - [x] tests on the centos&ubuntu omnibus packages

Fixes: gitlab-org/gitlab-ce#13730, gitlab-org/gitlab-ce#13727, gitlab-org/omnibus-gitlab#1143 and https://github.com/gitlabhq/gitlabhq/issues/10053

See merge request !2979

2016-03-01 17:37:51 +01:00

..

environments

Raise an error on page load if there are pending migrations on dev env

2016-01-19 00:12:30 -02:00

initializers

Merge branch 'rel-url-fix' into 'master'

2016-03-01 17:37:51 +01:00

locales

Implement new UI for pagination

2016-01-20 21:27:01 -05:00

application.rb

Merge branch 'rel-url-fix' into 'master'

2016-03-01 17:37:51 +01: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

Improving the "Environment variables" administration doc

2016-02-01 19:10:46 +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

Merge branch 'saml-decoupling' into 'master'

2016-02-19 16:45:18 +01:00

mail_room.yml

Make Reply by email easier to configure

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

newrelic.yml

Merge branch 'bring-back-newrelic-gem' into 'master'

2016-02-24 09:23:30 +01: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 branch '11489-branded-appearance-to-ce' into 'master'

2016-03-01 11:41:03 +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

Fix typos and grammar

2016-02-10 12:43:19 +02:00

unicorn.rb.example.development

Increase unicorn timeout to 60 seconds

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