From b64e89daec8fedb8e8af007cc8ab8272fcd883ba Mon Sep 17 00:00:00 2001 From: Jean-Philippe Lang Date: Thu, 27 Sep 2007 22:30:57 +0000 Subject: [PATCH] Native eol property set on config/* git-svn-id: http://redmine.rubyforge.org/svn/trunk@772 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- config/database.yml.example | 14 +-- config/environment.rb | 32 +++--- config/environments/demo.rb | 6 +- config/environments/production.rb | 4 +- config/help.yml | 166 +++++++++++++++--------------- config/routes.rb | 10 +- config/settings.yml | 162 ++++++++++++++--------------- 7 files changed, 197 insertions(+), 197 deletions(-) diff --git a/config/database.yml.example b/config/database.yml.example index 3b1522024..2f38d81ef 100644 --- a/config/database.yml.example +++ b/config/database.yml.example @@ -15,14 +15,14 @@ production: development: adapter: mysql - database: redmine_development + database: redmine_development host: localhost username: root password: - + test: adapter: mysql - database: redmine_test + database: redmine_test host: localhost username: root password: @@ -44,8 +44,8 @@ test_sqlserver: adapter: sqlserver host: localhost,1157 database: redmine_test - -demo: - adapter: sqlite3 - dbfile: db/redmine_demo.db + +demo: + adapter: sqlite3 + dbfile: db/redmine_demo.db diff --git a/config/environment.rb b/config/environment.rb index cbb1896a2..315f3e4b4 100644 --- a/config/environment.rb +++ b/config/environment.rb @@ -2,7 +2,7 @@ # Uncomment below to force Rails into production mode when # you don't control web/app server and can't set it the proper way -# ENV['RAILS_ENV'] ||= 'production' +# ENV['RAILS_ENV'] ||= 'production' # Bootstrap the Rails environment, frameworks, and default configuration require File.join(File.dirname(__FILE__), 'boot') @@ -41,24 +41,24 @@ Rails::Initializer.run do |config| # (enables use of different database adapters for development and test environments) # config.active_record.schema_format = :ruby - # See Rails::Configuration for more options - - # SMTP server configuration - config.action_mailer.smtp_settings = { - :address => "127.0.0.1", - :port => 25, - :domain => "somenet.foo", - :authentication => :login, - :user_name => "redmine", - :password => "redmine", - } - - config.action_mailer.perform_deliveries = true - + # See Rails::Configuration for more options + + # SMTP server configuration + config.action_mailer.smtp_settings = { + :address => "127.0.0.1", + :port => 25, + :domain => "somenet.foo", + :authentication => :login, + :user_name => "redmine", + :password => "redmine", + } + + config.action_mailer.perform_deliveries = true + # Tell ActionMailer not to deliver emails to the real world. # The :test delivery method accumulates sent emails in the # ActionMailer::Base.deliveries array. - #config.action_mailer.delivery_method = :test + #config.action_mailer.delivery_method = :test config.action_mailer.delivery_method = :smtp # Uncomment this line if the engines plugin is installed. diff --git a/config/environments/demo.rb b/config/environments/demo.rb index 52aef32f1..c7e997e8d 100644 --- a/config/environments/demo.rb +++ b/config/environments/demo.rb @@ -14,8 +14,8 @@ config.action_controller.perform_caching = true # Enable serving of images, stylesheets, and javascripts from an asset server # config.action_controller.asset_host = "http://assets.example.com" - + # Disable mail delivery -config.action_mailer.perform_deliveries = false +config.action_mailer.perform_deliveries = false config.action_mailer.raise_delivery_errors = false - + diff --git a/config/environments/production.rb b/config/environments/production.rb index eeafd959e..cfd2aa0f2 100644 --- a/config/environments/production.rb +++ b/config/environments/production.rb @@ -14,9 +14,9 @@ config.action_controller.perform_caching = true # Enable serving of images, stylesheets, and javascripts from an asset server # config.action_controller.asset_host = "http://assets.example.com" - + # Disable delivery errors if you bad email addresses should just be ignored config.action_mailer.raise_delivery_errors = false # No email in production log -config.action_mailer.logger = nil +config.action_mailer.logger = nil diff --git a/config/help.yml b/config/help.yml index 80559cbd7..32764c16f 100644 --- a/config/help.yml +++ b/config/help.yml @@ -1,84 +1,84 @@ -# redMine - project management software -# Copyright (C) 2006 Jean-Philippe Lang -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - -# available languages for help pages -langs: - - en - - fr - - ja - -# mapping between controller/action and help pages -# if action is not defined here, 'index' page will be displayed -pages: - # administration - admin: - index: ch01.html - projects: ch01s01.html - mail_options: ch01s09.html - info: ch01s12.html - users: - index: ch01s02.html - roles: - index: ch01s03.html - workflow: ch01s07.html - trackers: - index: ch01s04.html - issue_statuses: - index: ch01s06.html - settings: - index: ch01s11.html - # projects - projects: - index: ch02.html - settings: ch01s01.html - add: ch01s01.html - show: ch02s01.html - gantt: ch02s02.html - calendar: ch02s02.html - changelog: ch02s06.html - roadmap: ch02s07.html - add_document: ch02s07.html - list_documents: ch02s07.html - add_issue: ch02s03.html - list_issues: ch02s03.html - add_news: ch02s06.html - list_news: ch02s06.html - add_file: ch02s11.html - list_files: ch02s11.html - changelog: ch02s05.html - issues: - index: ch02s03.html - documents: - index: ch02s09.html - news: - index: ch02s06.html - versions: - index: ch02s09.html - reports: - index: ch02s04.html - # accounts - my: - index: ch03.html - account: ch03s01.html - page: ch03s02.html - account: - index: ch03.html - lost_password: ch03s03.html - register: ch03s04.html - wiki: - index: ch02s10.html +# redMine - project management software +# Copyright (C) 2006 Jean-Philippe Lang +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + +# available languages for help pages +langs: + - en + - fr + - ja + +# mapping between controller/action and help pages +# if action is not defined here, 'index' page will be displayed +pages: + # administration + admin: + index: ch01.html + projects: ch01s01.html + mail_options: ch01s09.html + info: ch01s12.html + users: + index: ch01s02.html + roles: + index: ch01s03.html + workflow: ch01s07.html + trackers: + index: ch01s04.html + issue_statuses: + index: ch01s06.html + settings: + index: ch01s11.html + # projects + projects: + index: ch02.html + settings: ch01s01.html + add: ch01s01.html + show: ch02s01.html + gantt: ch02s02.html + calendar: ch02s02.html + changelog: ch02s06.html + roadmap: ch02s07.html + add_document: ch02s07.html + list_documents: ch02s07.html + add_issue: ch02s03.html + list_issues: ch02s03.html + add_news: ch02s06.html + list_news: ch02s06.html + add_file: ch02s11.html + list_files: ch02s11.html + changelog: ch02s05.html + issues: + index: ch02s03.html + documents: + index: ch02s09.html + news: + index: ch02s06.html + versions: + index: ch02s09.html + reports: + index: ch02s04.html + # accounts + my: + index: ch03.html + account: ch03s01.html + page: ch03s02.html + account: + index: ch03.html + lost_password: ch03s03.html + register: ch03s04.html + wiki: + index: ch02s10.html syntax: wiki_syntax.html \ No newline at end of file diff --git a/config/routes.rb b/config/routes.rb index 62a74446f..80fa58942 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -8,10 +8,10 @@ ActionController::Routing::Routes.draw do |map| map.home '', :controller => 'welcome' - map.connect 'wiki/:id/:page/:action', :controller => 'wiki', :page => nil - map.connect 'roles/workflow/:id/:role_id/:tracker_id', :controller => 'roles', :action => 'workflow' - map.connect 'help/:ctrl/:page', :controller => 'help' - #map.connect ':controller/:action/:id/:sort_key/:sort_order' + map.connect 'wiki/:id/:page/:action', :controller => 'wiki', :page => nil + map.connect 'roles/workflow/:id/:role_id/:tracker_id', :controller => 'roles', :action => 'workflow' + map.connect 'help/:ctrl/:page', :controller => 'help' + #map.connect ':controller/:action/:id/:sort_key/:sort_order' map.connect 'issues/:issue_id/relations/:action/:id', :controller => 'issue_relations' map.connect 'projects/:project_id/boards/:action/:id', :controller => 'boards' @@ -20,7 +20,7 @@ ActionController::Routing::Routes.draw do |map| # Allow downloading Web Service WSDL as a file with an extension # instead of a file named 'wsdl' map.connect ':controller/service.wsdl', :action => 'wsdl' - + # Install the default route as the lowest priority. map.connect ':controller/:action/:id' diff --git a/config/settings.yml b/config/settings.yml index 0ab1bc184..3bce49167 100644 --- a/config/settings.yml +++ b/config/settings.yml @@ -1,82 +1,82 @@ -# redMine - project management software -# Copyright (C) 2006-2007 Jean-Philippe Lang -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - - -# DO NOT MODIFY THIS FILE !!! -# Settings can be defined through the application in Admin -> Settings - -app_title: - default: Redmine -app_subtitle: - default: Project management -welcome_text: - default: -login_required: - default: 0 -self_registration: - default: 1 -lost_password: - default: 1 -attachment_max_size: - format: int - default: 5120 -issues_export_limit: - format: int - default: 500 -mail_from: - default: redmine@somenet.foo -text_formatting: - default: textile -wiki_compression: - default: "" -default_language: - default: en -host_name: - default: localhost:3000 -feeds_limit: - format: int - default: 15 -autofetch_changesets: - default: 1 -sys_api_enabled: - default: 0 -commit_ref_keywords: - default: 'refs,references,IssueID' -commit_fix_keywords: - default: 'fixes,closes' -commit_fix_status_id: - format: int - default: 0 -# autologin duration in days -# 0 means autologin is disabled -autologin: - format: int - default: 0 -# date format -# 0: language based -# 1: ISO format -date_format: - format: int - default: 0 -cross_project_issue_relations: - default: 0 -notified_events: - serialized: true - default: -- - - issue_added - - issue_updated +# redMine - project management software +# Copyright (C) 2006-2007 Jean-Philippe Lang +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + + +# DO NOT MODIFY THIS FILE !!! +# Settings can be defined through the application in Admin -> Settings + +app_title: + default: Redmine +app_subtitle: + default: Project management +welcome_text: + default: +login_required: + default: 0 +self_registration: + default: 1 +lost_password: + default: 1 +attachment_max_size: + format: int + default: 5120 +issues_export_limit: + format: int + default: 500 +mail_from: + default: redmine@somenet.foo +text_formatting: + default: textile +wiki_compression: + default: "" +default_language: + default: en +host_name: + default: localhost:3000 +feeds_limit: + format: int + default: 15 +autofetch_changesets: + default: 1 +sys_api_enabled: + default: 0 +commit_ref_keywords: + default: 'refs,references,IssueID' +commit_fix_keywords: + default: 'fixes,closes' +commit_fix_status_id: + format: int + default: 0 +# autologin duration in days +# 0 means autologin is disabled +autologin: + format: int + default: 0 +# date format +# 0: language based +# 1: ISO format +date_format: + format: int + default: 0 +cross_project_issue_relations: + default: 0 +notified_events: + serialized: true + default: -- + - issue_added + - issue_updated \ No newline at end of file