diff options
| author | 黄涛 <htve@outlook.com> | 2016-03-25 13:15:03 +0800 |
|---|---|---|
| committer | 黄涛 <htve@outlook.com> | 2016-03-25 13:15:03 +0800 |
| commit | d4c1e5442209cc89c4c8786160246da162e30866 (patch) | |
| tree | 32f4f3d9b663643159f7be14a65e30985d7d580a | |
| parent | c53821914a75fe405ab0eadfe0eec2e6220a6e73 (diff) | |
| download | gitlab-ce-d4c1e5442209cc89c4c8786160246da162e30866.tar.gz | |
修复502错误
| -rw-r--r-- | app/controllers/projects/issues_controller.rb | 1 | ||||
| -rw-r--r-- | app/helpers/search_helper.rb | 2 | ||||
| -rw-r--r-- | config.ru | 2 | ||||
| -rw-r--r-- | config/environment.rb | 2 |
4 files changed, 3 insertions, 4 deletions
diff --git a/app/controllers/projects/issues_controller.rb b/app/controllers/projects/issues_controller.rb index 975aa59d41b..9a6e8871e40 100644 --- a/app/controllers/projects/issues_controller.rb +++ b/app/controllers/projects/issues_controller.rb @@ -1,4 +1,3 @@ -encoding: utf-8 class Projects::IssuesController < Projects::ApplicationController include ToggleSubscriptionAction include IssuableActions diff --git a/app/helpers/search_helper.rb b/app/helpers/search_helper.rb index 88f2b4ae5fb..0291ce1d997 100644 --- a/app/helpers/search_helper.rb +++ b/app/helpers/search_helper.rb @@ -41,7 +41,7 @@ module SearchHelper { label: "帮助: Rake 任务帮助", url: help_page_path("raketasks", "README") }, { label: "帮助: SSH 密钥帮助", url: help_page_path("ssh", "README") }, { label: "帮助: 系统钩子帮助", url: help_page_path("system_hooks", "system_hooks") }, - { label: "帮助: Web 钩子帮助", url: help_page_path("web_hooks", "web_hooks") } + { label: "帮助: Web 钩子帮助", url: help_page_path("web_hooks", "web_hooks") }, { label: "帮助: 工作流帮助", url: help_page_path("workflow", "README") }, ] end diff --git a/config.ru b/config.ru index 065ce59932f..621bdb53e9c 100644 --- a/config.ru +++ b/config.ru @@ -19,4 +19,4 @@ require ::File.expand_path('../config/environment', __FILE__) map ENV['RAILS_RELATIVE_URL_ROOT'] || "/" do run Gitlab::Application -end +end
\ No newline at end of file diff --git a/config/environment.rb b/config/environment.rb index df3006d349c..30f7097faf6 100644 --- a/config/environment.rb +++ b/config/environment.rb @@ -2,4 +2,4 @@ require File.expand_path('../application', __FILE__) # Initialize the rails application -Rails.application.initialize! +Rails.application.initialize!
\ No newline at end of file |