Merge remote-tracking branch 'upstream/pull/3373'

[rails.git] / app / views / users / account.html.erb

diff --git a/app/views/users/account.html.erb b/app/views/users/account.html.erb
index 26d8402107e68eacd9c91a0b34dc25a289386e88..f647cc84ffa8e7e42e7a4e60c6061e98b1e577d8 100644 (file)
--- a/app/views/users/account.html.erb
+++ b/app/views/users/account.html.erb
@@ -4,14 +4,10 @@
 
 <% content_for :heading do %>
   <h1><%= t ".my settings" %></h1>
 
 <% content_for :heading do %>
   <h1><%= t ".my settings" %></h1>

-  <ul class='secondary-actions clearfix'>
-    <li><%= link_to t(".return to profile"), user_path(current_user) %></li>
-    <li><%= link_to t(".oauth1 settings"), oauth_clients_path %></li>
-    <li><%= link_to t(".oauth2 applications"), oauth_applications_path %></li>
-    <li><%= link_to t(".oauth2 authorizations"), oauth_authorized_applications_path %></li>
-  </ul>

 <% end %>
 
 <% end %>
 

+<%= render :partial => "settings_menu", :locals => { :selected => "account" } %>
+

 <%= bootstrap_form_for current_user, :url => { :action => :account }, :method => :post, :html => { :multipart => true, :id => "accountForm", :autocomplete => :off } do |f| %>
 
   <%= f.text_field :display_name %>
 <%= bootstrap_form_for current_user, :url => { :action => :account }, :method => :post, :html => { :multipart => true, :id => "accountForm", :autocomplete => :off } do |f| %>
 
   <%= f.text_field :display_name %>