Andreas/tracks
1
0
Fork 0
mirror of https://github.com/TracksApp/tracks.git synced 2026-01-09 10:48:50 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Upgrade to rails 1.1.6.

Browse source 
Clean up a couple of minor errors/warnings.



git-svn-id: http://www.rousette.org.uk/svn/tracks-repos/trunk@307 a4c988fc-2ded-0310-b66e-134b36920a42
This commit is contained in:
lukemelia 2006-08-11 02:53:59 +00:00
parent a36b736c6a
commit 03f4de5703
18 changed files with 89 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

2
tracks/app/helpers/deferred_helper.rb Normal file
View file

@ -0,0 +1,2 @@
module DeferredHelper
end

6
tracks/app/views/shared/_add_new_item_form.rhtml
View file

@ -6,15 +6,15 @@
@selected_project = nil
when "project"
add_string = "Add a next action in this project »"
@selected_context = @contexts[0].id
@selected_context = @contexts[0].id unless @contexts.empty?
@selected_project = @project.id
when "deferred"
add_string = "Add a deferred action »"
@selected_context = @contexts[0].id
@selected_context = @contexts[0].id unless @contexts.empty?
@selected_project = nil
else
add_string = "Add a next action »"
@selected_context = @contexts[0].id
@selected_context = @contexts[0].id unless @contexts.empty?
@selected_project = nil
end
%>

2
tracks/app/views/shared/_new_action_form.rhtml
View file

@ -1,5 +1,5 @@
<%
@selected_context = @contexts[0].id
@selected_context = @contexts[0].id unless @contexts.empty?
@selected_project = nil
case controller.controller_name
when "context"

5
tracks/vendor/rails/actionmailer/CHANGELOG vendored
View file

@ -1,3 +1,8 @@
*1.2.5* (August 10th, 2006)
* Depend on Action Pack 1.12.5
*1.2.4* (August 8th, 2006)
* Backport of documentation enhancements. [Kevin Clark, Marcel Molina Jr]

2
tracks/vendor/rails/actionmailer/lib/action_mailer/version.rb vendored
View file

@ -2,7 +2,7 @@ module ActionMailer
module VERSION #:nodoc:
MAJOR = 1
MINOR = 2
TINY = 4
TINY = 5
STRING = [MAJOR, MINOR, TINY].join('.')
end

2
tracks/vendor/rails/actionmailer/rakefile vendored
View file

@ -54,7 +54,7 @@ spec = Gem::Specification.new do |s|
s.rubyforge_project = "actionmailer"
s.homepage = "http://www.rubyonrails.org"
s.add_dependency('actionpack', '= 1.12.4' + PKG_BUILD)
s.add_dependency('actionpack', '= 1.12.5' + PKG_BUILD)
s.has_rdoc = true
s.requirements << 'none'

5
tracks/vendor/rails/actionpack/CHANGELOG vendored
View file

@ -1,3 +1,8 @@
*1.12.5* (August 10th, 2006)
* Updated security fix
*1.12.4* (August 8th, 2006)
* Documentation fix: integration test scripts don't require integration_test. #4914 [Frederick Ros <sl33p3r@free.fr>]

4
tracks/vendor/rails/actionpack/README vendored
View file

@ -469,7 +469,3 @@ And as Jim from Rake says:
For other information, feel free to ask on the ruby-talk mailing list (which
is mirrored to comp.lang.ruby) or contact mailto:david@loudthinking.com.
...

50
tracks/vendor/rails/actionpack/filler.txt vendored Normal file
View file

