| リビジョン | 6eb067f6bea470b24457cec5a0819bcfb25a870a (tree) |
|---|---|
| 日時 | 2012-01-03 13:01:27 |
| 作者 |  yasushiito <yas@pen-...> |
| コミッター | yasushiito |
merge miss branch
app/views/speach_balloons/show.html.erb (diff) config/environments/development.rb (diff)| @@ -20,7 +20,7 @@ | ||
| 20 | 20 | Tail:<%= balloon_template.tail -%> |
| 21 | 21 | Border:<%= balloon_template.border -%> |
| 22 | 22 | </p> |
| 23 | - <img src="<%= balloon_template.resource_picture.url -%>" /> | |
| 23 | + <img src="<%= balloon_template.system_picture.url -%>" /> | |
| 24 | 24 | </div> |
| 25 | 25 | <% end -%> |
| 26 | 26 | <%= link_to 'Back', speach_balloons_path %> |
| @@ -30,7 +30,6 @@ Pettanr::Application.configure do | ||
| 30 | 30 | # Expands the lines which load the assets |
| 31 | 31 | config.assets.debug = true |
| 32 | 32 | end |
| 33 | -y = YAML.load(open(Rails.root + 'config/aws.yaml').read) | |
| 34 | 33 | |
| 35 | 34 | require 'local_picture' |
| 36 | 35 | PictureIO.setup do |config| |
Fork