edshot99/eBooru
1
0
Fork 0
forked from e621ng/e621ng
Code Issues 11 Releases 1 Activity

upgrade to rails 3.2.17

Browse Source
This commit is contained in:
r888888888 2014-02-21 16:32:16 -08:00
parent 3ba7daebd1
commit fa72a16741
4 changed files with 41 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Gemfile
View File

@ -18,7 +18,7 @@ group :assets do
gem "therubyracer", :platforms => :ruby
end
gem "rails", "3.2.12"
gem "rails"
gem "pg", "0.12.2"
gem "kgio"
gem "dalli"

75
Gemfile.lock
View File

@ -8,12 +8,12 @@ GIT
GEM
remote: http://gemcutter.org/
specs:
actionmailer (3.2.12)
actionpack (= 3.2.12)
mail (~> 2.4.4)
actionpack (3.2.12)
activemodel (= 3.2.12)
activesupport (= 3.2.12)
actionmailer (3.2.17)
actionpack (= 3.2.17)
mail (~> 2.5.4)
actionpack (3.2.17)
activemodel (= 3.2.17)
activesupport (= 3.2.17)
builder (~> 3.0.0)
erubis (~> 2.7.0)
journey (~> 1.0.4)
@ -21,22 +21,22 @@ GEM
rack-cache (~> 1.2)
rack-test (~> 0.6.1)
sprockets (~> 2.2.1)
activemodel (3.2.12)
activesupport (= 3.2.12)
activemodel (3.2.17)
activesupport (= 3.2.17)
builder (~> 3.0.0)
activerecord (3.2.12)
activemodel (= 3.2.12)
activesupport (= 3.2.12)
activerecord (3.2.17)
activemodel (= 3.2.17)
activesupport (= 3.2.17)
arel (~> 3.0.2)
tzinfo (~> 0.3.29)
activeresource (3.2.12)
activemodel (= 3.2.12)
activesupport (= 3.2.12)
activesupport (3.2.12)
i18n (~> 0.6)
activeresource (3.2.17)
activemodel (= 3.2.17)
activesupport (= 3.2.17)
activesupport (3.2.17)
i18n (~> 0.6, >= 0.6.4)
multi_json (~> 1.0)
addressable (2.3.5)
arel (3.0.2)
arel (3.0.3)
awesome_print (1.1.0)
aws-s3 (0.6.3)
builder
@ -76,13 +76,12 @@ GEM
hike (1.2.3)
http-cookie (1.0.1)
domain_name (~> 0.5)
i18n (0.6.4)
i18n (0.6.9)
journey (1.0.4)
json (1.8.0)
json (1.8.1)
kgio (2.8.0)
libv8 (3.11.8.17)
mail (2.4.4)
i18n (>= 0.4.0)
mail (2.5.4)
mime-types (~> 1.16)
treetop (~> 1.4.8)
mechanize (2.7.1)
@ -96,11 +95,11 @@ GEM
webrobots (>= 0.0.9, < 0.2)
metaclass (0.0.1)
method_source (0.8.2)
mime-types (1.23)
mime-types (1.25.1)
mini_portile (0.5.1)
mocha (0.14.0)
metaclass (~> 0.0.1)
multi_json (1.7.8)
multi_json (1.8.4)
net-http-digest_auth (1.4)
net-http-persistent (2.9)
net-scp (1.1.2)
@ -115,7 +114,7 @@ GEM
mini_portile (~> 0.5.0)
ntlm-http (0.1.1)
pg (0.12.2)
polyglot (0.3.3)
polyglot (0.3.4)
pry (0.9.12.2)
coderay (~> 1.0.5)
method_source (~> 0.8)
@ -127,23 +126,23 @@ GEM
rack
rack-test (0.6.2)
rack (>= 1.0)
rails (3.2.12)
actionmailer (= 3.2.12)
actionpack (= 3.2.12)
activerecord (= 3.2.12)
activeresource (= 3.2.12)
activesupport (= 3.2.12)
rails (3.2.17)
actionmailer (= 3.2.17)
actionpack (= 3.2.17)
activerecord (= 3.2.17)
activeresource (= 3.2.17)
activesupport (= 3.2.17)
bundler (~> 1.0)
railties (= 3.2.12)
railties (3.2.12)
actionpack (= 3.2.12)
activesupport (= 3.2.12)
railties (= 3.2.17)
railties (3.2.17)
actionpack (= 3.2.17)
activesupport (= 3.2.17)
rack-ssl (~> 1.3.2)
rake (>= 0.8.7)
rdoc (~> 3.4)
thor (>= 0.14.6, < 2.0)
raindrops (0.11.0)
rake (10.1.0)
rake (10.1.1)
rdoc (3.12.2)
json (~> 1.4)
ref (1.0.5)
@ -186,10 +185,10 @@ GEM
tilt (1.4.1)
timecop (0.6.3)
tins (0.8.3)
treetop (1.4.14)
treetop (1.4.15)
polyglot
polyglot (>= 0.3.1)
tzinfo (0.3.37)
tzinfo (0.3.38)
uglifier (2.1.2)
execjs (>= 0.3.0)
multi_json (~> 1.0, >= 1.0.2)
@ -234,7 +233,7 @@ DEPENDENCIES
nokogiri
pg (= 0.12.2)
pry
rails (= 3.2.12)
rails
rmagick
ruby-imagespec!
ruby-prof

2
db/structure.sql
View File

@ -6475,6 +6475,8 @@ CREATE TRIGGER trigger_wiki_pages_on_update
-- PostgreSQL database dump complete
--
SET search_path TO "$user",public;
INSERT INTO schema_migrations (version) VALUES ('20100204211522');
INSERT INTO schema_migrations (version) VALUES ('20100204214746');

2
test/unit/wiki_page_test.rb
View File

@ -94,7 +94,7 @@ class WikiPageTest < ActiveSupport::TestCase
@wiki_page.title = "yyy"
@wiki_page.save
end
version = WikiPageVersion.first
version = WikiPageVersion.last
assert_not_equal(@wiki_page.creator_id, version.updater_id)
end
end