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

[rails.git] / app / views / preferences / edit.html.erb

diff --git a/app/views/preferences/edit.html.erb b/app/views/preferences/edit.html.erb
deleted file mode 100644 (file)
index 07d89fb..0000000
--- a/app/views/preferences/edit.html.erb
+++ /dev/null
@@ -1,12 +0,0 @@
-<% content_for :heading do %>
-  <h1><%= t ".title" %></h1>
-<% end %>
-
-<%= bootstrap_form_for current_user, :url => { :action => :update } do |f| %>
-  <%= f.select :preferred_editor, [[t("editor.default", :name => t("editor.#{Settings.default_editor}.name")), "default"]] + Editors::AVAILABLE_EDITORS.collect { |e| [t("editor.#{e}.description"), e] } %>
-
-  <%= f.text_field :languages %>
-
-  <%= f.primary t(".save") %>
-  <%= link_to t(".cancel"), preferences_path, :class => "btn btn-link" %>
-<% end %>