ChiliProject is not maintained anymore. Please be advised that there will be no more updates.

We do not recommend that you setup new ChiliProject instances and we urge all existing users to migrate their data to a maintained system, e.g. Redmine. We will provide a migration script later. In the meantime, you can use the instructions by Christian Daehn.

rails2-git-mbox.diff

Toshi MARUYAMA, 2013-07-14 02:08 am

Download (155.3 kB)

 
b/vendor/plugins/rfpdf/init.rb
8 8
require 'rfpdf'
9 9

  
10 10
# Mime::Type.register "application/pdf", :pdf
11
ActionView::Template::register_template_handler 'rfpdf', RFPDF::TemplateHandlers::Base
11
# ActionView::Template::register_template_handler 'rfpdf', RFPDF::TemplateHandlers::Base
12 12

  
b/vendor/plugins/rfpdf/lib/rfpdf/template_handlers/base.rb
1 1
#-- encoding: UTF-8
2 2
module RFPDF
3 3
  module TemplateHandlers
4
    class Base < ::ActionView::TemplateHandlers::ERB
4
    # class Base < ::ActionView::TemplateHandlers::ERB
5 5
      
6
      def compile(template)
7
        src = "_rfpdf_compile_setup;" + super
8
      end
9
    end
6
    #   def compile(template)
7
    #     src = "_rfpdf_compile_setup;" + super
8
    #   end
9
    # end
10 10
  end
11 11
end
12 12

  
13
- 
b/app/models/mailer.rb
482 482
  end
483 483

  
484 484
  def mylogger
485
    RAILS_DEFAULT_LOGGER
485
    Rails.logger
486 486
  end
487 487
end
488 488

  
b/extra/sample_plugin/init.rb
15 15
# Redmine sample plugin
16 16
require 'redmine'
17 17

  
18
RAILS_DEFAULT_LOGGER.info 'Starting Example plugin for RedMine'
18
Rails.logger.info 'Starting Example plugin for RedMine'
19 19

  
20 20
Redmine::Plugin.register :sample_plugin do
21 21
  name 'Example plugin'
b/lib/redmine/imap.rb
50 50
      private
51 51

  
52 52
      def logger
53
        RAILS_DEFAULT_LOGGER
53
        Rails.logger
54 54
      end
55 55
    end
56 56
  end
b/lib/redmine/pop3.rb
64 64
      private
65 65

  
66 66
      def logger
67
        RAILS_DEFAULT_LOGGER
67
        Rails.logger
68 68
      end
69 69
    end
70 70
  end
b/lib/redmine/scm/adapters/abstract_adapter.rb
188 188
        end
189 189

  
190 190
        def self.logger
191
          RAILS_DEFAULT_LOGGER
191
          Rails.logger
192 192
        end
193 193

  
194 194
        def self.shellout(cmd, &block)
195
- 
b/config/database.yml.example
7 7
  username: root
8 8
  password:
9 9
  encoding: utf8
10
 
10

  
11 11
development:
12 12
  adapter: mysql
13 13
  database: chiliproject_development
14
- 
b/lib/tasks/extract_fixtures.rake
35 35
      }.to_yaml
36 36
    end
37 37
  end
38
end
38
end
39
- 
b/app/models/attachment.rb
56 56
  end
57 57

  
58 58
  cattr_accessor :storage_path
59
  @@storage_path = Redmine::Configuration['attachments_storage_path'] || "#{RAILS_ROOT}/files"
59
  @@storage_path = Redmine::Configuration['attachments_storage_path'] || Rails.root.join("files")
60 60

  
61 61
  def validate
62 62
    if self.filesize > Setting.attachment_max_size.to_i.kilobytes
b/app/models/setting.rb
72 72
                  TIS-620)
73 73

  
74 74
  cattr_accessor :available_settings
75
  @@available_settings = YAML::load(File.open("#{RAILS_ROOT}/config/settings.yml"))
75
  @@available_settings = YAML::load(File.open(Rails.root.join("config", "settings.yml")))
76 76
  Redmine::Plugin.all.each do |plugin|
77 77
    next unless plugin.settings
78 78
    @@available_settings["plugin_#{plugin.id}"] = {'default' => plugin.settings[:default], 'serialized' => true}
b/lib/generators/chiliproject_plugin_controller/chiliproject_plugin_controller_generator.rb
28 28
  end
29 29

  
30 30
  def destination_root
31
    File.join(RAILS_ROOT, plugin_path)
31
    Rails.root.join(plugin_path)
32 32
  end
33 33

  
34 34
  def manifest
b/lib/generators/chiliproject_plugin_model/chiliproject_plugin_model_generator.rb
28 28
  end
29 29

  
30 30
  def destination_root
