Merge branch 'master' of github.com:warpc/rosa-build

app/views/platforms/platforms/members.html.haml

@@ -24,7 +24,7 @@
           %td
             .img
               = image_tag avatar_url(user)
-            .forimg= link_to "#{user.uname} (#{user.name})", user_path(user)
+            .forimg= link_to user.fullname, user_path(user)
           - if can? :remove_member, @platform
             %td.buttons
               = link_to remove_member_platform_path(@platform, :member_id => user.id), :method => :delete, :confirm => t("layout.confirm") do

app/views/projects/collaborators/edit.html.haml

@@ -35,7 +35,7 @@
           %td
             .img
               = image_tag avatar_url(user)
-            .forimg= link_to "#{user.uname} (#{user.name})", user_path(user)
+            .forimg= link_to user.fullname, user_path(user)
           - Relation::ROLES.each_with_index do |role, i|
             %td
               .radio

app/views/projects/issues/_manage_sidebar.html.haml

@@ -19,13 +19,13 @@
             - if @issue.assignee
               #user-0.people.nopointer
                 .avatar=image_tag avatar_url(@issue.assignee), :alt => 'avatar'
-                .name="#{@issue.user.uname} (#{@issue.assignee.name})"
+                .name=@issue.assignee.fullname
                 =hidden_field_tag "user-0", @issue.assignee.id, :name => 'issue[assignee_id]'
                 .both
       - elsif @issue.assignee
         .people.nopointer
           .avatar=image_tag avatar_url(@issue.assignee), :alt => 'avatar'
-          .name="#{@issue.assignee.uname} (#{@issue.assignee.name})"
+          .name=@issue.assignee.fullname
           .both
       =link_to(t('layout.issues.label_manage'), '#', :class => "button tmargin10 manage_assignee") if can_manage
     - if can_manage

app/views/projects/issues/_search_collaborators.html.haml

@@ -1,6 +1,6 @@
 - (@users || []).each_with_index do |user, index|
   .people.selected{:id => "user-#{index}", :class => 'add_assignee'}
     .avatar= image_tag(avatar_url(user), :alt => 'avatar')
-    .name="#{user.uname} (#{user.name})"
+    .name=user.fullname
     =hidden_field_tag "user-#{index}", user.id, :name => 'issue[assignee_id]'
     .both

app/views/projects/issues/_status.html.haml

@@ -4,6 +4,6 @@
       .state=t('layout.issues.status.closed')
       .text
         .avatar= image_tag(avatar_url(@issue.closer), :alt => 'avatar')
-        .name="#{@issue.closer.uname} (#{@issue.closer.name}) #{t('layout.issues.at')} #{@issue.closed_at.to_s(:long)}"
+        .name="#{@issue.closer.fullname} #{t('layout.issues.at')} #{@issue.closed_at.to_s(:long)}"
     .both
     %br/

app/views/projects/issues/show.html.haml

@@ -9,7 +9,7 @@
     .image
       =image_tag(avatar_url(@issue.user, :medium), :alt => 'avatar') if @issue.user
     .text
-      %span.name=link_to("#{@issue.user.uname} (#{@issue.user.name})", user_path(@issue.user)) if @issue.user
+      %span.name=link_to(@issue.user.fullname, user_path(@issue.user)) if @issue.user
       %br/
       %span.date=@issue.created_at.to_s(:long)
       %br/

app/views/projects/wiki/_history.html.haml

@@ -13,7 +13,7 @@
               = image_tag avatar_url_by_email(v.author.email), :alt => "avatar: #{v.author.name}", :class => 'mini-gravatar'
           .name
             = link_to user_path_by_user(user) do
-              %span.username= user.present? ? "#{user.uname} (#{user.name})" : v.author.name
+              %span.username= user.present? ? user.fullname : v.author.name
           .both
         %td.td3
           %span.wiki-gray= "#{l v.committed_date.to_date, :format => :long}:"

config/deploy/application.production.yml

@@ -2,7 +2,7 @@ production:
   action_mailer_host: "abf.rosalinux.ru"
   root_path: /share
   nginx_log: /srv/rosa_build/shared/log/nginx.access.log
-  do-not-reply-email: do-not-reply@rosalab.ru
+  do-not-reply-email: do-not-reply@rosalinux.ru
   project_name: ABF
   repo_project_name: ABF
   build_server_ip: 127.0.0.1

config/deploy/application.school.yml

@@ -12,7 +12,7 @@ production:
   action_mailer_host: "school.rosalab.ru"
   root_path: /share
   nginx_log: /srv/rosa_build/shared/log/nginx.access.log
-  do-not-reply-email: do-not-reply@rosalab.ru
+  do-not-reply-email: do-not-reply@school.rosalab.ru
   build_server_ip: 127.0.0.1
   build_server_port: 12555
   build_server_path: /xmlrpc

config/deploy/application.staging.yml

@@ -2,7 +2,7 @@ production:
   action_mailer_host: "dev-abf.rosalinux.ru"
   root_path: /share
   nginx_log: /srv/rosa_build/shared/log/nginx.access.log
-  do-not-reply-email: do-not-reply@rosalab.ru
+  do-not-reply-email: do-not-reply@dev-abf.rosalinux.ru
   project_name: ABF
   repo_project_name: ABF
   build_server_ip: 127.0.0.1