diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb index 170b889293633155d914d3bd3c77f6b5b165f274..ad40f81c926572cc38693687beda29cfebe327b8 100644 --- a/app/controllers/projects_controller.rb +++ b/app/controllers/projects_controller.rb @@ -89,7 +89,7 @@ class ProjectsController < ApplicationController UsersProject.set_callback(:destroy, :after, :update_repository) respond_to do |format| - format.html { redirect_to root_path } + format.html { redirect_to dashboard_path } end end diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 0938dc2322a3cd71314f716eaf74477547364ffc..1bd9a0802f8ca9b68b9cbec678687e2939ff45ca 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -50,7 +50,7 @@ module ApplicationHelper default_nav = [ { label: "Profile", url: profile_path }, { label: "Keys", url: keys_path }, - { label: "Dashboard", url: root_path }, + { label: "Dashboard", url: dashboard_path }, { label: "Admin", url: admin_root_path } ] diff --git a/app/observers/user_observer.rb b/app/observers/user_observer.rb index 654621f7e1c9b0be102221811b97c650d8a7bd95..aed320f6c0959006f216061e20379e5e0c220492 100644 --- a/app/observers/user_observer.rb +++ b/app/observers/user_observer.rb @@ -1,8 +1,9 @@ class UserObserver < ActiveRecord::Observer def after_create(user) log_info("User \"#{user.name}\" (#{user.email}) was created") - - Notify.new_user_email(user.id, user.password).deliver + unless user.extern_uid? + Notify.new_user_email(user.id, user.password).deliver + end end def after_destroy user diff --git a/app/views/layouts/_app_menu.html.haml b/app/views/layouts/_app_menu.html.haml index 025314891f8107e1882848910505233fedc97bf1..7d306c11849df09c8f4d785d8bb5106c7154b6df 100644 --- a/app/views/layouts/_app_menu.html.haml +++ b/app/views/layouts/_app_menu.html.haml @@ -1,6 +1,6 @@ %ul.main_menu %li.home{class: tab_class(:root)} - = link_to "Home", root_path, title: "Home" + = link_to "Home", dashboard_path, title: "Home" %li{class: tab_class(:dash_issues)} = link_to dashboard_issues_path do diff --git a/app/views/layouts/_head_panel.html.haml b/app/views/layouts/_head_panel.html.haml index f5e423a5abf3c59331cebe0d22cf2384c50abf2e..edbdb89bc0a5a396ba9cece1c861e90c817cbd17 100644 --- a/app/views/layouts/_head_panel.html.haml +++ b/app/views/layouts/_head_panel.html.haml @@ -3,7 +3,7 @@ .container .top_panel_content %div.app_logo - = link_to root_path, class: "home", title: "Home" do + = link_to dashboard_path, class: "home", title: "Home" do %h1 GITLAB %span.separator