Download as
Browse Code »

Commit 90dc5ff5fdfe316b0ccd5706c7c98738c48876de

Authored by Dmitriy Zaporozhets
1 parent 74a62138
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

Fix 500 error on admin->project page

Showing 2 changed files with 3 additions and 4 deletions   Show diff stats
app/assets/stylesheets/sections/dashboard.scss
  Diff comments   View file @90dc5ff
@@ -66,7 +66,7 @@ @@ -66,7 +66,7 @@
66 } 66 }
67 67
68 .project-row, .group-row { 68 .project-row, .group-row {
69 - padding: 12px 15px !important; 69 + padding: 10px 15px !important;
70 70
71 .namespace-name { 71 .namespace-name {
72 color: #666; 72 color: #666;
@@ -77,7 +77,6 @@ @@ -77,7 +77,6 @@
77 font-size: 16px; 77 font-size: 16px;
78 } 78 }
79 79
80 -  
81 .arrow { 80 .arrow {
82 float: right; 81 float: right;
83 padding: 10px 5px; 82 padding: 10px 5px;
app/views/admin/projects/show.html.haml
  Diff comments   View file @90dc5ff
@@ -99,7 +99,7 @@ @@ -99,7 +99,7 @@
99 %ul.well-list.team_members 99 %ul.well-list.team_members
100 - @project.users_projects.each do |users_project| 100 - @project.users_projects.each do |users_project|
101 - user = users_project.user 101 - user = users_project.user
102 - %li 102 + %li.users_project
103 %strong 103 %strong
104 = link_to user.name, admin_user_path(user) 104 = link_to user.name, admin_user_path(user)
105 .pull-right 105 .pull-right
@@ -107,5 +107,5 @@ @@ -107,5 +107,5 @@
107 %span.light Owner 107 %span.light Owner
108 - else 108 - else
109 %span.light= users_project.human_access 109 %span.light= users_project.human_access
110 - = link_to admin_project_member_path(@project, user), confirm: remove_from_project_team_message(@project, user), method: :delete, class: "btn btn-small btn-remove" do 110 + = link_to project_team_member_path(@project, user), confirm: remove_from_project_team_message(@project, user), method: :delete, remote: true, class: "btn btn-small btn-remove" do
111 %i.icon-remove 111 %i.icon-remove