31
    File.join(RAILS_ROOT, plugin_path)
31
    Rails.root.join(plugin_path)
32 32
  end
33 33

  
34 34
  def manifest
b/lib/redmine/i18n.rb
72 72
    end
73 73

  
74 74
    def valid_languages
75
      @@valid_languages ||= Dir.glob(File.join(RAILS_ROOT, 'config', 'locales', '*.yml')).collect {|f| File.basename(f).split('.').first}.collect(&:to_sym)
75
      @@valid_languages ||= Dir.glob(Rails.root.join('config', 'locales', '*.yml')).collect {|f| File.basename(f).split('.').first}.collect(&:to_sym)
76 76
    end
77 77

  
78 78
    def find_language(lang)
b/lib/redmine/plugin.rb
85 85
      p.name(id.to_s.humanize) if p.name.nil?
86 86
      # Adds plugin locales if any
87 87
      # YAML translation files should be found under <plugin>/config/locales/
88
      ::I18n.load_path += Dir.glob(File.join(RAILS_ROOT, 'vendor', 'plugins', id.to_s, 'config', 'locales', '*.yml'))
88
      ::I18n.load_path += Dir.glob(Rails.root.join('vendor', 'plugins', id.to_s, 'config', 'locales', '*.yml'))
89 89
      registered_plugins[id] = p
90 90

  
91 91
      # If there are plugins waiting for us to be loaded, we try loading those, again
b/lib/redmine/scm/adapters/abstract_adapter.rb
53 53

  
54 54
          def shell_quote(str)
55 55
            if Redmine::Platform.mswin?
