From 029d69b033c0599491015f6fd075d059f9be2f41 Mon Sep 17 00:00:00 2001
From: zmagod <zmago_devetak@yahoo.com>
Date: Mon, 29 Jan 2018 15:42:22 +0100
Subject: [PATCH] revert to old setting [fixes SCI-1967]

---
 app/views/shared/_navigation.html.erb |  4 +---
 config/routes.rb                      | 20 ++++++++++----------
 2 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/app/views/shared/_navigation.html.erb b/app/views/shared/_navigation.html.erb
index c402faf41..3d3affa2c 100644
--- a/app/views/shared/_navigation.html.erb
+++ b/app/views/shared/_navigation.html.erb
@@ -260,9 +260,7 @@
           </a>
           <ul class="dropdown-menu" data-hook="navigation-user-menu">
             <li>
-              <%= link_to t('nav.user.settings'),
-                          '/settings',
-                          data: { turbolinks: false } %>
+              <%= link_to t('nav.user.settings'), edit_user_registration_path %>
             </li>
             <li role="separator" class="divider"></li>
             <li>
diff --git a/config/routes.rb b/config/routes.rb
index a9f10fe9c..5679d1157 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -15,16 +15,16 @@ Rails.application.routes.draw do
 
     root 'projects#index'
 
-    # Client APP endpoints
-    get '/settings', to: 'client_api/settings#index'
-    get '/settings/*all', to: 'client_api/settings#index'
-
-    namespace :client_api, defaults: { format: 'json' } do
-      post '/premissions', to: 'permissions#status'
-      %i(activities teams notifications users configurations).each do |path|
-        draw path
-      end
-    end
+    # # Client APP endpoints
+    # get '/settings', to: 'client_api/settings#index'
+    # get '/settings/*all', to: 'client_api/settings#index'
+    #
+    # namespace :client_api, defaults: { format: 'json' } do
+    #   post '/premissions', to: 'permissions#status'
+    #   %i(activities teams notifications users configurations).each do |path|
+    #     draw path
+    #   end
+    # end
 
     # Save sample table state
     post '/state_save/:team_id/:user_id',