jaculabilis/danbooru
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

updated rails version

Browse Source
This commit is contained in:
albert
2011-08-06 15:50:37 -04:00
parent 4f0273143b
commit 80683f3f17
5 changed files with 34 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Gemfile
View File

@@ -8,7 +8,7 @@ group :test do
gem "simplecov", :require => false gem "simplecov", :require => false
end end
gem "rails", "3.1.0.rc1" gem "rails", "3.1.0.rc4"
gem "pg" gem "pg"
gem "memcache-client", :require => "memcache" gem "memcache-client", :require => "memcache"
gem "imagesize", :require => "image_size" gem "imagesize", :require => "image_size"

64
Gemfile.lock
View File

@@ -17,35 +17,35 @@ GEM
remote: http://gemcutter.org/ remote: http://gemcutter.org/
specs: specs:
aaronh-chronic (0.3.9) aaronh-chronic (0.3.9)
actionmailer (3.1.0.rc1) actionmailer (3.1.0.rc4)
actionpack (= 3.1.0.rc1) actionpack (= 3.1.0.rc4)
mail (~> 2.3.0) mail (~> 2.3.0)
actionpack (3.1.0.rc1) actionpack (3.1.0.rc4)
activemodel (= 3.1.0.rc1) activemodel (= 3.1.0.rc4)
activesupport (= 3.1.0.rc1) activesupport (= 3.1.0.rc4)
builder (~> 3.0.0) builder (~> 3.0.0)
erubis (~> 2.7.0) erubis (~> 2.7.0)
i18n (~> 0.6.0beta1) i18n (~> 0.6)
rack (~> 1.3.0.beta2) rack (~> 1.3.0)
rack-cache (~> 1.0.1) rack-cache (~> 1.0.1)
rack-mount (~> 0.8.1) rack-mount (~> 0.8.1)
rack-test (~> 0.6.0) rack-test (~> 0.6.0)
sprockets (~> 2.0.0.beta.5) sprockets (~> 2.0.0.beta.10)
tzinfo (~> 0.3.27) tzinfo (~> 0.3.27)
activemodel (3.1.0.rc1) activemodel (3.1.0.rc4)
activesupport (= 3.1.0.rc1) activesupport (= 3.1.0.rc4)
bcrypt-ruby (~> 2.1.4) bcrypt-ruby (~> 2.1.4)
builder (~> 3.0.0) builder (~> 3.0.0)
i18n (~> 0.6.0beta1) i18n (~> 0.6)
activerecord (3.1.0.rc1) activerecord (3.1.0.rc4)
activemodel (= 3.1.0.rc1) activemodel (= 3.1.0.rc4)
activesupport (= 3.1.0.rc1) activesupport (= 3.1.0.rc4)
arel (~> 2.1.1) arel (~> 2.1.1)
tzinfo (~> 0.3.27) tzinfo (~> 0.3.27)
activeresource (3.1.0.rc1) activeresource (3.1.0.rc4)
activemodel (= 3.1.0.rc1) activemodel (= 3.1.0.rc4)
activesupport (= 3.1.0.rc1) activesupport (= 3.1.0.rc4)
activesupport (3.1.0.rc1) activesupport (3.1.0.rc4)
multi_json (~> 1.0) multi_json (~> 1.0)
arel (2.1.4) arel (2.1.4)
bcrypt-ruby (2.1.4) bcrypt-ruby (2.1.4)
@@ -55,7 +55,7 @@ GEM
activesupport (~> 3.0) activesupport (~> 3.0)
daemons daemons
erubis (2.7.0) erubis (2.7.0)
factory_girl (2.0.2) factory_girl (2.0.3)
haml (3.1.2) haml (3.1.2)
hike (1.2.0) hike (1.2.0)
i18n (0.6.0) i18n (0.6.0)
@@ -87,21 +87,23 @@ GEM
rack rack
rack-test (0.6.1) rack-test (0.6.1)
rack (>= 1.0) rack (>= 1.0)
rails (3.1.0.rc1) rails (3.1.0.rc4)
actionmailer (= 3.1.0.rc1) actionmailer (= 3.1.0.rc4)
actionpack (= 3.1.0.rc1) actionpack (= 3.1.0.rc4)
activerecord (= 3.1.0.rc1) activerecord (= 3.1.0.rc4)
activeresource (= 3.1.0.rc1) activeresource (= 3.1.0.rc4)
activesupport (= 3.1.0.rc1) activesupport (= 3.1.0.rc4)
bundler (~> 1.0) bundler (~> 1.0)
railties (= 3.1.0.rc1) railties (= 3.1.0.rc4)
railties (3.1.0.rc1) railties (3.1.0.rc4)
actionpack (= 3.1.0.rc1) actionpack (= 3.1.0.rc4)
activesupport (= 3.1.0.rc1) activesupport (= 3.1.0.rc4)
rack-ssl (~> 1.3.2) rack-ssl (~> 1.3.2)
rake (>= 0.8.7) rake (>= 0.8.7)
rdoc (~> 3.4)
thor (~> 0.14.6) thor (~> 0.14.6)
rake (0.9.2) rake (0.9.2)
rdoc (3.9.1)
shoulda (2.11.3) shoulda (2.11.3)
silent-postgres (0.0.8) silent-postgres (0.0.8)
simple_form (1.4.2) simple_form (1.4.2)
@@ -110,7 +112,7 @@ GEM
simplecov (0.4.2) simplecov (0.4.2)
simplecov-html (~> 0.4.4) simplecov-html (~> 0.4.4)
simplecov-html (0.4.5) simplecov-html (0.4.5)
sprockets (2.0.0.beta.12) sprockets (2.0.0.beta.13)
hike (~> 1.2) hike (~> 1.2)
rack (~> 1.0) rack (~> 1.0)
tilt (~> 1.1, != 1.3.0) tilt (~> 1.1, != 1.3.0)
@@ -144,7 +146,7 @@ DEPENDENCIES
mocha mocha
nokogiri nokogiri
pg pg
rails (= 3.1.0.rc1) rails (= 3.1.0.rc4)
shoulda shoulda
silent-postgres silent-postgres
simple_form simple_form

6
app/controllers/admin/posts_controller.rb
View File

@@ -1,6 +0,0 @@
module Admin
class PostsController
def edit
end
end
end

7
app/controllers/admin/users_controller.rb
View File

@@ -1,7 +0,0 @@
class Admin::UsersController < ApplicationController
def edit
end
def update
end
end

10
app/views/admin/tags/edit.html.erb
View File

@@ -1,10 +0,0 @@
<% form_tag({:action => "mass_edit"}, :onsubmit => "return confirm('Are you sure you wish to perform this tag edit?')") do %>
<%= text_field_tag "start", params[:source], :size => 60 %>
<%= text_field_tag "result", params[:name], :size => 60 %>
<%= button_to_function "Preview", "$('preview').innerHTML = 'Loading...'; new Ajax.Updater('preview', '#{url_for(:controller=>"tag",:action=>"edit_preview")}', {method: 'get', parameters: 'tags=' + $F('start')})" %><%= submit_tag "Save" %>
<% end %>
<%= render :partial => "footer" %>
<div id="preview">
</div>