diff options
| author | Florian Unglaub <florian.unglaub@nix-wie-weg.de> | 2012-08-24 15:25:52 +0200 |
|---|---|---|
| committer | Florian Unglaub <florian.unglaub@nix-wie-weg.de> | 2012-08-24 15:25:52 +0200 |
| commit | 48443d20ca9aa10323c1b81835e519680b10debc (patch) | |
| tree | 7488eeab446a1a01f90450e50028bfcbdc0ad1d0 /config | |
| parent | c5ae1549a1d09599734ccaab27e90a8752f1ede6 (diff) | |
| parent | 6d4ae75f544d9819954865c105414a722344336a (diff) | |
| download | gitlab-ce-48443d20ca9aa10323c1b81835e519680b10debc.tar.gz | |
Merge branch 'master' of git://github.com/gitlabhq/gitlabhq
Diffstat (limited to 'config')
| -rw-r--r-- | config/application.rb | 3 | ||||
| -rw-r--r-- | config/gitlab.yml.example | 3 | ||||
| -rw-r--r-- | config/initializers/1_settings.rb | 3 | ||||
| -rw-r--r-- | config/initializers/rails_footnotes.rb | 3 | ||||
| -rw-r--r-- | config/routes.rb | 3 |
5 files changed, 10 insertions, 5 deletions
diff --git a/config/application.rb b/config/application.rb index 937262237e9..ecd88b15d15 100644 --- a/config/application.rb +++ b/config/application.rb @@ -44,5 +44,8 @@ module Gitlab # Version of your assets, change this if you want to expire all your assets config.assets.version = '1.0' + + # Add fonts + config.assets.paths << "#{Rails.root}/app/assets/fonts" end end diff --git a/config/gitlab.yml.example b/config/gitlab.yml.example index 85149fe890c..1934029d5bb 100644 --- a/config/gitlab.yml.example +++ b/config/gitlab.yml.example @@ -23,7 +23,7 @@ app: default_projects_limit: 10 # backup_path: "/vol/backups" # default: Rails.root + backups/ # backup_keep_time: 604800 # default: 0 (forever) (in seconds) - + # disable_gravatar: true # default: false - Disable user avatars from Gravatar.com # # 2. Advanced settings: @@ -39,7 +39,6 @@ git_host: receive_pack: true # port: 22 - # Git settings # Use default values unless you understand it git: diff --git a/config/initializers/1_settings.rb b/config/initializers/1_settings.rb index 741a29d51be..13e12ff2ace 100644 --- a/config/initializers/1_settings.rb +++ b/config/initializers/1_settings.rb @@ -120,5 +120,8 @@ class Settings < Settingslogic omniauth['providers'] || [] end + def disable_gravatar? + app['disable_gravatar'] || false + end end end diff --git a/config/initializers/rails_footnotes.rb b/config/initializers/rails_footnotes.rb deleted file mode 100644 index afe6f3ad383..00000000000 --- a/config/initializers/rails_footnotes.rb +++ /dev/null @@ -1,3 +0,0 @@ -#if defined?(Footnotes) && Rails.env.development? - #Footnotes.run! # first of all -#end diff --git a/config/routes.rb b/config/routes.rb index 04e13bc4a86..f895478fb12 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -30,6 +30,7 @@ Gitlab::Application.routes.draw do get 'help/web_hooks' => 'help#web_hooks' get 'help/system_hooks' => 'help#system_hooks' get 'help/markdown' => 'help#markdown' + get 'help/ssh' => 'help#ssh' # # Admin Area @@ -196,7 +197,9 @@ Gitlab::Application.routes.draw do end resources :team_members resources :milestones + resources :labels, :only => [:index] resources :issues do + collection do post :sort post :bulk_update |