nicolas/pic_vert_app
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

magick encoding

Browse Source
This commit is contained in:
Nico 2013-01-08 23:55:59 +01:00
parent 9abaa20c91
commit 400d07c0c1
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/views/devise/sessions/new.html.erb
View File

@ -1,8 +1,8 @@
<h2>Sign in</h2> <h2>Sign in</h2>
<%= form_for(resource, :as => resource_name, :url => session_path(resource_name)) do |f| %> <%= form_for(resource, :as => resource_name, :url => session_path(resource_name)) do |f| %>
<div><%= f.label :username %><br /> <div><%= f.label :login %><br />
<%= f.text_field :username %></div> <%= f.text_field :login %></div>
<div><%= f.label :password %><br /> <div><%= f.label :password %><br />
<%= f.password_field :password %></div> <%= f.password_field :password %></div>

2
config/database.yml
View File

@ -10,7 +10,7 @@ development:
database: pic_vert database: pic_vert
pool: 5 pool: 5
username: root username: root
# password: dev password: dev
socket: /tmp/mysql.sock socket: /tmp/mysql.sock

2
config/environments/production.rb
View File

@ -49,7 +49,7 @@ Survey::Application.configure do
# config.action_controller.asset_host = "http://assets.example.com" # config.action_controller.asset_host = "http://assets.example.com"
# Precompile additional assets (application.js, application.css, and all non-JS/CSS are already added) # Precompile additional assets (application.js, application.css, and all non-JS/CSS are already added)
config.assets.precompile += %w( topics.js topics.css ) config.assets.precompile += %w( admin.js admin.css topics.js topics.css )
# Disable delivery errors, bad email addresses will be ignored # Disable delivery errors, bad email addresses will be ignored
# config.action_mailer.raise_delivery_errors = false # config.action_mailer.raise_delivery_errors = false