diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-02-26 12:44:29 +0200 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-02-26 12:44:29 +0200 |
| commit | 6ef3505b190001cba49077c98bce25054cdc4577 (patch) | |
| tree | e016bc66d2cf53e0e3310814f98908e733f9960e /config | |
| parent | 1ff1b6d816cd1150df436a8ff56502e8adfa1b0e (diff) | |
| download | gitlab-ce-6ef3505b190001cba49077c98bce25054cdc4577.tar.gz | |
Add default settings to test env. Removed wrong comment for rack_profiler
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Diffstat (limited to 'config')
| -rw-r--r-- | config/gitlab.yml.example | 5 | ||||
| -rw-r--r-- | config/initializers/6_rack_profiler.rb | 1 |
2 files changed, 5 insertions, 1 deletions
diff --git a/config/gitlab.yml.example b/config/gitlab.yml.example index ce57465d687..39f35adb164 100644 --- a/config/gitlab.yml.example +++ b/config/gitlab.yml.example @@ -227,6 +227,11 @@ development: test: <<: *base + gravatar: + enabled: true + gitlab: + host: localhost + port: 80 issues_tracker: redmine: title: "Redmine" diff --git a/config/initializers/6_rack_profiler.rb b/config/initializers/6_rack_profiler.rb index d1ebca4a372..a7ee3c59822 100644 --- a/config/initializers/6_rack_profiler.rb +++ b/config/initializers/6_rack_profiler.rb @@ -1,4 +1,3 @@ -# If Mini Profiler is included via gem if Rails.env == 'development' require 'rack-mini-profiler' |