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

fix favorite tags

Browse Source
This commit is contained in:
albert
2013-03-08 21:50:44 -05:00
parent c9f6954b03
commit 2a1758636b
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/views/users/edit.html.erb
View File

@@ -15,7 +15,7 @@
<div class="input text optional field_with_hint">
<label class="text optional" for="user_favorite_tags">Favorite tags</label>
<textarea id="user_favorite_tags" class="text optional" rows="5" name="user[favorite_tags]" cols="40">1 2 3 </textarea>
<textarea id="user_favorite_tags" class="text optional" rows="5" name="user[favorite_tags]" cols="40"><%= raw @user.favorite_tags %></textarea>
<span class="hint">A list of whitespace delimited tags that show up in your profile. <%= link_to "Restore from old database", restore_uploaded_tags_user_path(@user), :method => :post, :remote => true %></span>
</div>

4
config/initializers/z_action_mailer.rb
View File

@@ -1,8 +1,8 @@
if Danbooru.config.amazon_ses && Rails.env == "production"
Danbooru::Application.config.action_mailer.smtp_settings = {
:address => Danbooru.config.amazon_ses[:smtp_server_name],
:user_name => Danbooru.config.amazon_ses[:smtp_user_name],
:password => Danbooru.config.amazon_ses[:smtp_password],
:user_name => Danbooru.config.amazon_ses[:ses_smtp_user_name],
:password => Danbooru.config.amazon_ses[:ses_smtp_password],
:authentication => :login,
:enable_starttls_auto => true
}