@ -0,0 +1,50 @@
abCdefGhIjklmNopQrstuVWxyz
abcdeFGHIjklmnOpqrstuvwXyz
abcdeFghijKlmNopqrStUVWxYz
AbCdefghIJklmNopQRsTUvwXyz
abCdefgHijkLmnopqrstuVWxyZ
abCDEfgHijklMNOpQrStUVWXyZ
AbCdefGhiJklmNOpQRsTuvwxyz
abcdefGhijKlMnopQrsTUVwxyz
abcdEfgHiJkLmnopQrStUVwXyz
abcdefghijklMNopqRStuvWxyz
AbcDeFghIJkLmnopQrsTuvwXyZ
abcdefGhiJKLmNOpQRSTuvwXYz
AbcdefghijKlmnOpqrStuvWXyZ
abcDEfghIJklMnOpqrstuvWxyz
abcdefGhijklMnopqrstuvwxYz
abcDeFGhijKlmnoPqRstuVwXyz
AbcDefghijklmnopQrsTUvWXYz
abcdefGhijKlmnOpqrstUvWxyz
aBCdEfGhiJklmnOpqrstuvwXYZ
aBcdefGhijklMnOpQrStuvwxYZ
abcdeFghijklMnopqrStuvwxYZ
aBcdefghiJklmnOPqrstuvwxyz
abcDEFghijKLmNoPqrsTUvwxYz
aBCdEfghijKlmNOpqrstUvwxyz
abCDEfghijklMnopqrstuvwXYz
aBcDeFghijklmnopqRstuvwxyz
abcdEfghIjkLMNOpqRstuvwxYz
ABcDefGHijKlmNopQrstUvwxYz
abcDefGhijklMnOPQrstuVwXyZ
AbcdefghijKlmNoPqrsTuvwXYZ
AbcdeFGhiJklmnopQrsTuvWxYz
AbCdEfgHiJKlMNoPQrsTUVwXyz
aBcDefGhijkLMnOpqrsTuVwxyz
abcdeFGhijKlmNOPqrStuVWxyz
AbCdEfghijKlmnopqrstuvwxyz
AbcdefGHijkLmnOPQRSTuVwXyZ
aBcdeFghiJkLMnoPqrSTuvwxyZ
abCDeFghijKlmnOpqRstUvwxyz
aBcDefghIjKLMnoPQrStuVwXyz
abcDEfgHijkLmNopqrstUVwXyz
AbCDeFghijKLmnopQrStuvwxyz
abcDefGhIjKlmnOPQrsTuvWxyz
ABCdEfghijklmnopqrSTuVwxYz
ABcdEfGhijKlmnOpqRsTUVWxyZ
ABCdeFgHIjklMNOpqrstUvwxYz
aBcdefghiJkLMNopqrstuVWxYz
abCdEFgHIjKlmnopqrsTUVwXYZ
AbcdefGhijklmnopQRsTuVwxYZ
abcdeFgHijklMNopQrstuvWxyz
abCdeFgHijKlmnOpqrsTuvwXyz

10
tracks/vendor/rails/actionpack/lib/action_controller/routing.rb vendored
View file

