forked from OpenNeo/impress
upgrade to rails 3.0.18 - only patch upgrades, no API changes
This commit is contained in:
parent
45524c3d69
commit
86b58a0a35
29 changed files with 114 additions and 52 deletions
2
Gemfile
2
Gemfile
|
@ -1,6 +1,6 @@
|
|||
source 'http://rubygems.org'
|
||||
|
||||
gem 'rails', '3.0.5'
|
||||
gem 'rails', '3.0.18'
|
||||
#gem 'sqlite3-ruby', '~> 1.3.1', :require => 'sqlite3'
|
||||
|
||||
gem 'compass', '~> 0.10.1'
|
||||
|
|
77
Gemfile.lock
77
Gemfile.lock
|
@ -56,32 +56,32 @@ GEM
|
|||
open4
|
||||
Platform (0.4.0)
|
||||
abstract (1.0.0)
|
||||
actionmailer (3.0.5)
|
||||
actionpack (= 3.0.5)
|
||||
mail (~> 2.2.15)
|
||||
actionpack (3.0.5)
|
||||
activemodel (= 3.0.5)
|
||||
activesupport (= 3.0.5)
|
||||
actionmailer (3.0.18)
|
||||
actionpack (= 3.0.18)
|
||||
mail (~> 2.2.19)
|
||||
actionpack (3.0.18)
|
||||
activemodel (= 3.0.18)
|
||||
activesupport (= 3.0.18)
|
||||
builder (~> 2.1.2)
|
||||
erubis (~> 2.6.6)
|
||||
i18n (~> 0.4)
|
||||
rack (~> 1.2.1)
|
||||
rack-mount (~> 0.6.13)
|
||||
i18n (~> 0.5.0)
|
||||
rack (~> 1.2.5)
|
||||
rack-mount (~> 0.6.14)
|
||||
rack-test (~> 0.5.7)
|
||||
tzinfo (~> 0.3.23)
|
||||
activemodel (3.0.5)
|
||||
activesupport (= 3.0.5)
|
||||
activemodel (3.0.18)
|
||||
activesupport (= 3.0.18)
|
||||
builder (~> 2.1.2)
|
||||
i18n (~> 0.4)
|
||||
activerecord (3.0.5)
|
||||
activemodel (= 3.0.5)
|
||||
activesupport (= 3.0.5)
|
||||
arel (~> 2.0.2)
|
||||
i18n (~> 0.5.0)
|
||||
activerecord (3.0.18)
|
||||
activemodel (= 3.0.18)
|
||||
activesupport (= 3.0.18)
|
||||
arel (~> 2.0.10)
|
||||
tzinfo (~> 0.3.23)
|
||||
activeresource (3.0.5)
|
||||
activemodel (= 3.0.5)
|
||||
activesupport (= 3.0.5)
|
||||
activesupport (3.0.5)
|
||||
activeresource (3.0.18)
|
||||
activemodel (= 3.0.18)
|
||||
activesupport (= 3.0.18)
|
||||
activesupport (3.0.18)
|
||||
addressable (2.2.6)
|
||||
arel (2.0.10)
|
||||
bcrypt-ruby (2.1.4)
|
||||
|
@ -126,7 +126,7 @@ GEM
|
|||
activesupport
|
||||
builder
|
||||
http_parser.rb (0.5.3)
|
||||
i18n (0.6.0)
|
||||
i18n (0.5.0)
|
||||
jammit (0.5.4)
|
||||
closure-compiler (>= 0.1.0)
|
||||
yui-compressor (>= 0.9.1)
|
||||
|
@ -137,7 +137,7 @@ GEM
|
|||
mime-types (~> 1.16)
|
||||
treetop (~> 1.4.8)
|
||||
memcache-client (1.8.5)
|
||||
mime-types (1.17.2)
|
||||
mime-types (1.19)
|
||||
mini_magick (3.4)
|
||||
subexec (~> 0.2.1)
|
||||
msgpack (0.4.6)
|
||||
|
@ -159,21 +159,24 @@ GEM
|
|||
rack (>= 1.0.0)
|
||||
rack-test (0.5.7)
|
||||
rack (>= 1.0)
|
||||
rails (3.0.5)
|
||||
actionmailer (= 3.0.5)
|
||||
actionpack (= 3.0.5)
|
||||
activerecord (= 3.0.5)
|
||||
activeresource (= 3.0.5)
|
||||
activesupport (= 3.0.5)
|
||||
rails (3.0.18)
|
||||
actionmailer (= 3.0.18)
|
||||
actionpack (= 3.0.18)
|
||||
activerecord (= 3.0.18)
|
||||
activeresource (= 3.0.18)
|
||||
activesupport (= 3.0.18)
|
||||
bundler (~> 1.0)
|
||||
railties (= 3.0.5)
|
||||
railties (3.0.5)
|
||||
actionpack (= 3.0.5)
|
||||
activesupport (= 3.0.5)
|
||||
railties (= 3.0.18)
|
||||
railties (3.0.18)
|
||||
actionpack (= 3.0.18)
|
||||
activesupport (= 3.0.18)
|
||||
rake (>= 0.8.7)
|
||||
rdoc (~> 3.4)
|
||||
thor (~> 0.14.4)
|
||||
rake (0.9.2.2)
|
||||
rake (10.0.3)
|
||||
rdiscount (1.6.8)
|
||||
rdoc (3.12)
|
||||
json (~> 1.4)
|
||||
redis (2.2.2)
|
||||
redis-namespace (1.1.0)
|
||||
redis (< 3.0.0)
|
||||
|
@ -208,7 +211,7 @@ GEM
|
|||
rufus-scheduler (2.0.16)
|
||||
tzinfo (>= 0.3.23)
|
||||
sanitize (2.0.3)
|
||||
nokogiri (< 1.6, >= 1.4.4)
|
||||
nokogiri (>= 1.4.4, < 1.6)
|
||||
sinatra (1.2.8)
|
||||
rack (~> 1.1)
|
||||
tilt (>= 1.2.2, < 2.0)
|
||||
|
@ -216,10 +219,10 @@ GEM
|
|||
swf_converter (0.0.3)
|
||||
thor (0.14.6)
|
||||
tilt (1.3.3)
|
||||
treetop (1.4.10)
|
||||
treetop (1.4.12)
|
||||
polyglot
|
||||
polyglot (>= 0.3.1)
|
||||
tzinfo (0.3.31)
|
||||
tzinfo (0.3.35)
|
||||
uniform_notifier (1.0.2)
|
||||
vegas (0.1.8)
|
||||
rack (>= 1.0.0)
|
||||
|
@ -263,7 +266,7 @@ DEPENDENCIES
|
|||
openneo-auth-signatory (~> 0.1.0)
|
||||
parallel (~> 0.5.17)
|
||||
rack-fiber_pool
|
||||
rails (= 3.0.5)
|
||||
rails (= 3.0.18)
|
||||
rdiscount (~> 1.6.5)
|
||||
resque (~> 1.15.0)
|
||||
resque-retry (~> 0.1.0)
|
||||
|
|
|
@ -1,25 +1,84 @@
|
|||
body { line-height: 1.5; font-family: "Helvetica Neue", Arial, Helvetica, sans-serif; color: black; background: none; font-size: 10pt; }
|
||||
/* line 29, ../../../../../../.rvm/gems/ruby-1.9.3-p362/gems/compass-0.10.6/frameworks/blueprint/stylesheets/blueprint/_print.scss */
|
||||
body {
|
||||
line-height: 1.5;
|
||||
font-family: "Helvetica Neue", Arial, Helvetica, sans-serif;
|
||||
color: black;
|
||||
background: none;
|
||||
font-size: 10pt;
|
||||
}
|
||||
|
||||
.container { background: none; }
|
||||
/* line 52, ../../../../../../.rvm/gems/ruby-1.9.3-p362/gems/compass-0.10.6/frameworks/blueprint/stylesheets/blueprint/_print.scss */
|
||||
.container {
|
||||
background: none;
|
||||
}
|
||||
|
||||
hr { background: #cccccc; color: #cccccc; width: 100%; height: 2px; margin: 2em 0; padding: 0; border: none; }
|
||||
hr.space { background: white; color: white; }
|
||||
/* line 54, ../../../../../../.rvm/gems/ruby-1.9.3-p362/gems/compass-0.10.6/frameworks/blueprint/stylesheets/blueprint/_print.scss */
|
||||
hr {
|
||||
background: #cccccc;
|
||||
color: #cccccc;
|
||||
width: 100%;
|
||||
height: 2px;
|
||||
margin: 2em 0;
|
||||
padding: 0;
|
||||
border: none;
|
||||
}
|
||||
/* line 62, ../../../../../../.rvm/gems/ruby-1.9.3-p362/gems/compass-0.10.6/frameworks/blueprint/stylesheets/blueprint/_print.scss */
|
||||
hr.space {
|
||||
background: white;
|
||||
color: white;
|
||||
}
|
||||
|
||||
h1, h2, h3, h4, h5, h6 { font-family: "Helvetica Neue", Arial, Helvetica, sans-serif; }
|
||||
/* line 65, ../../../../../../.rvm/gems/ruby-1.9.3-p362/gems/compass-0.10.6/frameworks/blueprint/stylesheets/blueprint/_print.scss */
|
||||
h1, h2, h3, h4, h5, h6 {
|
||||
font-family: "Helvetica Neue", Arial, Helvetica, sans-serif;
|
||||
}
|
||||
|
||||
code { font-size: 0.9em; font-family: "andale mono", "lucida console", monospace; }
|
||||
/* line 67, ../../../../../../.rvm/gems/ruby-1.9.3-p362/gems/compass-0.10.6/frameworks/blueprint/stylesheets/blueprint/_print.scss */
|
||||
code {
|
||||
font-size: 0.9em;
|
||||
font-family: "andale mono", "lucida console", monospace;
|
||||
}
|
||||
|
||||
a img { border: none; }
|
||||
a:link, a:visited { background: transparent; font-weight: 700; text-decoration: underline; }
|
||||
/* line 72, ../../../../../../.rvm/gems/ruby-1.9.3-p362/gems/compass-0.10.6/frameworks/blueprint/stylesheets/blueprint/_print.scss */
|
||||
a img {
|
||||
border: none;
|
||||
}
|
||||
/* line 75, ../../../../../../.rvm/gems/ruby-1.9.3-p362/gems/compass-0.10.6/frameworks/blueprint/stylesheets/blueprint/_print.scss */
|
||||
a:link, a:visited {
|
||||
background: transparent;
|
||||
font-weight: 700;
|
||||
text-decoration: underline;
|
||||
}
|
||||
|
||||
p img.top { margin-top: 0; }
|
||||
/* line 79, ../../../../../../.rvm/gems/ruby-1.9.3-p362/gems/compass-0.10.6/frameworks/blueprint/stylesheets/blueprint/_print.scss */
|
||||
p img.top {
|
||||
margin-top: 0;
|
||||
}
|
||||
|
||||
blockquote { margin: 1.5em; padding: 1em; font-style: italic; font-size: 0.9em; }
|
||||
/* line 81, ../../../../../../.rvm/gems/ruby-1.9.3-p362/gems/compass-0.10.6/frameworks/blueprint/stylesheets/blueprint/_print.scss */
|
||||
blockquote {
|
||||
margin: 1.5em;
|
||||
padding: 1em;
|
||||
font-style: italic;
|
||||
font-size: 0.9em;
|
||||
}
|
||||
|
||||
.small { font-size: 0.9em; }
|
||||
/* line 86, ../../../../../../.rvm/gems/ruby-1.9.3-p362/gems/compass-0.10.6/frameworks/blueprint/stylesheets/blueprint/_print.scss */
|
||||
.small {
|
||||
font-size: 0.9em;
|
||||
}
|
||||
|
||||
.large { font-size: 1.1em; }
|
||||
/* line 88, ../../../../../../.rvm/gems/ruby-1.9.3-p362/gems/compass-0.10.6/frameworks/blueprint/stylesheets/blueprint/_print.scss */
|
||||
.large {
|
||||
font-size: 1.1em;
|
||||
}
|
||||
|
||||
.quiet { color: #999999; }
|
||||
/* line 90, ../../../../../../.rvm/gems/ruby-1.9.3-p362/gems/compass-0.10.6/frameworks/blueprint/stylesheets/blueprint/_print.scss */
|
||||
.quiet {
|
||||
color: #999999;
|
||||
}
|
||||
|
||||
.hide { display: none; }
|
||||
/* line 92, ../../../../../../.rvm/gems/ruby-1.9.3-p362/gems/compass-0.10.6/frameworks/blueprint/stylesheets/blueprint/_print.scss */
|
||||
.hide {
|
||||
display: none;
|
||||
}
|
||||
|
|
BIN
vendor/cache/actionmailer-3.0.18.gem
vendored
Normal file
BIN
vendor/cache/actionmailer-3.0.18.gem
vendored
Normal file
Binary file not shown.
BIN
vendor/cache/actionmailer-3.0.5.gem
vendored
BIN
vendor/cache/actionmailer-3.0.5.gem
vendored
Binary file not shown.
BIN
vendor/cache/actionpack-3.0.18.gem
vendored
Normal file
BIN
vendor/cache/actionpack-3.0.18.gem
vendored
Normal file
Binary file not shown.
BIN
vendor/cache/actionpack-3.0.5.gem
vendored
BIN
vendor/cache/actionpack-3.0.5.gem
vendored
Binary file not shown.
BIN
vendor/cache/activemodel-3.0.18.gem
vendored
Normal file
BIN
vendor/cache/activemodel-3.0.18.gem
vendored
Normal file
Binary file not shown.
BIN
vendor/cache/activemodel-3.0.5.gem
vendored
BIN
vendor/cache/activemodel-3.0.5.gem
vendored
Binary file not shown.
BIN
vendor/cache/activerecord-3.0.18.gem
vendored
Normal file
BIN
vendor/cache/activerecord-3.0.18.gem
vendored
Normal file
Binary file not shown.
BIN
vendor/cache/activerecord-3.0.5.gem
vendored
BIN
vendor/cache/activerecord-3.0.5.gem
vendored
Binary file not shown.
BIN
vendor/cache/activeresource-3.0.18.gem
vendored
Normal file
BIN
vendor/cache/activeresource-3.0.18.gem
vendored
Normal file
Binary file not shown.
BIN
vendor/cache/activeresource-3.0.5.gem
vendored
BIN
vendor/cache/activeresource-3.0.5.gem
vendored
Binary file not shown.
BIN
vendor/cache/activesupport-3.0.18.gem
vendored
Normal file
BIN
vendor/cache/activesupport-3.0.18.gem
vendored
Normal file
Binary file not shown.
BIN
vendor/cache/activesupport-3.0.5.gem
vendored
BIN
vendor/cache/activesupport-3.0.5.gem
vendored
Binary file not shown.
BIN
vendor/cache/i18n-0.5.0.gem
vendored
Normal file
BIN
vendor/cache/i18n-0.5.0.gem
vendored
Normal file
Binary file not shown.
BIN
vendor/cache/i18n-0.6.0.gem
vendored
BIN
vendor/cache/i18n-0.6.0.gem
vendored
Binary file not shown.
BIN
vendor/cache/mime-types-1.17.2.gem
vendored
BIN
vendor/cache/mime-types-1.17.2.gem
vendored
Binary file not shown.
BIN
vendor/cache/mime-types-1.19.gem
vendored
Normal file
BIN
vendor/cache/mime-types-1.19.gem
vendored
Normal file
Binary file not shown.
Binary file not shown.
BIN
vendor/cache/railties-3.0.18.gem
vendored
Normal file
BIN
vendor/cache/railties-3.0.18.gem
vendored
Normal file
Binary file not shown.
BIN
vendor/cache/railties-3.0.5.gem
vendored
BIN
vendor/cache/railties-3.0.5.gem
vendored
Binary file not shown.
BIN
vendor/cache/rake-0.9.2.2.gem
vendored
BIN
vendor/cache/rake-0.9.2.2.gem
vendored
Binary file not shown.
BIN
vendor/cache/rake-10.0.3.gem
vendored
Normal file
BIN
vendor/cache/rake-10.0.3.gem
vendored
Normal file
Binary file not shown.
BIN
vendor/cache/rdoc-3.12.gem
vendored
Normal file
BIN
vendor/cache/rdoc-3.12.gem
vendored
Normal file
Binary file not shown.
BIN
vendor/cache/treetop-1.4.10.gem
vendored
BIN
vendor/cache/treetop-1.4.10.gem
vendored
Binary file not shown.
BIN
vendor/cache/treetop-1.4.12.gem
vendored
Normal file
BIN
vendor/cache/treetop-1.4.12.gem
vendored
Normal file
Binary file not shown.
BIN
vendor/cache/tzinfo-0.3.31.gem
vendored
BIN
vendor/cache/tzinfo-0.3.31.gem
vendored
Binary file not shown.
BIN
vendor/cache/tzinfo-0.3.35.gem
vendored
Normal file
BIN
vendor/cache/tzinfo-0.3.35.gem
vendored
Normal file
Binary file not shown.
Loading…
Reference in a new issue