56
              '"' + str.gsub(/"/, '\\"') + '"'
56
              '"' + str.to_s.gsub(/"/, '\\"') + '"'
57 57
            else
58
              "'" + str.gsub(/'/, "'\"'\"'") + "'"
58
              "'" + str.to_s.gsub(/'/, "'\"'\"'") + "'"
59 59
            end
60 60
          end
61 61
        end
......
195 195
          logger.debug "Shelling out: #{strip_credential(cmd)}" if logger && logger.debug?
196 196
          if Rails.env == 'development'
197 197
            # Capture stderr when running in dev environment
198
            cmd = "#{cmd} 2>>#{RAILS_ROOT}/log/scm.stderr.log"
198
            cmd = "#{cmd} 2>>#{shell_quote Rails.root.join('log', 'scm.stderr.log')}"
199 199
          end
200 200
          begin
201 201
            if RUBY_VERSION < '1.9'
b/lib/redmine/views/my_page/block.rb
17 17
    module MyPage
18 18
      module Block
19 19
        def self.additional_blocks
20
          @@additional_blocks ||= Dir.glob("#{RAILS_ROOT}/vendor/plugins/*/app/views/my/blocks/_*.{rhtml,erb}").inject({}) do |h,file|
20
          @@additional_blocks ||= Dir.glob(Rails.root.join("vendor/plugins/*/app/views/my/blocks/_*.{rhtml,erb}")).inject({}) do |h,file|
21 21
            name = File.basename(file).split('.').first.gsub(/^_/, '')
22 22
            h[name] = name.to_sym
23 23
            h
b/lib/tasks/extract_fixtures.rake
21 21
  ActiveRecord::Base.establish_connection
22 22
  (ActiveRecord::Base.connection.tables - skip_tables).each do |table_name|
23 23
    i = "000"
24
    File.open("#{RAILS_ROOT}/#{table_name}.yml", 'w' ) do |file|
24
    File.open(Rails.root.join("#{table_name}.yml"), 'w' ) do |file|
25 25
      data = ActiveRecord::Base.connection.select_all(sql % table_name)
26 26
      file.write data.inject({}) { |hash, record|
27 27

  
b/lib/tasks/initializers.rake
15 15
desc 'Generates a configuration file for cookie store sessions.'
16 16

  
17 17
file 'config/initializers/session_store.rb' do
18
  path = File.join(RAILS_ROOT, 'config', 'initializers', 'session_store.rb')
18
  path = Rails.root.join('config', 'initializers', 'session_store.rb')
19 19
  secret = ActiveSupport::SecureRandom.hex(40)
20 20
  File.open(path, 'w') do |f|
21 21
    f.write <<"EOF"
b/test/fixtures/repositories.yml
1 1
---
2 2
repositories_001:
3 3
  project_id: 1
4
  url: file:///<%= RAILS_ROOT.gsub(%r{config\/\.\.}, '') %>/tmp/test/subversion_repository
4
  url: file://<%= Rails.root.join('tmp/test/subversion_repository') %>
5 5
  id: 10
6
  root_url: file:///<%= RAILS_ROOT.gsub(%r{config\/\.\.}, '') %>/tmp/test/subversion_repository
6
  root_url: file://<%= Rails.root.join('tmp/test/subversion_repository') %>
7 7
  password: ""
8 8
  login: ""
9 9
  type: Subversion
b/test/functional/application_controller_test.rb
28 28

  
29 29
  # check that all language files are valid
30 30
  def test_localization
31
    lang_files_count = Dir["#{RAILS_ROOT}/config/locales/*.yml"].size
31
    lang_files_count = Dir[Rails.root.join("config", "locales", "*.yml")].size
32 32
    assert_equal lang_files_count, valid_languages.size
33 33
    valid_languages.each do |lang|
34 34
      assert set_language_if_valid(lang)
b/test/functional/attachments_controller_test.rb
27 27
    @controller = AttachmentsController.new
28 28
    @request    = ActionController::TestRequest.new
29 29
    @response   = ActionController::TestResponse.new
30
    Attachment.storage_path = "#{RAILS_ROOT}/test/fixtures/files"
30
    Attachment.storage_path = Rails.root.join("test", "fixtures", "files")
31 31
    User.current = nil
32 32
  end
33 33

  
b/test/functional/repositories_bazaar_controller_test.rb
20 20
class RepositoriesBazaarControllerTest < ActionController::TestCase
21 21
  fixtures :projects, :users, :roles, :members, :member_roles, :repositories, :enabled_modules
22 22

  
23
  # No '..' in the repository path
24
  REPOSITORY_PATH = RAILS_ROOT.gsub(%r{config\/\.\.}, '') + '/tmp/test/bazaar_repository'
23
  REPOSITORY_PATH = Rails.root.join('tmp/test/bazaar_repository')
25 24

  
26 25
  def setup
27 26
    @controller = RepositoriesController.new
b/test/functional/repositories_cvs_controller_test.rb
20 20
class RepositoriesCvsControllerTest < ActionController::TestCase
21 21
  fixtures :projects, :users, :roles, :members, :member_roles, :repositories, :enabled_modules
22 22

  
23
  # No '..' in the repository path
24
  REPOSITORY_PATH = RAILS_ROOT.gsub(%r{config\/\.\.}, '') + '/tmp/test/cvs_repository'
23
  REPOSITORY_PATH = Rails.root.join('tmp/test/cvs_repository').to_s
25 24
  REPOSITORY_PATH.gsub!(/\//, "\\") if Redmine::Platform.mswin?
26 25
  # CVS module
27 26
  MODULE_NAME = 'test'
b/test/functional/repositories_darcs_controller_test.rb
20 20
class RepositoriesDarcsControllerTest < ActionController::TestCase
21 21
  fixtures :projects, :users, :roles, :members, :member_roles, :repositories, :enabled_modules
22 22

  
23
  # No '..' in the repository path
24
  REPOSITORY_PATH = RAILS_ROOT.gsub(%r{config\/\.\.}, '') + '/tmp/test/darcs_repository'
23
  REPOSITORY_PATH = Rails.root.join('tmp/test/darcs_repository')
25 24
  PRJ_ID = 3
26 25

  
27 26
  def setup
b/test/functional/repositories_filesystem_controller_test.rb
20 20
class RepositoriesFilesystemControllerTest < ActionController::TestCase
21 21
  fixtures :projects, :users, :roles, :members, :member_roles, :repositories, :enabled_modules
22 22

  
23
  # No '..' in the repository path
24
  REPOSITORY_PATH = RAILS_ROOT.gsub(%r{config\/\.\.}, '') + '/tmp/test/filesystem_repository'
23
  REPOSITORY_PATH = Rails.root.join('tmp/test/filesystem_repository')
25 24
  PRJ_ID = 3
26 25

  
27 26
  def setup
b/test/functional/repositories_git_controller_test.rb
20 20
class RepositoriesGitControllerTest < ActionController::TestCase
21 21
  fixtures :projects, :users, :roles, :members, :member_roles, :repositories, :enabled_modules
22 22

  
23
  # No '..' in the repository path
24
  REPOSITORY_PATH = RAILS_ROOT.gsub(%r{config\/\.\.}, '') + '/tmp/test/git_repository'
23
  REPOSITORY_PATH = Rails.root.join('tmp/test/git_repository').to_s
25 24
  REPOSITORY_PATH.gsub!(/\//, "\\") if Redmine::Platform.mswin?
26 25

  
27 26
  def setup
b/test/functional/repositories_mercurial_controller_test.rb
21 21
  fixtures :projects, :users, :roles, :members, :member_roles, :repositories, :enabled_modules
22 22

  
23 23
  # No '..' in the repository path
24
  REPOSITORY_PATH = RAILS_ROOT.gsub(%r{config\/\.\.}, '') + '/tmp/test/mercurial_repository'
24
  REPOSITORY_PATH = Rails.root.join('tmp/test/mercurial_repository')
25 25
  CHAR_1_HEX = "\xc3\x9c"
26 26
  PRJ_ID = 3
27 27

  
b/test/test_helper.rb
20 20
require File.expand_path(File.dirname(__FILE__) + "/../config/environment")
21 21
require 'test_help'
22 22
require File.expand_path(File.dirname(__FILE__) + '/helper_testcase')
23
require File.join(RAILS_ROOT,'test', 'mocks', 'open_id_authentication_mock.rb')
23
require Rails.root.join('test', 'mocks', 'open_id_authentication_mock.rb')
24 24

  
25 25
require File.expand_path(File.dirname(__FILE__) + '/object_daddy_helpers')
26 26
include ObjectDaddyHelpers
......
85 85

  
86 86
  # Use a temporary directory for attachment related tests
87 87
  def set_tmp_attachments_directory
88
    Dir.mkdir "#{RAILS_ROOT}/tmp/test" unless File.directory?("#{RAILS_ROOT}/tmp/test")
89
    Dir.mkdir "#{RAILS_ROOT}/tmp/test/attachments" unless File.directory?("#{RAILS_ROOT}/tmp/test/attachments")
90
    Attachment.storage_path = "#{RAILS_ROOT}/tmp/test/attachments"
88
    p = Rails.root.join("tmp", "test", "attachments")
89
    FileUtils.mkdir_p(p)
90
    Attachment.storage_path = p.to_s
91 91
  end
92 92

  
93 93
  def with_settings(options, &block)
......
114 114

  
115 115
  # Returns the path to the test +vendor+ repository
116 116
  def self.repository_path(vendor)
117
    File.join(RAILS_ROOT.gsub(%r{config\/\.\.}, ''), "/tmp/test/#{vendor.downcase}_repository")
117
    Rails.root.join("tmp/test/#{vendor.downcase}_repository").to_s
118 118
  end
119 119

  
120 120
  # Returns the url of the subversion test repository
b/test/unit/changeset_test.rb
224 224

  
225 225
  def test_comments_should_be_converted_to_utf8
226 226
      proj = Project.find(3)
227
      str = File.read("#{RAILS_ROOT}/test/fixtures/encoding/iso-8859-1.txt")
227
      str = File.read(Rails.root.join("test/fixtures/encoding/iso-8859-1.txt"))
228 228
      r = Repository::Bazaar.create!(
229 229
            :project => proj, :url => '/tmp/test/bazaar',
230 230
            :log_encoding => 'ISO-8859-1' )
......
240 240

  
241 241
  def test_invalid_utf8_sequences_in_comments_should_be_replaced_latin1
242 242
      proj = Project.find(3)
243
      str = File.read("#{RAILS_ROOT}/test/fixtures/encoding/iso-8859-1.txt")
243
      str = File.read(Rails.root.join("test/fixtures/encoding/iso-8859-1.txt"))
244 244
      r = Repository::Bazaar.create!(
245 245
            :project => proj,
246 246
            :url => '/tmp/test/bazaar',
b/test/unit/helpers/repository_helper_test.rb
85 85

  
86 86
  def test_to_utf8_for_repositories_invalid_utf8_sequences_should_be_stripped
87 87
    with_settings :repositories_encodings => '' do
88
      s1 = File.read("#{RAILS_ROOT}/test/fixtures/encoding/iso-8859-1.txt")
88
      s1 = File.read(Rails.root.join('test/fixtures/encoding/iso-8859-1.txt'))
89 89
      str = to_utf8_for_repositories(s1)
90 90
      if str.respond_to?(:force_encoding)
91 91
        assert_equal "Texte encod? en ISO-8859-1.", str
b/test/unit/lib/redmine/hook_test.rb
162 162
  end
163 163

  
164 164
  def view_hook_helper
165
    @view_hook_helper ||= TestHookHelperView.new(RAILS_ROOT + '/app/views')
165
    @view_hook_helper ||= TestHookHelperView.new(Rails.root.join('app', 'views').to_s)
166 166
  end
167 167
end
168 168

  
b/test/unit/lib/redmine/scm/adapters/bazaar_adapter_test.rb
18 18

  
19 19
  class BazaarAdapterTest < ActiveSupport::TestCase
20 20

  
21
    REPOSITORY_PATH = RAILS_ROOT.gsub(%r{config\/\.\.}, '') + '/tmp/test/bazaar_repository'
22
    REPOSITORY_PATH.gsub!(/\/+/, '/')
21
    REPOSITORY_PATH = Rails.root.join('tmp/test/bazaar_repository')
23 22

  
24 23
    if File.directory?(REPOSITORY_PATH)
25 24
      def setup
b/test/unit/lib/redmine/scm/adapters/cvs_adapter_test.rb
18 18

  
19 19
  class CvsAdapterTest < ActiveSupport::TestCase
20 20

  
21
    REPOSITORY_PATH = RAILS_ROOT.gsub(%r{config\/\.\.}, '') + '/tmp/test/cvs_repository'
21
    REPOSITORY_PATH = Rails.root.join('tmp/test/cvs_repository').to_s
22 22
    REPOSITORY_PATH.gsub!(/\//, "\\") if Redmine::Platform.mswin?
23 23
    MODULE_NAME = 'test'
24 24

  
b/test/unit/lib/redmine/scm/adapters/darcs_adapter_test.rb
18 18

  
19 19
  class DarcsAdapterTest < ActiveSupport::TestCase
20 20

  
21
    REPOSITORY_PATH = RAILS_ROOT.gsub(%r{config\/\.\.}, '') + '/tmp/test/darcs_repository'
21
    REPOSITORY_PATH = Rails.root.join('tmp/test/darcs_repository')
22 22

  
23 23
    if File.directory?(REPOSITORY_PATH)
24 24
      def setup
b/test/unit/lib/redmine/scm/adapters/filesystem_adapter_test.rb
17 17

  
18 18
class FilesystemAdapterTest < ActiveSupport::TestCase
19 19

  
20
  REPOSITORY_PATH = RAILS_ROOT.gsub(%r{config\/\.\.}, '') + '/tmp/test/filesystem_repository'
20
  REPOSITORY_PATH = Rails.root.join('tmp/test/filesystem_repository').to_s
21 21

  
22 22
  if File.directory?(REPOSITORY_PATH)
23 23
    def setup
b/test/unit/lib/redmine/scm/adapters/git_adapter_test.rb
20 20
  require 'mocha'
21 21

  
22 22
  class GitAdapterTest < ActiveSupport::TestCase
23
    REPOSITORY_PATH = RAILS_ROOT.gsub(%r{config\/\.\.}, '') + '/tmp/test/git_repository'
23
    REPOSITORY_PATH = Rails.root.join('tmp/test/git_repository')
24 24

  
25 25
    FELIX_UTF8 = "Felix Schäfer"
26 26
    FELIX_HEX  = "Felix Sch\xC3\xA4fer"
b/test/unit/lib/redmine/scm/adapters/mercurial_adapter_test.rb
22 22
    TEMPLATE_NAME = Redmine::Scm::Adapters::MercurialAdapter::TEMPLATE_NAME
23 23
    TEMPLATE_EXTENSION = Redmine::Scm::Adapters::MercurialAdapter::TEMPLATE_EXTENSION
24 24

  
25
    REPOSITORY_PATH = RAILS_ROOT.gsub(%r{config\/\.\.}, '') + '/tmp/test/mercurial_repository'
26

  
25
    REPOSITORY_PATH = Rails.root.join('tmp/test/mercurial_repository').to_s
27 26
    CHAR_1_HEX = "\xc3\x9c"
28 27

  
29 28
    if File.directory?(REPOSITORY_PATH)
b/test/unit/repository_bazaar_test.rb
16 16
class RepositoryBazaarTest < ActiveSupport::TestCase
17 17
  fixtures :projects
18 18

  
19
  # No '..' in the repository path
20
  REPOSITORY_PATH = RAILS_ROOT.gsub(%r{config\/\.\.}, '') + '/tmp/test/bazaar_repository'
21
  REPOSITORY_PATH.gsub!(/\/+/, '/')
19
  REPOSITORY_PATH = Rails.root.join('tmp/test/bazaar_repository')
22 20

  
23 21
  def setup
24 22
    @project = Project.find(3)
b/test/unit/repository_cvs_test.rb
16 16
class RepositoryCvsTest < ActiveSupport::TestCase
17 17
  fixtures :projects
18 18

  
19
  # No '..' in the repository path
20
  REPOSITORY_PATH = RAILS_ROOT.gsub(%r{config\/\.\.}, '') + '/tmp/test/cvs_repository'
19
  REPOSITORY_PATH = Rails.root.join('tmp/test/cvs_repository').to_s
21 20
  REPOSITORY_PATH.gsub!(/\//, "\\") if Redmine::Platform.mswin?
22 21
  # CVS module
23 22
  MODULE_NAME = 'test'
b/test/unit/repository_darcs_test.rb
16 16
class RepositoryDarcsTest < ActiveSupport::TestCase
17 17
  fixtures :projects
18 18

  
19
  # No '..' in the repository path
20
  REPOSITORY_PATH = RAILS_ROOT.gsub(%r{config\/\.\.}, '') + '/tmp/test/darcs_repository'
19
  REPOSITORY_PATH = Rails.root.join('tmp/test/darcs_repository')
21 20

  
22 21
  def setup
23 22
    @project = Project.find(3)
b/test/unit/repository_filesystem_test.rb
16 16
class RepositoryFilesystemTest < ActiveSupport::TestCase
17 17
  fixtures :projects
18 18

  
19
  # No '..' in the repository path
20
  REPOSITORY_PATH = RAILS_ROOT.gsub(%r{config\/\.\.}, '') + '/tmp/test/filesystem_repository'
19
  REPOSITORY_PATH = Rails.root.join('tmp/test/filesystem_repository')
21 20

  
22 21
  def setup
23 22
    @project = Project.find(3)
b/test/unit/repository_git_test.rb
16 16
class RepositoryGitTest < ActiveSupport::TestCase
17 17
  fixtures :projects, :repositories, :enabled_modules, :users, :roles
18 18

  
19
  # No '..' in the repository path
20
  REPOSITORY_PATH = RAILS_ROOT.gsub(%r{config\/\.\.}, '') + '/tmp/test/git_repository'
19
  REPOSITORY_PATH = Rails.root.join('tmp/test/git_repository').to_s
21 20
  REPOSITORY_PATH.gsub!(/\//, "\\") if Redmine::Platform.mswin?
22 21

  
23 22
  FELIX_HEX  = "Felix Sch\xC3\xA4fer"
b/test/unit/repository_mercurial_test.rb
16 16
class RepositoryMercurialTest < ActiveSupport::TestCase
17 17
  fixtures :projects
18 18

  
19
  # No '..' in the repository path
20
  REPOSITORY_PATH = RAILS_ROOT.gsub(%r{config\/\.\.}, '') + '/tmp/test/mercurial_repository'
21

  
19
  REPOSITORY_PATH = Rails.root.join('tmp/test/mercurial_repository')
22 20
  CHAR_1_HEX = "\xc3\x9c"
23 21

  
24 22
  def setup
b/vendor/plugins/open_id_authentication/README
24 24
  ./script/generate open_id_authentication_tables MigrationName
25 25
  ./script/generate upgrade_open_id_authentication_tables MigrationName
26 26

  
27
Alternatively, you can use the file-based store, which just relies on on tmp/openids being present in RAILS_ROOT. But be aware that this store only works if you have a single application server. And it's not safe to use across NFS. It's recommended that you use the database store if at all possible. To use the file-based store, you'll also have to add this line to your config/environment.rb:
27
Alternatively, you can use the file-based store, which just relies on on tmp/openids being present in Rails.root. But be aware that this store only works if you have a single application server. And it's not safe to use across NFS. It's recommended that you use the database store if at all possible. To use the file-based store, you'll also have to add this line to your config/environment.rb:
28 28

  
29 29
  OpenIdAuthentication.store = :file
30 30

  
b/vendor/plugins/rfpdf/lib/tcpdf.rb
83 83
  @@k_small_ratio = 2/3.0
84 84
  
85 85
  cattr_accessor :k_path_cache
86
  @@k_path_cache = File.join(RAILS_ROOT, 'tmp')
87
  
86
  @@k_path_cache = Rails.root.join('tmp')
87

  
88 88
  cattr_accessor :k_path_url_cache
89
  @@k_path_url_cache = File.join(RAILS_ROOT, 'tmp')
90
  
89
  @@k_path_url_cache = Rails.root.join('tmp')
90

  
91 91
  cattr_accessor :decoder
92 92
		
93 93
	attr_accessor :barcode
94
- 
b/app/models/mailer.rb
446 446
  def render_multipart(method_name, body)
447 447
    if Setting.plain_text_mail?
448 448
      content_type "text/plain"
449
      body render(:file => "#{method_name}.text.plain.rhtml", :body => body, :layout => 'mailer.text.plain.erb')
449
      body render(:file => "#{method_name}.text.plain.rhtml",
450
                  :body => body,
451
                  :layout => 'mailer.text.erb')
450 452
    else
451 453
      content_type "multipart/alternative"
452
      part :content_type => "text/plain", :body => render(:file => "#{method_name}.text.plain.rhtml", :body => body, :layout => 'mailer.text.plain.erb')
453
      part :content_type => "text/html", :body => render_message("#{method_name}.text.html.rhtml", body)
454
      part :content_type => "text/plain",
455
           :body => render(:file => "#{method_name}.text.plain.rhtml",
456
                           :body => body, :layout => 'mailer.text.erb')
457
      part :content_type => "text/html",
458
           :body => render_message("#{method_name}.text.html.rhtml", body)
454 459
    end
455 460
  end
456 461

  
b/app/models/mailer.rb
446 446
  def render_multipart(method_name, body)
447 447
    if Setting.plain_text_mail?
448 448
      content_type "text/plain"
449
      body render(:file => "#{method_name}.text.plain.rhtml",
449
      body render(:file => "#{method_name}.text.erb",
450 450
                  :body => body,
451 451
                  :layout => 'mailer.text.erb')
452 452
    else
453 453
      content_type "multipart/alternative"
454 454
      part :content_type => "text/plain",
455
           :body => render(:file => "#{method_name}.text.plain.rhtml",
455
           :body => render(:file => "#{method_name}.text.erb",
456 456
                           :body => body, :layout => 'mailer.text.erb')
457 457
      part :content_type => "text/html",
458 458
           :body => render_message("#{method_name}.text.html.rhtml", body)
b/app/models/mailer.rb
455 455
           :body => render(:file => "#{method_name}.text.erb",
456 456
                           :body => body, :layout => 'mailer.text.erb')
457 457
      part :content_type => "text/html",
458
           :body => render_message("#{method_name}.text.html.rhtml", body)
458
           :body => render_message("#{method_name}.html.erb", body)
459 459
    end
460 460
  end
461 461

  
b/app/views/mailer/issue_add.text.erb
1 1
<%= l(:text_issue_added, :id => "##{@issue.id}", :author => @issue.author) %>
2 2

  
3 3
----------------------------------------
4
<%= render :partial => "issue_text_plain", :locals => { :issue => @issue, :issue_url => @issue_url } %>
4
<%= render :partial => "issue.text.erb", :locals => { :issue => @issue, :issue_url => @issue_url } %>
b/app/views/mailer/issue_edit.text.erb
6 6

  
7 7
<%= @journal.notes if @journal.notes? %>
8 8
----------------------------------------
9
<%= render :partial => "issue_text_plain", :locals => { :issue => @issue, :issue_url => @issue_url } %>
9
<%= render :partial => "issue.text.erb", :locals => { :issue => @issue, :issue_url => @issue_url } %>
10
- 
b/app/views/mailer/issue_add.html.erb
1 1
<%= l(:text_issue_added, :id => "##{@issue.id}", :author => h(@issue.author)) %>
2 2
<hr />
3
<%= render :partial => "issue_text_html", :locals => { :issue => @issue, :issue_url => @issue_url } %>
3
<%= render :partial => "issue.html.erb", :locals => { :issue => @issue, :issue_url => @issue_url } %>
b/app/views/mailer/issue_edit.html.erb
8 8

  
9 9
<%= textilizable(@journal, :notes, :only_path => false) %>
10 10
<hr />
11
<%= render :partial => "issue_text_html", :locals => { :issue => @issue, :issue_url => @issue_url } %>
11
<%= render :partial => "issue.html.erb", :locals => { :issue => @issue, :issue_url => @issue_url } %>
12
- 
b/test/functional/issues_controller_test.rb
53 53

  
54 54
    get :index
55 55
    assert_response :success
56
    assert_template 'index.rhtml'
56
    assert_template 'index'
57 57
    assert_not_nil assigns(:issues)
58 58
    assert_nil assigns(:project)
59 59
    assert_tag :tag => 'a', :content => /Can&#39;t print recipes/
......
69 69
    EnabledModule.delete_all("name = 'issue_tracking' AND project_id = 1")
70 70
    get :index
71 71
    assert_response :success
72
    assert_template 'index.rhtml'
72
    assert_template 'index'
73 73
    assert_not_nil assigns(:issues)
74 74
    assert_nil assigns(:project)
75 75
    assert_no_tag :tag => 'a', :content => /Can&#39;t print recipes/
......
80 80
    EnabledModule.delete_all("name = 'issue_tracking' AND project_id = 1")
81 81
    get :index
82 82
    assert_response :success
83
    assert_template 'index.rhtml'
83
    assert_template 'index'
84 84
    assert_not_nil assigns(:issues)
85 85
    assert_nil assigns(:project)
86 86
    assert_no_tag :tag => 'a', :content => /Can&#39;t print recipes/
......
91 91
    Setting.display_subprojects_issues = 0
92 92
    get :index, :project_id => 1
93 93
    assert_response :success
94
    assert_template 'index.rhtml'
94
    assert_template 'index'
95 95
    assert_not_nil assigns(:issues)
96 96
    assert_tag :tag => 'a', :content => /Can&#39;t print recipes/
97 97
    assert_no_tag :tag => 'a', :content => /Subproject issue/
......
101 101
    Setting.display_subprojects_issues = 1
102 102
    get :index, :project_id => 1
103 103
    assert_response :success
104
    assert_template 'index.rhtml'
104
    assert_template 'index'
105 105
    assert_not_nil assigns(:issues)
106 106
    assert_tag :tag => 'a', :content => /Can&#39;t print recipes/
107 107
    assert_tag :tag => 'a', :content => /Subproject issue/
......
113 113
    Setting.display_subprojects_issues = 1
114 114
    get :index, :project_id => 1
115 115
    assert_response :success
116
    assert_template 'index.rhtml'
116
    assert_template 'index'
117 117
    assert_not_nil assigns(:issues)
118 118
    assert_tag :tag => 'a', :content => /Can&#39;t print recipes/
119 119
    assert_tag :tag => 'a', :content => /Subproject issue/
......
123 123
  def test_index_with_project_and_default_filter
124 124
    get :index, :project_id => 1, :set_filter => 1
125 125
    assert_response :success
126
    assert_template 'index.rhtml'
126
    assert_template 'index'
127 127
    assert_not_nil assigns(:issues)
128 128

  
129 129
    query = assigns(:query)
......
138 138
      :op => {'tracker_id' => '='},
139 139
      :v => {'tracker_id' => ['1']}
140 140
    assert_response :success
141
    assert_template 'index.rhtml'
141
    assert_template 'index'
142 142
    assert_not_nil assigns(:issues)
143 143

  
144 144
    query = assigns(:query)
......
149 149
  def test_index_with_project_and_empty_filters
150 150
    get :index, :project_id => 1, :set_filter => 1, :fields => ['']
151 151
    assert_response :success
152
    assert_template 'index.rhtml'
152
    assert_template 'index'
153 153
    assert_not_nil assigns(:issues)
154 154

  
155 155
    query = assigns(:query)
......
161 161
  def test_index_with_query
162 162
    get :index, :project_id => 1, :query_id => 5
163 163
    assert_response :success
164
    assert_template 'index.rhtml'
164
    assert_template 'index'
165 165
    assert_not_nil assigns(:issues)
166 166
    assert_nil assigns(:issue_count_by_group)
167 167
  end
......
169 169
  def test_index_with_query_grouped_by_tracker
170 170
    get :index, :project_id => 1, :query_id => 6
171 171
    assert_response :success
172
    assert_template 'index.rhtml'
172
    assert_template 'index'
173 173
    assert_not_nil assigns(:issues)
174 174
    assert_not_nil assigns(:issue_count_by_group)
175 175
  end
......
177 177
  def test_index_with_query_grouped_by_list_custom_field
178 178
    get :index, :project_id => 1, :query_id => 9
179 179
    assert_response :success
180
    assert_template 'index.rhtml'
180
    assert_template 'index'
181 181
    assert_not_nil assigns(:issues)
182 182
    assert_not_nil assigns(:issue_count_by_group)
183 183
  end
184
- 
b/test/functional/issues_controller_test.rb
260 260
  def test_show_by_anonymous
261 261
    get :show, :id => 1
262 262
    assert_response :success
263
    assert_template 'show.rhtml'
263
    assert_template 'show'
264 264
    assert_not_nil assigns(:issue)
265 265
    assert_equal Issue.find(1), assigns(:issue)
266 266

  
267
- 
b/app/controllers/issues_controller.rb
75 75
      @issue_count_by_group = @query.issue_count_by_group
76 76

  
77 77
      respond_to do |format|
78
        format.html { render :template => 'issues/index.rhtml', :layout => !request.xhr? }
78
        format.html { render :template => 'issues/index', :layout => !request.xhr? }
79 79
        format.api
80 80
        format.atom { render_feed(@issues, :title => "#{@project || Setting.app_title}: #{l(:label_issue_plural)}") }
81 81
        format.csv  { send_data(issues_to_csv(@issues, @project), :type => 'text/csv; header=present', :filename => 'export.csv') }
......
83 83
      end
84 84
    else
85 85
      # Send html if the query is not valid
86
      render(:template => 'issues/index.rhtml', :layout => !request.xhr?)
86
      render(:template => 'issues/index', :layout => !request.xhr?)
87 87
    end
88 88
  rescue ActiveRecord::RecordNotFound
89 89
    render_404
......
100 100
    @priorities = IssuePriority.all
101 101
    @time_entry = TimeEntry.new(:issue => @issue, :project => @issue.project)
102 102
    respond_to do |format|
103
      format.html { render :template => 'issues/show.rhtml' }
103
      format.html { render :template => 'issues/show' }
104 104
      format.api
105 105
      format.atom { render :template => 'journals/index', :layout => false, :content_type => 'application/atom+xml' }
106 106
      format.pdf  { send_data(issue_to_pdf(@issue), :type => 'application/pdf', :filename => "#{@project.identifier}-#{@issue.id}.pdf") }
107
- 
... This diff was truncated because it exceeds the maximum size that can be displayed.