@ -218,11 +218,7 @@ module ActionController
expr = "::#{controller.split('/').collect {|c| c.camelize}.join('::')}Controller"
g.result :controller, expr, true
end
def file_kinds(kind)
((@file_kinds ||= []) << kind).uniq! || @file_kinds
end
def traverse_to_controller(segments, start_at = 0)
mod = ::Object
length = segments.length
@ -232,7 +228,6 @@ module ActionController
return nil unless /\A[A-Za-z][A-Za-z\d_]*\Z/ =~ (segment = segments[index])
index += 1
file_kinds :app
mod_name = segment.camelize
controller_name = "#{mod_name}Controller"
path_suffix = File.join(segments[start_at..(index - 1)])
@ -273,7 +268,8 @@ module ActionController
$LOAD_PATH.select do |base|
base = File.expand_path(base)
extended_root = File.expand_path(RAILS_ROOT)
base.match(/\A#{Regexp.escape(extended_root)}\/*#{file_kinds(:lib) * '|'}/) || base =~ %r{rails-[\d.]+/builtin}
# Exclude all paths that are not nested within app, lib, or components.
base.match(/\A#{Regexp.escape(extended_root)}\/*(app|lib|components)\/[a-z]/) || base =~ %r{rails-[\d.]+/builtin}
end
else
$LOAD_PATH

2
tracks/vendor/rails/actionpack/lib/action_pack/version.rb vendored
View file

@ -2,7 +2,7 @@ module ActionPack #:nodoc:
module VERSION #:nodoc:
MAJOR = 1
MINOR = 12
TINY = 4
TINY = 5
STRING = [MAJOR, MINOR, TINY].join('.')
end

2
tracks/vendor/rails/actionpack/rakefile vendored
View file

@ -77,7 +77,7 @@ spec = Gem::Specification.new do |s|
s.require_path = 'lib'
s.autorequire = 'action_controller'
s.files = [ "filler", "Rakefile", "install.rb", "README", "RUNNING_UNIT_TESTS", "CHANGELOG", "MIT-LICENSE", "examples/.htaccess" ]
s.files = [ "Rakefile", "install.rb", "filler.txt", "README", "RUNNING_UNIT_TESTS", "CHANGELOG", "MIT-LICENSE", "examples/.htaccess" ]
dist_dirs.each do |dir|
s.files = s.files + Dir.glob( "#{dir}/**/*" ).delete_if { |item| item.include?( "\.svn" ) }
end

5
tracks/vendor/rails/actionwebservice/CHANGELOG vendored
View file

@ -1,3 +1,8 @@
*1.1.6* (August 10th, 2006)
* Rely on Action Pack 1.12.5
*1.1.5* (August 8th, 2006)
* Rely on Action Pack 1.12.4 and Active Record 1.14.4

2
tracks/vendor/rails/actionwebservice/Rakefile vendored
View file

@ -71,7 +71,7 @@ spec = Gem::Specification.new do |s|
s.rubyforge_project = "aws"
s.homepage = "http://www.rubyonrails.org"
s.add_dependency('actionpack', '= 1.12.4' + PKG_BUILD)
s.add_dependency('actionpack', '= 1.12.5' + PKG_BUILD)
s.add_dependency('activerecord', '= 1.14.4' + PKG_BUILD)
s.has_rdoc = true

2
tracks/vendor/rails/actionwebservice/lib/action_web_service/version.rb vendored
View file

@ -2,7 +2,7 @@ module ActionWebService
module VERSION #:nodoc:
MAJOR = 1
MINOR = 1
TINY = 5
TINY = 6
STRING = [MAJOR, MINOR, TINY].join('.')
end

5
tracks/vendor/rails/railties/CHANGELOG vendored
View file

@ -1,3 +1,8 @@
*1.1.6* (August 10th, 2006)
* Additional security patch
*1.1.5* (August 8th, 2006)
* Mention in docs that config.frameworks doesn't work when getting Rails via Gems. #4857 [Alisdair McDiarmid]

6
tracks/vendor/rails/railties/Rakefile vendored
View file

@ -280,9 +280,9 @@ spec = Gem::Specification.new do |s|
s.add_dependency('rake', '>= 0.7.1')
s.add_dependency('activesupport', '= 1.3.1' + PKG_BUILD)
s.add_dependency('activerecord', '= 1.14.4' + PKG_BUILD)
s.add_dependency('actionpack', '= 1.12.4' + PKG_BUILD)
s.add_dependency('actionmailer', '= 1.2.4' + PKG_BUILD)
s.add_dependency('actionwebservice', '= 1.1.5' + PKG_BUILD)
s.add_dependency('actionpack', '= 1.12.5' + PKG_BUILD)
s.add_dependency('actionmailer', '= 1.2.5' + PKG_BUILD)
s.add_dependency('actionwebservice', '= 1.1.6' + PKG_BUILD)
s.rdoc_options << '--exclude' << '.'
s.has_rdoc = false

2
tracks/vendor/rails/railties/lib/rails/version.rb vendored
View file

@ -2,7 +2,7 @@ module Rails
module VERSION #:nodoc:
MAJOR = 1
MINOR = 1
TINY = 5
TINY = 6
STRING = [MAJOR, MINOR, TINY].join('.')
end