Merge remote-tracking branch 'upstream/pull/3803'
This commit is contained in:
commit
c0278a01da
5 changed files with 10 additions and 4 deletions
|
@ -6,7 +6,7 @@
|
|||
|
||||
<% set_title(changeset_index_title(params, current_user))
|
||||
@heading = if params[:display_name]
|
||||
t("changesets.index.title_user", :user => link_to(params[:display_name], user_path(:display_name => params[:display_name]))).html_safe
|
||||
t("changesets.index.title_user_link_html", :user_link => link_to(params[:display_name], user_path(:display_name => params[:display_name])))
|
||||
else
|
||||
@title
|
||||
end %>
|
||||
|
|
2
app/views/sessions/_suspended_flash.html.erb
Normal file
2
app/views/sessions/_suspended_flash.html.erb
Normal file
|
@ -0,0 +1,2 @@
|
|||
<p><%= t ".suspended" %></p>
|
||||
<p><%= t ".contact_support_html", :support_link => mail_to(Settings.support_email, t(".support")) %></p>
|
Loading…
Add table
Add a link
Reference in a new issue